chore: update nixos build expr

tao3k · Jul 3, 2024 · f915203 · f915203
1 parent f66ae4b
commit f915203
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/local/lock/flake.lock b/local/lock/flake.lock
diff --git a/src/mkHome.nix b/src/mkHome.nix
@@ -40,8 +40,9 @@ in
                     suites
                     { programs.${shell}.enable = true; }
                   ];
-                  home.stateVersion =
-                    if pkgs.stdenv.isDarwin then pkgs.lib.trivial.release else "24.05";
+                  home.stateVersion = lib.mkDefault (
+                    if pkgs.stdenv.isDarwin then pkgs.lib.trivial.release else "24.05"
+                  );
                 };
                 users.users.${userName} = {
                   shell = pkgs."${shell}";

diff --git a/units/nixos/darwinProfiles/presets/nix/default.nix b/units/nixos/darwinProfiles/presets/nix/default.nix
@@ -15,7 +15,7 @@ in
 {
   imports = [ (loadSubmodule ./optimise.nix) ];
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixVersions.git;
     configureBuildUsers = true;
     settings = {
       # Administrative users on Darwin systems are part of the admin group.

diff --git a/units/nixos/nixosProfiles/presets/coding/nickel.nix b/units/nixos/nixosProfiles/presets/coding/nickel.nix
@@ -24,6 +24,6 @@ in
   environment.systemPackages =
     [ (nickel.packages.${pkgs.system}.default or inputs.nickel.default) ]
     ++ lib.optionals cfg.enableLsp [
-      (nickel.packages.${pkgs.system}.lsp-nls or inputs.nickel.lsp-nls)
+      (nickel.packages.${pkgs.system}.nickel-lang-lsp)
     ];
 }
diff --git a/units/nixos/nixosProfiles/presets/node.nix → ...xos/nixosProfiles/presets/coding/node.nix b/units/nixos/nixosProfiles/presets/node.nix → ...xos/nixosProfiles/presets/coding/node.nix