From 060f0ff85daf49d243f975c52207d1963b9ce8e8 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 26 Jul 2024 17:04:13 -0400 Subject: [PATCH] generalized hlservice --- flake.nix | 59 +++++++++++++++++++++++++------------------- hosts/hl-minipc2.nix | 10 ++++++++ modules/lib.nix | 13 ++++++++++ 3 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 hosts/hl-minipc2.nix diff --git a/flake.nix b/flake.nix index 7cbdbfd..3d5033a 100644 --- a/flake.nix +++ b/flake.nix @@ -47,9 +47,7 @@ "http://minipc1.lab.internal:5000" "http://fwlaptop.devices.internal:5000" ]; - localDockerRegistries = [ - "minipc1.lab.internal:5001" - ]; + localDockerRegistries = [ "minipc1.lab.internal:5001" ]; # Libs lib = (import modules/lib.nix { nixpkgs = nixpkgs; @@ -67,6 +65,29 @@ system = system; config = { allowUnfree = true; }; }); + makeHLService = lib.makeNixOsModuleMaker { + system = "x86_64-linux"; + user = user; + localNixCaches = localNixCaches; + enableNetworkDrives = true; + enableHomelabServices = true; + home-manager = { + enable = true; + version = homeManagerVersion; + enableDevelopmentKit = false; + }; + os = { + enable = true; + firewall = { enable = false; }; + enableFonts = true; + hardware = { enable = false; }; + enablePrometheusExporters = true; + containers = { + runtime = "docker"; + localDockerRegistries = localDockerRegistries; + }; + }; + }; in { lib = lib; @@ -166,30 +187,18 @@ # NIXOS Homelab - minipc1 # ------------- - nixosConfigurations."hl-minipc1" = lib.makeNixOsModule { - system = "x86_64-linux"; - user = user; - localNixCaches = localNixCaches; - systemStateVersion = "23.11"; + nixosConfigurations."hl-minipc1" = makeHLService { hostName = "hl-minipc1"; - enableNetworkDrives = true; - enableHomelabServices = true; - home-manager = { - enable = true; - version = homeManagerVersion; - enableDevelopmentKit = false; - }; - os = { - enable = true; - firewall = { enable = false; }; - enablePrometheusExporters = true; - }; configuration = (import ./hosts/hl-minipc1.nix { user = user; }); - containers = { - runtime = "docker"; - enableOnBoot = true; - localDockerRegistries = localDockerRegistries; - }; + systemStateVersion = "23.11"; + }; + + # NIXOS Homelab - minipc2 + # ------------- + nixosConfigurations."hl-minipc2" = makeHLService { + hostName = "hl-minipc2"; + configuration = (import ./hosts/hl-minipc2.nix { user = user; }); + systemStateVersion = "24.05"; }; }; } diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix new file mode 100644 index 0000000..3507bb6 --- /dev/null +++ b/hosts/hl-minipc2.nix @@ -0,0 +1,10 @@ +{ user }: +{ pkgs, lib, config, ... }: { + imports = [ ./hl-minipc2.hardware-configuration.nix ]; + # firmware updater + services.fwupd.enable = true; + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; +} + diff --git a/modules/lib.nix b/modules/lib.nix index 8311a8e..507d59a 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -27,6 +27,19 @@ in home-manager-modules = [ home-manager.nixosModules.default ]; }); }; + makeNixOsModuleMaker = + masterAttrs: + { system ? masterAttrs.system ? "x86_64-linux" + , configuration ? null + , ... + }@attrs: + nixpkgs.lib.nixosSystem { + system = system; + modules = (makeImports { + attrs = masterAttrs // attrs; + home-manager-modules = [ home-manager.nixosModules.default ]; + }); + }; makeDarwinModule = { system ? "x86_64-darwin" , user