code rules

modules/dev/cc/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.cc = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "C/C++ development shell";
+    };
     my.dev.cc = {
       enable = lib.mkEnableOption "Install C/C++ tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install C/C++ packages for";
       };
     };
-    devShells.cc = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "C/C++ development shell";
-    };
   };
 }

modules/dev/docker/home.nix

@@ -28,8 +28,10 @@ in
       my.dev.docker.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
-      home.sessionVariables.DOCKER_CONFIG = "${config.xdg.configHome}/docker";
+      home = {
+        inherit (feature) packages;
+        sessionVariables.DOCKER_CONFIG = "${config.xdg.configHome}/docker";
+      };
     })
   ];
 }

modules/dev/docker/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.docker = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Docker and Dockerfile tooling shell";
+    };
     my.dev.docker = {
       enable = lib.mkEnableOption "Install Docker tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Docker packages for";
       };
     };
-    devShells.docker = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Docker and Dockerfile tooling shell";
-    };
   };
 }

modules/dev/emacs/home.nix

@@ -25,8 +25,8 @@ let
   };
 in
 {
-  imports = [ inputs.doom-emacs.homeModule ];
   options.my.emacs.enable = lib.mkEnableOption "Doom Emacs configuration";
+  imports = [ inputs.doom-emacs.homeModule ];
   config = lib.mkMerge [
     {
       my.emacs.enable = lib.mkDefault hm.enabledByDefault;

modules/dev/emacs/portable.nix

@@ -5,8 +5,8 @@
 }:
 let
   emacs = import ./common.nix {
-    lib = pkgs.lib;
     inherit pkgs;
+    lib = pkgs.lib;
     stylixEnabled = false;
     emacsExtraConfig = "";
     emacsExtraPackages = _epkgs: [ ];
@@ -41,21 +41,21 @@ let
       ../../../modules/home-manager.nix
       ../../../config/home-manager.nix
       {
+        programs.home-manager.enable = true;
+        nixpkgs.config.allowUnfree = true;
         home = {
           username = "portable";
           homeDirectory = if pkgs.stdenv.isDarwin then "/Users/portable" else "/home/portable";
           stateVersion = "23.05";
         };
-        programs.home-manager.enable = true;
-        nixpkgs.config.allowUnfree = true;
         my = {
           emacs.enable = true;
+          shell.tools.enable = true;
           dev = {
             nix.enable = true;
             python.enable = true;
             sh.enable = true;
           };
-          shell.tools.enable = true;
         };
       }
     ];

modules/dev/go/home.nix

@@ -28,8 +28,10 @@ in
       my.dev.go.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
-      home.sessionVariables.GOPATH = "${config.xdg.dataHome}/go";
+      home = {
+        inherit (feature) packages;
+        sessionVariables.GOPATH = "${config.xdg.dataHome}/go";
+      };
     })
   ];
 }

modules/dev/go/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.go = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Go development shell with Emacs tooling, REPL, formatter, and linter";
+    };
     my.dev.go = {
       enable = lib.mkEnableOption "Install Go tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Go packages for";
       };
     };
-    devShells.go = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Go development shell with Emacs tooling, REPL, formatter, and linter";
-    };
   };
 }

modules/dev/haskell/home.nix

@@ -28,11 +28,13 @@ in
       my.dev.haskell.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
-      home.sessionVariables = {
-        CABAL_DIR = "${config.xdg.cacheHome}/cabal";
-        STACK_ROOT = "${config.xdg.dataHome}/stack";
-        GHCUP_USE_XDG_DIRS = "true";
+      home = {
+        inherit (feature) packages;
+        sessionVariables = {
+          CABAL_DIR = "${config.xdg.cacheHome}/cabal";
+          STACK_ROOT = "${config.xdg.dataHome}/stack";
+          GHCUP_USE_XDG_DIRS = "true";
+        };
       };
     })
   ];

modules/dev/haskell/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.haskell = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Haskell development shell";
+    };
     my.dev.haskell = {
       enable = lib.mkEnableOption "Install Haskell tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Haskell packages for";
       };
     };
-    devShells.haskell = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Haskell development shell";
-    };
   };
 }

modules/dev/javascript/common.nix

@@ -14,12 +14,12 @@ in
       echo "📦 JavaScript dev environment"
     '';
   };
-  sessionVariables = {
-    NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
-    PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
-  };
   sessionPath = [
     "\${XDG_DATA_HOME}/npm/bin"
     "\${XDG_DATA_HOME}/pnpm"
   ];
+  sessionVariables = {
+    NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
+    PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
+  };
 }

modules/dev/javascript/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.javascript = lib.mkOption {
+      type = lib.types.package;
+      default = javascript.devShell;
+      description = "JavaScript/Node development shell with npm/pnpm support";
+    };
     my.dev.javascript = {
       enable = lib.mkEnableOption "Install JavaScript tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install JavaScript packages for";
       };
     };
-    devShells.javascript = lib.mkOption {
-      type = lib.types.package;
-      default = javascript.devShell;
-      description = "JavaScript/Node development shell with npm/pnpm support";
-    };
   };
 }

modules/dev/julia/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.julia = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Julia development shell";
+    };
     my.dev.julia = {
       enable = lib.mkEnableOption "Install Julia globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Julia packages for";
       };
     };
-    devShells.julia = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Julia development shell";
-    };
   };
 }

modules/dev/mcp/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.mcp = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "MCP dev shell for this repo";
+    };
     my.dev.mcp = {
       enable = lib.mkEnableOption "Install MCP tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install MCP packages for";
       };
     };
-    devShells.mcp = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "MCP dev shell for this repo";
-    };
   };
 }

modules/dev/nix/nixos.nix

@@ -13,6 +13,11 @@ let
 in
 {
   options = {
+    devShells.nix = lib.mkOption {
+      type = lib.types.package;
+      default = nix.devShell;
+      description = "Nix/NixOS development shell with formatter, linter, LSP, and Cachix";
+    };
     my.dev.nix = {
       enable = lib.mkEnableOption "Install Nix tooling globally";
       users = lib.mkOption {
@@ -21,10 +26,5 @@ in
         description = "Users to install Nix packages for";
       };
     };
-    devShells.nix = lib.mkOption {
-      type = lib.types.package;
-      default = nix.devShell;
-      description = "Nix/NixOS development shell with formatter, linter, LSP, and Cachix";
-    };
   };
 }

modules/dev/python/nixos.nix

@@ -10,6 +10,10 @@ let
 in
 {
   options = {
+    devShells.python = lib.mkOption {
+      type = lib.types.package;
+      default = python.devShell;
+    };
     my.dev.python = {
       enable = lib.mkEnableOption "Install Python tools globally";
       users = lib.mkOption {
@@ -18,9 +22,5 @@ in
         description = "Users to install Python packages for";
       };
     };
-    devShells.python = lib.mkOption {
-      type = lib.types.package;
-      default = python.devShell;
-    };
   };
 }

modules/dev/ruby/home.nix

@@ -28,11 +28,13 @@ in
       my.dev.ruby.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
-      home.sessionVariables = {
-        GEM_HOME = "${config.xdg.dataHome}/ruby/gems";
-        GEM_PATH = "${config.xdg.dataHome}/ruby/gems";
-        GEM_SPEC_CACHE = "${config.xdg.dataHome}/ruby/specs";
+      home = {
+        inherit (feature) packages;
+        sessionVariables = {
+          GEM_HOME = "${config.xdg.dataHome}/ruby/gems";
+          GEM_PATH = "${config.xdg.dataHome}/ruby/gems";
+          GEM_SPEC_CACHE = "${config.xdg.dataHome}/ruby/specs";
+        };
       };
     })
   ];

modules/dev/ruby/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.ruby = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Ruby development shell with interpreter and Solargraph LSP";
+    };
     my.dev.ruby = {
       enable = lib.mkEnableOption "Install Ruby tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Ruby packages for";
       };
     };
-    devShells.ruby = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Ruby development shell with interpreter and Solargraph LSP";
-    };
   };
 }

modules/dev/rust/home.nix

@@ -28,8 +28,10 @@ in
       my.dev.rust.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
-      home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo";
+      home = {
+        inherit (feature) packages;
+        sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo";
+      };
     })
   ];
 }

modules/dev/rust/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.rust = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Rust development shell with cargo and rust-analyzer";
+    };
     my.dev.rust = {
       enable = lib.mkEnableOption "Install Rust tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Rust packages for";
       };
     };
-    devShells.rust = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Rust development shell with cargo and rust-analyzer";
-    };
   };
 }

modules/dev/sh/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.sh = lib.mkOption {
+      type = lib.types.package;
+      default = sh.devShell;
+      description = "Shell scripting dev shell";
+    };
     my.dev.sh = {
       enable = lib.mkEnableOption "Install shell scripting tools globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install shell scripting packages for";
       };
     };
-    devShells.sh = lib.mkOption {
-      type = lib.types.package;
-      default = sh.devShell;
-      description = "Shell scripting dev shell";
-    };
   };
 }

modules/dev/zig/nixos.nix

@@ -10,6 +10,11 @@ let
 in
 {
   options = {
+    devShells.zig = lib.mkOption {
+      type = lib.types.package;
+      default = feature.devShell;
+      description = "Zig development shell with compiler and LSP";
+    };
     my.dev.zig = {
       enable = lib.mkEnableOption "Install Zig tooling globally";
       users = lib.mkOption {
@@ -18,10 +23,5 @@ in
         description = "Users to install Zig packages for";
       };
     };
-    devShells.zig = lib.mkOption {
-      type = lib.types.package;
-      default = feature.devShell;
-      description = "Zig development shell with compiler and LSP";
-    };
   };
 }