Fix restricted settings warnings on non-nixos hosts

rake5k · Sep 7, 2024 · 3c27355 · 3c27355
1 parent 0b71363
commit 3c27355
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/home/base/non-nixos/default.nix b/home/base/non-nixos/default.nix
@@ -28,16 +28,6 @@ in
       '';
     };
 
-    nix = {
-      package = lib.mkForce pkgs.nix;
-      settings = {
-        experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
-      };
-    };
-
     programs.zsh.envExtra = lib.mkAfter ''
       hash -f
 

diff --git a/home/users/christian/shell/direnv/default.nix b/home/users/christian/shell/direnv/default.nix
@@ -41,10 +41,5 @@ in
     home.sessionVariables = {
       DIRENV_LOG_FORMAT = "";
     };
-
-    nix.settings = mkIf nonNixosCfg.enable {
-      keep-derivations = true;
-      keep-outputs = true;
-    };
   };
 }
diff --git a/lib/builders/mkHome.nix b/lib/builders/mkHome.nix
@@ -19,7 +19,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
   };
 
   modules = [
-    ./modules/nix-commons
+    ./modules/nix-home
     "${inputs.self}/hosts/${hostname}/home-${username}.nix"
   ] ++ homeModules;
 }
diff --git a/lib/builders/modules/nix-home/default.nix b/lib/builders/modules/nix-home/default.nix
@@ -0,0 +1,19 @@
+{ lib, inputs, pkgs, ... } @args:
+
+let
+
+  nixCommons = import ../nix-commons args;
+
+in
+
+{
+  nix = {
+    inherit (nixCommons.nix) package registry;
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+    };
+  };
+}