From 1fcffc0650be435e3d5d4493679276037fad588d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 9 Aug 2024 14:57:03 -0400 Subject: [PATCH] Moved all nix configs --- modules/main.nix | 26 +++++++++++++---- modules/nix/default.nix | 48 ------------------------------- modules/nix/remote-builder.nix | 28 ------------------ modules/skyg/default.nix | 1 + modules/skyg/nix-substituters.nix | 39 +++++++++++++++++++++++++ modules/skyg/user.nix | 1 + 6 files changed, 61 insertions(+), 82 deletions(-) delete mode 100644 modules/nix/default.nix delete mode 100644 modules/nix/remote-builder.nix create mode 100644 modules/skyg/nix-substituters.nix diff --git a/modules/main.nix b/modules/main.nix index f3a3101..a437e75 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -16,14 +16,9 @@ , localNixCaches ? { keys = [ ]; urls = [ ]; } , ... }: -{ ... }: { +{ pkgs, ... }: { imports = [ (import ./skyg) - (import ./nix { - user = user; - systemStateVersion = systemStateVersion; - localNixCaches = localNixCaches; - }) ] ++ (if desktop.enable then [ (import ./desktop ({ user = user; } // desktop)) ] else @@ -40,6 +35,25 @@ ++ (if enableHomelabServices then [ (import ./hl-services) ] else [ ]) ++ (if enableHomelabServices then [ (import ./hl-hardware) ] else [ ]) ; + # Share defaults skyg.user = user; skyg.home-manager.version = homeManagerVersion; + skyg.core.substituters = localNixCaches; + system.stateVersion = systemStateVersion; + nixpkgs.config.allowUnfree = true; + nix.settings = { + optimise.automatic = true; + experimental-features = [ "nix-command" "flakes" ]; + }; + # System Packages + environment.systemPackages = with pkgs; [ + # nix utils + nix-index + nil + cachix + nixpkgs-fmt + nvd + # shell tools + wget + ]; } diff --git a/modules/nix/default.nix b/modules/nix/default.nix deleted file mode 100644 index 827b200..0000000 --- a/modules/nix/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ user, systemStateVersion, localNixCaches ? { keys = [ ]; urls = [ ]; } }: -{ pkgs, ... }: -{ - imports = [ - (import ./remote-builder.nix { - user = user; - }) - ]; - # Nix core - system.stateVersion = systemStateVersion; - nixpkgs.config.allowUnfree = true; - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - substituters = [ - "https://cache.nixos.org" - "https://cache.flox.dev" - "https://devenv.cachix.org" - ] ++ localNixCaches.urls; - trusted-substituters = [ - "https://cache.flox.dev" - "https://devenv.cachix.org" - ] ++ localNixCaches.urls; - trusted-users = [ "root" user.name ]; - trusted-public-keys = [ - "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" - "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" - ] ++ localNixCaches.keys; - }; - - # System Packages - programs.zsh.enable = true; - environment.systemPackages = with pkgs; [ - # nix utils - nix-index - nil - cachix - nixpkgs-fmt - nix-serve - nvd - - # shell tools - wget - - ]; - # Storage Optim - nix.optimise.automatic = true; - -} diff --git a/modules/nix/remote-builder.nix b/modules/nix/remote-builder.nix deleted file mode 100644 index 2e619d1..0000000 --- a/modules/nix/remote-builder.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ user }: -{ config, lib, ... }: -with lib; -let cfg = config.homelab.nix.remote-builder; -in { - options = { - homelab.nix.remote-builder = { - enable = mkEnableOption - "Enable Remote Local Builders"; - }; - }; - config = mkIf cfg.enable { - nix.buildMachines = [{ - hostName = "bigbox1.lab.internal"; - sshUser = user.name; - system = "x86_64-linux"; - protocol = "ssh-ng"; - maxJobs = 4; - speedFactor = 4; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; - }]; - nix.distributedBuilds = true; - nix.extraOptions = '' - builders-use-substitutes = true - ''; - }; -} diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index 58ec467..7c5c34e 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -4,5 +4,6 @@ ./core.nix ./user.nix ./macos.nix + ./nix-substituters.nix ]; } diff --git a/modules/skyg/nix-substituters.nix b/modules/skyg/nix-substituters.nix new file mode 100644 index 0000000..d60c5c5 --- /dev/null +++ b/modules/skyg/nix-substituters.nix @@ -0,0 +1,39 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.skyg.core.substituters; + skygUser = config.skyg.user; +in +{ + options = { + skyg.core.substituters = { + urls = mkOption { + type = types.listOf types.str; + default = [ ]; + }; + keys = mkOption { + type = types.listOf types.str; + default = [ ]; + }; + }; + }; + + config = { + nix.settings.substituters = [ + "https://cache.nixos.org" + "https://cache.flox.dev" + "https://devenv.cachix.org" + ] ++ cfg.urls; + nix.settings.trusted-substituters = [ + "https://cache.flox.dev" + "https://devenv.cachix.org" + ] ++ cfg.urls; + nix.settings.trusted-public-keys = [ + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + ] ++ cfg.keys; + nix.settings.trusted-users = [ "root" skygUser.name ]; + }; +} diff --git a/modules/skyg/user.nix b/modules/skyg/user.nix index 6fff6c0..cc2cefe 100644 --- a/modules/skyg/user.nix +++ b/modules/skyg/user.nix @@ -40,6 +40,7 @@ in }; config = { + programs.zsh.enable = true; home-manager.users.root = { home.stateVersion = cfg.home-manager.version; programs.git = {