diff --git a/nixosConfigurations/damocles/claude-container.nix b/nixosConfigurations/damocles/claude-container.nix
index 7df7b24..aea9343 100644
--- a/nixosConfigurations/damocles/claude-container.nix
+++ b/nixosConfigurations/damocles/claude-container.nix
@@ -5,8 +5,10 @@
 }:
 {
 
-  my.overlays.unstable.enable = true;
-  my.allowedUnfreePackages = [ "claude-code" ];
+  my = {
+    allowedUnfreePackages = [ "claude-code" ];
+    overlays.unstable.enable = true;
+  };
 
   environment.systemPackages = with pkgs; [
     unstable.claude-code
diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix
index 78c9d55..f52d735 100644
--- a/nixosConfigurations/muede-lpt2/default.nix
+++ b/nixosConfigurations/muede-lpt2/default.nix
@@ -5,13 +5,17 @@
   ];
 
   config = {
-    my.users.muede.enable = true;
-    my.wineGaming.enable = true;
-    my.steam.enable = true;
-    my.podman.enable = true;
-    my.muedeDesktopSettings.enable = true;
-    my.intelGraphics.enable = true;
-    my.secureBoot.enable = true;
+    my = {
+      # keep-sorted start
+      intelGraphics.enable = true;
+      muedeDesktopSettings.enable = true;
+      podman.enable = true;
+      secureBoot.enable = true;
+      steam.enable = true;
+      users.muede.enable = true;
+      wineGaming.enable = true;
+      # keep-sorted end
+    };
 
     nix.settings.extra-platforms = [
       "aarch64-linux"
diff --git a/nixosConfigurations/muede-pc2/default.nix b/nixosConfigurations/muede-pc2/default.nix
index 4686ffb..42f77b3 100644
--- a/nixosConfigurations/muede-pc2/default.nix
+++ b/nixosConfigurations/muede-pc2/default.nix
@@ -7,13 +7,17 @@
   ];
 
   config = {
-    my.users.muede.enable = true;
-    my.wineGaming.enable = true;
-    my.steam.enable = true;
-    my.podman.enable = true;
-    my.muedeDesktopSettings.enable = true;
-    my.amdGraphics.enable = true;
-    my.secureBoot.enable = true;
+    my = {
+      # keep-sorted start
+      amdGraphics.enable = true;
+      muedeDesktopSettings.enable = true;
+      podman.enable = true;
+      secureBoot.enable = true;
+      steam.enable = true;
+      users.muede.enable = true;
+      wineGaming.enable = true;
+      # keep-sorted end
+    };
 
     boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
     nix.settings.extra-platforms = [
diff --git a/nixosConfigurations/ronja-pc/default.nix b/nixosConfigurations/ronja-pc/default.nix
index 85227ff..2a56407 100644
--- a/nixosConfigurations/ronja-pc/default.nix
+++ b/nixosConfigurations/ronja-pc/default.nix
@@ -5,10 +5,14 @@
   ];
 
   config = {
-    my.users.ronja.enable = true;
-    my.steam.enable = true;
-    my.wineGaming.enable = true;
-    my.muedeDesktopSettings.enable = true;
+    my = {
+      # keep-sorted start
+      muedeDesktopSettings.enable = true;
+      steam.enable = true;
+      users.ronja.enable = true;
+      wineGaming.enable = true;
+      # keep-sorted end
+    };
 
     # Configure keymap in X11
     services.xserver.xkb = {
diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix
index 8311373..fd195e8 100644
--- a/nixosModules/gnome.nix
+++ b/nixosModules/gnome.nix
@@ -5,9 +5,9 @@
   ...
 }:
 {
-  options = {
-    my.gnome.enable = lib.mkEnableOption "GNOME desktop environment";
-    my.gnome.keep-default-apps = lib.mkEnableOption "keep gnome default apps";
+  options.my.gnome = {
+    enable = lib.mkEnableOption "GNOME desktop environment";
+    keep-default-apps = lib.mkEnableOption "keep gnome default apps";
   };
 
   config = lib.mkIf config.my.gnome.enable (