diff --git a/common.nix b/common.nix index 852e6f8..781ecec 100644 --- a/common.nix +++ b/common.nix @@ -8,7 +8,8 @@ { imports = [ inputs.home-manager.nixosModules.home-manager - ] ++ (lib.my.mapModulesRec' (toString ./modules) import); + ] + ++ (lib.my.mapModulesRec' (toString ./modules) import); nix = { package = pkgs.nixVersions.stable; @@ -18,9 +19,13 @@ substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org/" + "https://devenv.cachix.org" + "ssh://nix-ssh@hel1.banditlair.com" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "hel1.banditlair.com:stzB4xe5QTFvSABoP11ZpNzLDCRZ93PExk0Z/gOzW3g=" ]; auto-optimise-store = true; }; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index bf5a7ef..17fe64f 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -28,27 +28,25 @@ programs.kdeconnect.enable = true; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - nix = { - distributedBuilds = true; - buildMachines = [ - { - hostName = "hel1.banditlair.com"; - sshUser = "nix-ssh"; - system = "x86_64-linux"; - supportedFeatures = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - ]; - } - ]; - settings = { - substituters = [ "ssh://nix-ssh@hel1.banditlair.com" ]; - trusted-public-keys = [ "hel1.banditlair.com:stzB4xe5QTFvSABoP11ZpNzLDCRZ93PExk0Z/gOzW3g=" ]; - builders-use-substitutes = true; - }; - }; + # nix = { + # distributedBuilds = true; + # buildMachines = [ + # { + # hostName = "hel1.banditlair.com"; + # sshUser = "nix-ssh"; + # system = "x86_64-linux"; + # supportedFeatures = [ + # "nixos-test" + # "benchmark" + # "big-parallel" + # "kvm" + # ]; + # } + # ]; + # settings = { + # builders-use-substitutes = true; + # }; + # }; services.tailscale.enable = true;