2 files changed, 2 insertions, 12 deletions
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index 3e6a97e..ed0fb23 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -13,6 +13,7 @@ in {
     ./documentation.nix
     ./locale.nix
     ./network.nix
+    ./nix.nix
     ./packages.nix
     ./root.nix
     ./security.nix
diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix
index dd8e40b..f1ef1db 100644
--- a/modules/nixos/server/default.nix
+++ b/modules/nixos/server/default.nix
@@ -29,18 +29,7 @@ in {
         options = "-d --delete-older-than 2d";
       };
 
-      settings = {
-        allowed-users = [config.networking.hostName];
-        trusted-substituters = [
-          "https://getchoo.cachix.org"
-          "https://nix-community.cachix.org"
-        ];
-
-        trusted-public-keys = [
-          "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        ];
-      };
+      settings.allowed-users = [config.networking.hostName];
     };
 
     nixpkgs.overlays = [(_: prev: {unstable = import nixpkgs {inherit (prev) system;};})];