Refactor

joinemm · Jul 5, 2024 · 5c9be2d · 5c9be2d
1 parent 53b102a
commit 5c9be2d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/hosts/x1/configuration.nix b/hosts/x1/configuration.nix
@@ -18,7 +18,7 @@
       remotebuild
       transmission
       syncthing
-      work-vpn
+      work
       yubikey
     ])
     (with inputs.nixos-hardware.nixosModules; [

diff --git a/hosts/zeus/configuration.nix b/hosts/zeus/configuration.nix
@@ -17,7 +17,7 @@
       remotebuild
       syncthing
       transmission
-      work-vpn
+      work
       yubikey
     ])
     (with inputs.nixos-hardware.nixosModules; [

diff --git a/modules/common.nix b/modules/common.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   user,
   ...
@@ -33,29 +32,16 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  nix = {
-    settings = {
-      substituters = [
-        "https://nix-gaming.cachix.org"
-        "https://joinemm.cachix.org"
-        "https://cache.vedenemo.dev"
-      ];
-      trusted-public-keys = [
-        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-        "joinemm.cachix.org-1:aMZBO1baRjhaI5QzePLelFz/GJ82fZOjmiHQwCl1FxI="
-        "cache.vedenemo.dev:8NhplARANhClUSWJyLVk4WMyy1Wb4rhmWW2u8AejH9E="
-      ];
+  nix.settings = {
+    max-jobs = "auto";
+    trusted-users = ["root" "@wheel"];
+    experimental-features = ["nix-command" "flakes"];
 
-      trusted-users = ["root" "@wheel"];
-      experimental-features = ["nix-command" "flakes"];
-      allow-import-from-derivation = true;
-
-      max-jobs = 2;
-      auto-optimise-store = true;
-      builders-use-substitutes = true;
-      keep-derivations = true;
-      keep-outputs = true;
-    };
+    allow-import-from-derivation = true;
+    auto-optimise-store = true;
+    builders-use-substitutes = true;
+    keep-derivations = true;
+    keep-outputs = true;
   };
 
   users.users."${user.name}" = {

diff --git a/modules/default.nix b/modules/default.nix
@@ -14,6 +14,6 @@
   ssh-access = import ./ssh-access.nix;
   syncthing = import ./syncthing.nix;
   transmission = import ./transmission.nix;
-  work-vpn = import ./work-vpn.nix;
+  work = import ./work.nix;
   yubikey = import ./yubikey.nix;
 }
diff --git a/modules/dev.nix b/modules/dev.nix
diff --git a/modules/work-vpn.nix → modules/work.nix b/modules/work-vpn.nix → modules/work.nix
@@ -16,4 +16,13 @@
       };
     };
   };
+
+  nix.settings = {
+    substituters = [
+      "https://cache.vedenemo.dev"
+    ];
+    trusted-public-keys = [
+      "cache.vedenemo.dev:8NhplARANhClUSWJyLVk4WMyy1Wb4rhmWW2u8AejH9E="
+    ];
+  };
 }