about summary refs log tree commit diff stats
path: root/sys
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-09 16:32:33 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-09 20:33:35 +0200
commit7b4ff390b5d7c698acced64c0633227143ccf49c (patch)
tree135860d70eed8f12f95064b79248fcde24e995a6 /sys
parentbuild(treewide): Update (diff)
downloadnixos-config-7b4ff390b5d7c698acced64c0633227143ccf49c.tar.gz
nixos-config-7b4ff390b5d7c698acced64c0633227143ccf49c.zip
chore(treewide): Conform to changed settings
Diffstat (limited to 'sys')
-rw-r--r--sys/secrets/default.nix12
-rw-r--r--sys/svcs/nix/default.nix10
2 files changed, 9 insertions, 13 deletions
diff --git a/sys/secrets/default.nix b/sys/secrets/default.nix
index 95bbf248..b013681b 100644
--- a/sys/secrets/default.nix
+++ b/sys/secrets/default.nix
@@ -25,13 +25,11 @@ in {
             owner = "soispha";
             group = "users";
           };
-          lf = {
-            cd_paths = {
-              file = ./lf/cd_paths;
-              mode = "700";
-              owner = "soispha";
-              group = "users";
-            };
+          lf_cd_paths = {
+            file = ./lf/cd_paths;
+            mode = "700";
+            owner = "soispha";
+            group = "users";
           };
           serverphoneCa = {
             file = ./serverphone/ca.key;
diff --git a/sys/svcs/nix/default.nix b/sys/svcs/nix/default.nix
index 9b05af1f..24c72b97 100644
--- a/sys/svcs/nix/default.nix
+++ b/sys/svcs/nix/default.nix
@@ -8,11 +8,9 @@
   ...
 }: {
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixVersions.latest;
 
-    # Disable the NixPath (this is but a remnant of old days)
-    # In the `nix repl` you should simply replace your `:l <nixpkgs>` with `:lf nixpgks`
-    nixPath = lib.mkForce [];
+    # Disable nix channels  (this is a remnant of old days)
     channel.enable = false;
 
     registry = {
@@ -30,6 +28,7 @@
       dates = "weekly";
       options = "--delete-older-than 7d";
     };
+
     settings = {
       auto-optimise-store = true;
       experimental-features = [
@@ -48,8 +47,7 @@
       keep-failed = true; # keep failed tmp build dirs
       pure-eval = true; # restrict file system and network access to hash
 
-      sandbox-fallback = false; # Don't disable the sandbox, if the kernel doesn't support
-      # it
+      sandbox-fallback = false; # Don't disable the sandbox, if the kernel doesn't support it
     };
   };
 }