From fff4cefdd056943d4d1b93044d900c45788527e8 Mon Sep 17 00:00:00 2001 From: Michael van Straten Date: Sun, 27 Oct 2024 15:52:14 +0100 Subject: [PATCH] feature/modular-outputs: Enable and refactor flake with modular outputs --- .github/workflows/check.yaml | 2 ++ checks/default.nix | 2 +- darwinConfigurations/default.nix | 20 ----------- flake.lock | 20 ++--------- flake.nix | 23 +++++------- homeConfigurations/mozilla.nix | 11 +++--- homeConfigurations/personal.nix | 11 +++--- .../h2946065/configuration.nix | 8 +++-- hosts/h2946065/outputs.nix | 13 +++++++ .../h2946065/virtual-disk-MBR.nix | 0 .../michaels-mbp-mozilla/configuration.nix | 10 ++++-- hosts/michaels-mbp-mozilla/outputs.nix | 12 +++++++ .../michaels-mbp/configuration.nix | 10 ++++-- hosts/michaels-mbp/outputs.nix | 12 +++++++ hosts/rack-01/intel-nucs/configuration.nix | 19 ++++++++++ hosts/rack-01/intel-nucs/outputs.nix | 17 +++++++++ lib/callModule.nix | 10 ++++++ lib/callOutputs.nix | 19 ++++++++++ lib/modulesFromDirectoryRecursive.nix | 10 ++++++ lib/outputs.nix | 7 ++++ modules/darwin/home-manager.nix | 2 -- modules/darwin/nix.nix | 3 +- modules/darwin/packages.nix | 3 +- modules/default.nix | 14 -------- modules/home-manager/Alacritty.nix | 3 +- modules/home-manager/Firefox.nix | 3 +- .../Karabiner-Elements/default.nix | 1 - modules/home-manager/Lazygit.nix | 1 - modules/home-manager/Poetry.nix | 1 - modules/home-manager/darwin/defaults.nix | 1 - modules/home-manager/git.nix | 1 - modules/home-manager/mozconfig/default.nix | 1 - modules/home-manager/nvim/default.nix | 3 +- modules/home-manager/shells.nix | 1 - modules/home-manager/skhd/default.nix | 5 +-- modules/home-manager/yabai/default.nix | 5 +-- modules/outputs.nix | 9 +++++ nixosConfigurations/default.nix | 35 ------------------- .../hosts/rack-01/k8s-master-nuc-01.nix | 18 ---------- 39 files changed, 186 insertions(+), 160 deletions(-) delete mode 100644 darwinConfigurations/default.nix rename {nixosConfigurations/hosts => hosts}/h2946065/configuration.nix (82%) create mode 100644 hosts/h2946065/outputs.nix rename {nixosConfigurations/hosts => hosts}/h2946065/virtual-disk-MBR.nix (100%) rename darwinConfigurations/hosts/mozilla-macbook-pro.nix => hosts/michaels-mbp-mozilla/configuration.nix (75%) create mode 100644 hosts/michaels-mbp-mozilla/outputs.nix rename darwinConfigurations/hosts/personal-macbook-pro.nix => hosts/michaels-mbp/configuration.nix (82%) create mode 100644 hosts/michaels-mbp/outputs.nix create mode 100644 hosts/rack-01/intel-nucs/configuration.nix create mode 100644 hosts/rack-01/intel-nucs/outputs.nix create mode 100644 lib/callModule.nix create mode 100644 lib/callOutputs.nix create mode 100644 lib/modulesFromDirectoryRecursive.nix create mode 100644 lib/outputs.nix delete mode 100644 modules/default.nix create mode 100644 modules/outputs.nix delete mode 100644 nixosConfigurations/default.nix delete mode 100644 nixosConfigurations/hosts/rack-01/k8s-master-nuc-01.nix diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index a2a5391..3b241b4 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -18,6 +18,8 @@ jobs: uses: cachix/install-nix-action@v30 with: nix_path: nixpkgs=channel:nixos-unstable + extra_nix_config: | + experimental-features = flakes nix-command pipe-operators # - name: Set up Magic Nix Cache # uses: DeterminateSystems/magic-nix-cache-action@main diff --git a/checks/default.nix b/checks/default.nix index bf09ffc..459ecec 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -3,7 +3,7 @@ pre-commit-check = pre-commit-hooks.lib.${system}.run { src = ./.; hooks = { - nil.enable = true; + # nil.enable = true; nixfmt-rfc-style.enable = true; prettier = { enable = true; diff --git a/darwinConfigurations/default.nix b/darwinConfigurations/default.nix deleted file mode 100644 index c493476..0000000 --- a/darwinConfigurations/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ nix-darwin, home-manager, ... }@args: - -{ - "michaels-macbook-pro" = nix-darwin.lib.darwinSystem { - system = "aarch64-darwin"; - modules = [ - home-manager.darwinModule - hosts/personal-macbook-pro.nix - ]; - specialArgs = args; - }; - "N7R221P6V5" = nix-darwin.lib.darwinSystem { - system = "aarch64-darwin"; - modules = [ - home-manager.darwinModule - hosts/mozilla-macbook-pro.nix - ]; - specialArgs = args; - }; -} diff --git a/flake.lock b/flake.lock index fe5739f..cb57191 100644 --- a/flake.lock +++ b/flake.lock @@ -401,27 +401,13 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { diff --git a/flake.nix b/flake.nix index 615bc9a..9d29342 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,7 @@ pre-commit-hooks = { url = "github:cachix/git-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { @@ -59,29 +60,19 @@ flake-utils, nixpkgs, pre-commit-hooks, - nix-darwin, - home-manager, ... }@inputs: let - callModule = - modulePath: extraArgs: - import modulePath ({ callModule = callModule; } // self.outputs // inputs // extraArgs); + inherit ((import ./lib/outputs.nix inputs).lib) callOutputs; in - { - darwinConfigurations = callModule ./darwinConfigurations { }; - nixosConfigurations = callModule ./nixosConfigurations { }; - - inherit (callModule ./modules { }) darwinModules homeModules nixosModules; - } - // flake-utils.lib.eachDefaultSystem ( + flake-utils.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs { inherit system; }; in { # Checks pre-commit-hooks - checks = callModule ./checks { inherit system; }; + checks = import ./checks { inherit pre-commit-hooks system; }; # Development shell with necessary tools devShells = @@ -101,5 +92,9 @@ # Formatter for this flake formatter = pkgs.nixfmt-rfc-style; } - ); + ) + // callOutputs { + directory = ./.; + inherit inputs; + }; } diff --git a/homeConfigurations/mozilla.nix b/homeConfigurations/mozilla.nix index 1ea86a1..a0788cc 100644 --- a/homeConfigurations/mozilla.nix +++ b/homeConfigurations/mozilla.nix @@ -1,9 +1,8 @@ -{ - homeModules, - pkgs, - lib, - ... -}: +{ self, ... }: +let + inherit (self) homeModules; +in +{ pkgs, lib, ... }: { imports = with homeModules; [ Alacritty diff --git a/homeConfigurations/personal.nix b/homeConfigurations/personal.nix index 08b3d41..ecd4e97 100644 --- a/homeConfigurations/personal.nix +++ b/homeConfigurations/personal.nix @@ -1,9 +1,8 @@ -{ - homeModules, - pkgs, - lib, - ... -}: +{ self, ... }: +let + inherit (self) homeModules; +in +{ pkgs, lib, ... }: { imports = with homeModules; [ Alacritty diff --git a/nixosConfigurations/hosts/h2946065/configuration.nix b/hosts/h2946065/configuration.nix similarity index 82% rename from nixosConfigurations/hosts/h2946065/configuration.nix rename to hosts/h2946065/configuration.nix index 5cdd1a6..d7136db 100644 --- a/nixosConfigurations/hosts/h2946065/configuration.nix +++ b/hosts/h2946065/configuration.nix @@ -1,7 +1,11 @@ -{ nixosModules, pkgs, ... }: +{ self, ... }@inputs: +let + inherit (self) nixosModules; +in +{ pkgs, ... }: { imports = with nixosModules; [ - ./virtual-disk-MBR.nix + (import ./virtual-disk-MBR.nix inputs) hardware.libvirtd nix personal-cloud diff --git a/hosts/h2946065/outputs.nix b/hosts/h2946065/outputs.nix new file mode 100644 index 0000000..a96ccc2 --- /dev/null +++ b/hosts/h2946065/outputs.nix @@ -0,0 +1,13 @@ +{ nixpkgs, sops-nix, ... }@inputs: +let + inherit (nixpkgs.lib) nixosSystem; +in +{ + nixosConfigurations.h2946065 = nixosSystem { + modules = [ + sops-nix.nixosModules.sops + (import ./configuration.nix inputs) + ../../secrets + ]; + }; +} diff --git a/nixosConfigurations/hosts/h2946065/virtual-disk-MBR.nix b/hosts/h2946065/virtual-disk-MBR.nix similarity index 100% rename from nixosConfigurations/hosts/h2946065/virtual-disk-MBR.nix rename to hosts/h2946065/virtual-disk-MBR.nix diff --git a/darwinConfigurations/hosts/mozilla-macbook-pro.nix b/hosts/michaels-mbp-mozilla/configuration.nix similarity index 75% rename from darwinConfigurations/hosts/mozilla-macbook-pro.nix rename to hosts/michaels-mbp-mozilla/configuration.nix index 4529fc4..daa4366 100644 --- a/darwinConfigurations/hosts/mozilla-macbook-pro.nix +++ b/hosts/michaels-mbp-mozilla/configuration.nix @@ -1,6 +1,7 @@ -{ darwinModules, pkgs, ... }: +{ self, ... }: +{ pkgs, ... }: { - imports = with darwinModules; [ + imports = with self.darwinModules; [ environment home-manager nix @@ -12,6 +13,11 @@ config.allowUnfree = true; }; + networking = { + computerName = "Michaels MacBook Pro at Mozilla"; + hostName = "michaels-mbp-mozilla"; + }; + users.users.mozilla = { createHome = true; description = "Michael van Straten"; diff --git a/hosts/michaels-mbp-mozilla/outputs.nix b/hosts/michaels-mbp-mozilla/outputs.nix new file mode 100644 index 0000000..3e494e3 --- /dev/null +++ b/hosts/michaels-mbp-mozilla/outputs.nix @@ -0,0 +1,12 @@ +{ nix-darwin, home-manager, ... }@inputs: +{ + darwinConfigurations = { + "michaels-mbp-mozilla" = nix-darwin.lib.darwinSystem { + system = "aarch64-darwin"; + modules = [ + home-manager.darwinModule + (import ./configuration.nix inputs) + ]; + }; + }; +} diff --git a/darwinConfigurations/hosts/personal-macbook-pro.nix b/hosts/michaels-mbp/configuration.nix similarity index 82% rename from darwinConfigurations/hosts/personal-macbook-pro.nix rename to hosts/michaels-mbp/configuration.nix index 378aaf0..90cb6de 100644 --- a/darwinConfigurations/hosts/personal-macbook-pro.nix +++ b/hosts/michaels-mbp/configuration.nix @@ -1,4 +1,8 @@ -{ darwinModules, pkgs, ... }: +{ self, ... }@inputs: +let + inherit (self) darwinModules; +in +{ pkgs, ... }: { imports = with darwinModules; [ environment @@ -14,7 +18,7 @@ networking = { computerName = "Michaels MacBook Pro"; - hostName = "michaels-macbook-pro"; + hostName = "michaels-mbp"; }; users.users.michaelvanstraten = { @@ -29,7 +33,7 @@ security.pam.enableSudoTouchIdAuth = true; - home-manager.users.michaelvanstraten = import ../../homeConfigurations/personal.nix; + home-manager.users.michaelvanstraten = import ../../homeConfigurations/personal.nix inputs; environment.systemPackages = with pkgs; [ darwin.trash ]; } diff --git a/hosts/michaels-mbp/outputs.nix b/hosts/michaels-mbp/outputs.nix new file mode 100644 index 0000000..1d69e91 --- /dev/null +++ b/hosts/michaels-mbp/outputs.nix @@ -0,0 +1,12 @@ +{ nix-darwin, home-manager, ... }@inputs: +{ + darwinConfigurations = { + "michaels-mbp" = nix-darwin.lib.darwinSystem { + system = "aarch64-darwin"; + modules = [ + home-manager.darwinModule + (import ./configuration.nix inputs) + ]; + }; + }; +} diff --git a/hosts/rack-01/intel-nucs/configuration.nix b/hosts/rack-01/intel-nucs/configuration.nix new file mode 100644 index 0000000..d206094 --- /dev/null +++ b/hosts/rack-01/intel-nucs/configuration.nix @@ -0,0 +1,19 @@ +{ self, sops-nix, ... }: +{ ... }: +{ + imports = + with self.nixosModules; + [ + format.raw-efi + hardware.intel-nuc + nix + personal-cloud + ssh + users + ] + ++ [ sops-nix.nixosModules.sops ]; + + console.keyMap = "de"; + + system.stateVersion = "25.11"; +} diff --git a/hosts/rack-01/intel-nucs/outputs.nix b/hosts/rack-01/intel-nucs/outputs.nix new file mode 100644 index 0000000..543af7f --- /dev/null +++ b/hosts/rack-01/intel-nucs/outputs.nix @@ -0,0 +1,17 @@ +{ nixpkgs, self, ... }@inputs: +let + inherit (nixpkgs.lib) nixosSystem; +in +({ + nixosConfigurations = builtins.mapAttrs ( + hostname: isMaster: + nixosSystem { + modules = [ + (if isMaster then self.nixosModules.roles.k8s-master else self.nixosModules.roles.k8s-worker) + ../../../secrets + (import ./configuration.nix inputs) + { networking.hostName = hostname; } + ]; + } + ) { "rack-01-k8s-master-nuc-01" = true; }; +}) diff --git a/lib/callModule.nix b/lib/callModule.nix new file mode 100644 index 0000000..0820c35 --- /dev/null +++ b/lib/callModule.nix @@ -0,0 +1,10 @@ +{ ... }@inputs: +modulePath: _: +let + module = import modulePath; + isFlakeModule = + module: + builtins.isFunction module + && (builtins.functionArgs module |> builtins.intersectAttrs inputs) != { }; +in +if isFlakeModule module then module inputs else module diff --git a/lib/callOutputs.nix b/lib/callOutputs.nix new file mode 100644 index 0000000..405c8b7 --- /dev/null +++ b/lib/callOutputs.nix @@ -0,0 +1,19 @@ +{ nixpkgs, ... }@inputs': +let + inherit (nixpkgs.lib.attrsets) recursiveUpdate; + inherit (nixpkgs.lib.filesystem) listFilesRecursive; +in +{ + directory, + inputs ? inputs', + outputPattern ? ".*/outputs\\.nix$", +}: +let + isOutputFile = path: (builtins.match outputPattern path) != null; + evaluateOutputFile = outputFile: import outputFile inputs; +in +listFilesRecursive directory +|> builtins.map (path: builtins.toString path) +|> builtins.filter isOutputFile +|> builtins.map evaluateOutputFile +|> builtins.foldl' recursiveUpdate { } diff --git a/lib/modulesFromDirectoryRecursive.nix b/lib/modulesFromDirectoryRecursive.nix new file mode 100644 index 0000000..8c96933 --- /dev/null +++ b/lib/modulesFromDirectoryRecursive.nix @@ -0,0 +1,10 @@ +{ self, nixpkgs, ... }: +let + inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive; + inherit (self.lib) callModule; +in +directory: +packagesFromDirectoryRecursive { + callPackage = callModule; + inherit directory; +} diff --git a/lib/outputs.nix b/lib/outputs.nix new file mode 100644 index 0000000..15c6435 --- /dev/null +++ b/lib/outputs.nix @@ -0,0 +1,7 @@ +inputs: { + lib = { + callModule = import ./callModule.nix inputs; + callOutputs = import ./callOutputs.nix inputs; + modulesFromDirectoryRecursive = import ./modulesFromDirectoryRecursive.nix inputs; + }; +} diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix index b96a641..a6224c7 100644 --- a/modules/darwin/home-manager.nix +++ b/modules/darwin/home-manager.nix @@ -1,8 +1,6 @@ -{ specialArgs, ... }: { home-manager = { backupFileExtension = "before-home-manager"; - extraSpecialArgs = specialArgs; useGlobalPkgs = true; useUserPackages = true; verbose = true; diff --git a/modules/darwin/nix.nix b/modules/darwin/nix.nix index a0a0036..8a783a8 100644 --- a/modules/darwin/nix.nix +++ b/modules/darwin/nix.nix @@ -7,8 +7,9 @@ linux-builder.enable = false; settings = { experimental-features = [ - "nix-command" "flakes" + "nix-command" + "pipe-operators" ]; trusted-users = [ "@admin" ]; }; diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index 643bfb6..9b4494e 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -1,4 +1,5 @@ -{ nixpkgs-firefox-darwin, pkgs, ... }: +{ nixpkgs-firefox-darwin, ... }: +{ pkgs, ... }: { nixpkgs = { overlays = [ nixpkgs-firefox-darwin.overlay ]; diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index cf8035d..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ nixpkgs, ... }: -let - modulesFromDirectoryRecursive = - directory: - nixpkgs.lib.filesystem.packagesFromDirectoryRecursive { - callPackage = modulePath: _: import modulePath; - inherit directory; - }; -in -{ - darwinModules = modulesFromDirectoryRecursive ./darwin; - homeModules = modulesFromDirectoryRecursive ./home-manager; - nixosModules = modulesFromDirectoryRecursive ./nixos; -} diff --git a/modules/home-manager/Alacritty.nix b/modules/home-manager/Alacritty.nix index 7a7130e..08dec8e 100644 --- a/modules/home-manager/Alacritty.nix +++ b/modules/home-manager/Alacritty.nix @@ -1,4 +1,5 @@ -{ cyberdream-theme, pkgs, ... }: +{ cyberdream-theme, ... }: +{ pkgs, ... }: { fonts.fontconfig.enable = true; home.packages = [ pkgs.nerdfonts ]; diff --git a/modules/home-manager/Firefox.nix b/modules/home-manager/Firefox.nix index 5e62274..7a1be14 100644 --- a/modules/home-manager/Firefox.nix +++ b/modules/home-manager/Firefox.nix @@ -1,4 +1,5 @@ -{ BetterFox, config, ... }: +{ BetterFox, ... }: +{ config, ... }: { programs.firefox = { # Let Firefox package be managed by the system diff --git a/modules/home-manager/Karabiner-Elements/default.nix b/modules/home-manager/Karabiner-Elements/default.nix index fdcc2d0..0c38f0f 100644 --- a/modules/home-manager/Karabiner-Elements/default.nix +++ b/modules/home-manager/Karabiner-Elements/default.nix @@ -1,4 +1,3 @@ -{ ... }: { home.file.".config/karabiner/assets".source = ./assets; home.file.".config/karabiner/karabiner.json".source = ./karabiner.json; diff --git a/modules/home-manager/Lazygit.nix b/modules/home-manager/Lazygit.nix index 902c986..0e42965 100644 --- a/modules/home-manager/Lazygit.nix +++ b/modules/home-manager/Lazygit.nix @@ -1,4 +1,3 @@ -{ ... }: { programs.lazygit = { enable = true; diff --git a/modules/home-manager/Poetry.nix b/modules/home-manager/Poetry.nix index 7c59ff8..37d31e8 100644 --- a/modules/home-manager/Poetry.nix +++ b/modules/home-manager/Poetry.nix @@ -1,4 +1,3 @@ -{ ... }: { programs.poetry = { enable = true; diff --git a/modules/home-manager/darwin/defaults.nix b/modules/home-manager/darwin/defaults.nix index 5c6e331..9cbbf64 100644 --- a/modules/home-manager/darwin/defaults.nix +++ b/modules/home-manager/darwin/defaults.nix @@ -1,4 +1,3 @@ -{ ... }: let defaults = { "NSGlobalDomain" = { diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index a63adfa..6c377f0 100644 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -1,4 +1,3 @@ -{ ... }: { programs.git = { enable = true; diff --git a/modules/home-manager/mozconfig/default.nix b/modules/home-manager/mozconfig/default.nix index 19c106a..c042d2e 100644 --- a/modules/home-manager/mozconfig/default.nix +++ b/modules/home-manager/mozconfig/default.nix @@ -1,4 +1,3 @@ -{ ... }: { home.file.".mozconfig/mozconfig-ff-dbg".source = ./mozconfig-ff-dbg; home.file.".mozconfig/mozconfig-ff-rel-dbg".source = ./mozconfig-ff-rel-dbg; diff --git a/modules/home-manager/nvim/default.nix b/modules/home-manager/nvim/default.nix index 1e08b0b..ccedc6a 100644 --- a/modules/home-manager/nvim/default.nix +++ b/modules/home-manager/nvim/default.nix @@ -1,4 +1,5 @@ -{ neovim-nightly-overlay, pkgs, ... }: +{ neovim-nightly-overlay, ... }: +{ pkgs, ... }: { home.file.".config/nvim".source = ./.; diff --git a/modules/home-manager/shells.nix b/modules/home-manager/shells.nix index 59adc5f..e1633f3 100644 --- a/modules/home-manager/shells.nix +++ b/modules/home-manager/shells.nix @@ -1,4 +1,3 @@ -{ ... }: { programs.fish = { enable = true; diff --git a/modules/home-manager/skhd/default.nix b/modules/home-manager/skhd/default.nix index 251c4b1..c5d52d5 100644 --- a/modules/home-manager/skhd/default.nix +++ b/modules/home-manager/skhd/default.nix @@ -1,4 +1 @@ -{ ... }: -{ - home.file.".config/skhd/skhdrc".source = ./skhdrc; -} +{ home.file.".config/skhd/skhdrc".source = ./skhdrc; } diff --git a/modules/home-manager/yabai/default.nix b/modules/home-manager/yabai/default.nix index a728e54..1c9b51e 100644 --- a/modules/home-manager/yabai/default.nix +++ b/modules/home-manager/yabai/default.nix @@ -1,4 +1 @@ -{ ... }: -{ - home.file.".config/yabai/yabairc".source = ./yabairc; -} +{ home.file.".config/yabai/yabairc".source = ./yabairc; } diff --git a/modules/outputs.nix b/modules/outputs.nix new file mode 100644 index 0000000..b0f264d --- /dev/null +++ b/modules/outputs.nix @@ -0,0 +1,9 @@ +{ self, ... }: +let + inherit (self.lib) modulesFromDirectoryRecursive; +in +{ + darwinModules = modulesFromDirectoryRecursive ./darwin; + homeModules = modulesFromDirectoryRecursive ./home-manager; + nixosModules = modulesFromDirectoryRecursive ./nixos; +} diff --git a/nixosConfigurations/default.nix b/nixosConfigurations/default.nix deleted file mode 100644 index 1b1abfb..0000000 --- a/nixosConfigurations/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ nixpkgs, sops-nix, ... }@args: -let - inherit (nixpkgs.lib) nixosSystem; - - make-disk-image = import "${nixpkgs}/nixos/lib/make-disk-image.nix"; - - defaultArgs = { - specialArgs = { - inherit make-disk-image; - } // args; - }; -in -{ - h2946065 = nixosSystem ( - defaultArgs - // { - modules = [ - ../secrets - ./hosts/h2946065/configuration.nix - sops-nix.nixosModules.sops - ]; - } - ); - - rack-01-k8s-master-nuc-01 = nixosSystem ( - defaultArgs - // { - modules = [ - ../secrets - ./hosts/rack-01/k8s-master-nuc-01.nix - sops-nix.nixosModules.sops - ]; - } - ); -} diff --git a/nixosConfigurations/hosts/rack-01/k8s-master-nuc-01.nix b/nixosConfigurations/hosts/rack-01/k8s-master-nuc-01.nix deleted file mode 100644 index a8515b0..0000000 --- a/nixosConfigurations/hosts/rack-01/k8s-master-nuc-01.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ nixosModules, ... }: -{ - imports = with nixosModules; [ - format.raw-efi - hardware.intel-nuc - nix - personal-cloud - roles.k8s-master - ssh - users - ]; - - console.keyMap = "de"; - - networking.hostName = "rack-01-k8s-master-nuc-01"; - - system.stateVersion = "25.11"; -}