working on cache

flake.nix

@@ -178,10 +178,6 @@
               extraOptions = ''
                 experimental-features = nix-command flakes
               '';
-              settings = {
-                substituters = [ "https://colmena.cachix.org" ];
-                trusted-public-keys = [ "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" ];
-              };
             };
             environment.systemPackages = [
               nixpkgs-fmt.defaultPackage.${system}
@@ -194,6 +190,19 @@
               home-manager.nixosModules.home-manager
               permown.nixosModules.permown
               disko.nixosModules.disko
+              { nix.settings.substituters = [ "https://cache.nixos.org/" ]; }
+              {
+                nix.settings = {
+                  substituters = [ "https://colmena.cachix.org" ];
+                  trusted-public-keys = [ "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" ];
+                };
+              }
+              #{
+              #  nix.settings = {
+              #    substituters = [ "http://chungus.private:5000" "http://robi.private:5000" ];
+              #    #trusted-public-keys = [ "to be created" ];
+              #  };
+              #}
             ];
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;

nixos/machines/chungus/cache.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  services.nix-serve = {
+    enable = true;
+
+    # needed if i want to trust my own build packages and dirivations
+    # nix-store --generate-binary-cache-key key-name secret-key-file public-key-file
+    # secretKeyFile = sops.nixServeSecretKeyFile.path
+
+  };
+
+
+}

nixos/machines/chungus/configuration.nix

@@ -43,6 +43,8 @@
     #./kiosk.nix
     ./trilium.nix
 
+    ./cache.nix
+
   ];
 
   components.network.enable = true;

nixos/machines/cream/configuration.nix

@@ -20,7 +20,6 @@
 
     ./borg.nix
     ./trilium.nix
-
   ];
 
   users.users.mainUser.extraGroups = [ "pipewire" ];
@@ -35,7 +34,6 @@
 
   networking.hostName = "cream";
 
-
   services.flatpak.enable = true;
 
   security.wrappers = {

nixos/machines/robi/cache.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  services.nix-serve = {
+    enable = true;
+
+    # needed if i want to trust my own build packages and dirivations
+    # nix-store --generate-binary-cache-key key-name secret-key-file public-key-file
+    # secretKeyFile = sops.nixServeSecretKeyFile.path
+
+  };
+
+
+}

nixos/machines/robi/configuration.nix

@@ -53,9 +53,10 @@
     ./grafana.nix
     ./telegraf.nix
 
-
     ./sync-opentracker.nix
     ./sync-torrent.nix
+
+    ./cache.nix
   ];
 
   components.network.enable = true;

nixos/system/desktop/cachix.nix

@@ -1,14 +0,0 @@
-# WARN: this file will get overwritten by $ cachix use <name>
-{ pkgs, lib, ... }:
-
-let
-  folder = ./cachix;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport
-    (lib.filterAttrs filterCaches (builtins.readDir folder));
-in
-{
-  inherit imports;
-  nix.settings.substituters = [ "https://cache.nixos.org/" ];
-}

nixos/system/desktop/cachix/all-hies.nix

@@ -1,6 +0,0 @@
-{
-  nix.settings = {
-    substituters = [ "https://all-hies.cachix.org" ];
-    trusted-public-keys = [ "all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k=" ];
-  };
-}

nixos/system/desktop/default.nix

@@ -6,7 +6,6 @@
 
     #./icecast.nix
     #./audio.nix
-    ./cachix.nix
     ./mail-stuff.nix
     ./packages.nix
     ./size.nix