fix: could not override environments in vscodium

GetPsyched · Nov 13, 2023 · f80e667 · f80e667
1 parent e5b57e3
commit f80e667
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/flake.nix b/flake.nix
@@ -17,11 +17,8 @@
     in
     {
       packages = forAllSystems (pkgs: with pkgs; {
-        default = ({ environments ? [ "nix" ] }: callPackage ./packages/default.nix { inherit environments; }) { };
-
-        vscodium = ({ environments ? [ "nix" ] }: callPackage ./packages/vscodium.nix {
-          envExtensions = (builtins.concatMap (env: (import ./devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments);
-        }) { };
+        default = callPackage ./packages/default.nix { };
+        vscodium = callPackage ./packages/vscodium.nix { };
       });
     };
 }
diff --git a/packages/default.nix b/packages/default.nix
@@ -1,4 +1,4 @@
-{ environments, pkgs, ... }:
+{ environments ? [ "nix" ], pkgs, ... }:
 
 with pkgs; symlinkJoin {
   name = "default";

diff --git a/packages/vscodium.nix b/packages/vscodium.nix
@@ -1,11 +1,11 @@
-{ envExtensions ? [ ], extensions ? [ ], pkgs, ... }:
+{ environments ? [ "nix" ], extensions ? [ ], pkgs, ... }:
 
 with pkgs; symlinkJoin {
   name = "vscodium";
   paths = [
     (vscode-with-extensions.override {
       vscode = vscodium;
-      vscodeExtensions = envExtensions ++ extensions;
+      vscodeExtensions = (builtins.concatMap (env: (import ../devShells/${env}.nix { inherit pkgs; }).vscodium.extensions) environments) ++ extensions;
     })
 
     # Fix for: https://discourse.nixos.org/t/interactive-bash-with-nix-develop-flake/15486