emacs-vm fix

modules/dev/cc/common.nix

@@ -1,19 +1,20 @@
 { pkgs }:
 let
-  packages = builtins.attrValues {
+  basePackages = builtins.attrValues {
     inherit (pkgs)
-      clang
       clang-tools
       gcc
       gdb
       valgrind
       ;
   };
+  homePackages = basePackages;
+  devShellPackages = basePackages ++ [ pkgs.clang ];
 in
 {
-  inherit packages;
+  inherit devShellPackages homePackages;
   devShell = pkgs.mkShell {
-    inherit packages;
+    packages = devShellPackages;
     name = "cc-dev-shell";
     shellHook = ''
       echo "🔧 C/C++ dev environment"

modules/dev/cc/home.nix

@@ -28,7 +28,7 @@ in
       my.dev.cc.enable = lib.mkDefault hm.enabledByDefault;
     }
     (lib.mkIf cfg.enable {
-      home.packages = feature.packages;
+      home.packages = feature.homePackages;
     })
   ];
 }

modules/dev/go/common.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 let
-  packages = builtins.attrValues {
+  basePackages = builtins.attrValues {
     inherit (pkgs)
       go
       gocode-gomod
@@ -9,14 +9,16 @@ let
       gomodifytags
       golangci-lint
       ;
-    gotools = pkgs.lib.lowPrio pkgs.gotools;
   };
+  homePackages = basePackages;
+  devShellPackages = basePackages ++ [ pkgs.gotools ];
   GOPATH = "\${XDG_DATA_HOME:-\$HOME/.local/share}/go";
 in
 {
-  inherit packages GOPATH;
+  inherit devShellPackages homePackages GOPATH;
   devShell = pkgs.mkShell {
-    inherit packages GOPATH;
+    packages = devShellPackages;
+    inherit GOPATH;
     name = "go-dev-shell";
     shellHook = ''
       echo "🐹 Go dev environment"

modules/dev/go/home.nix

@@ -29,7 +29,7 @@ in
     }
     (lib.mkIf cfg.enable {
       home = {
-        inherit (feature) packages;
+        packages = feature.homePackages;
         sessionVariables.GOPATH = "${config.xdg.dataHome}/go";
       };
     })