From 67c2023bfefacb2c5bfbfb157113f7defdf94c96 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 1 Jan 2026 16:10:27 -0500 Subject: [PATCH] host back up --- flake.nix | 102 +++++++++++++++++++++++++++++------------------ hosts/fwbook.nix | 1 - modules/lib.nix | 10 +---- 3 files changed, 64 insertions(+), 49 deletions(-) diff --git a/flake.nix b/flake.nix index 5bd1b66..76f73ce 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,6 @@ lib = import modules/lib.nix { - hostFolder = builtins.toString ./hosts; user = { name = "ari"; fullName = "Ari Sosnovsky"; @@ -113,45 +112,70 @@ # NIXOS LINUX Setups # ------------- - nixosConfigurations = (lib.makeNixosConfigurations [ + nixosConfigurations = { - hostName = "fwbook"; - systemStateVersion = "23.11"; - configuration = [ - ./hosts/fwbook.nix - ./hosts/fwbook.hardware-configuration.nix - nixos-hardware.nixosModules.framework-13-7040-amd - ]; + fwbook = lib.makeNixOs { + hostName = "fwbook"; + systemStateVersion = "23.11"; + configuration = [ + ./hosts/fwbook.nix + ./hosts/fwbook.hardware-configuration.nix + nixos-hardware.nixosModules.framework-13-7040-amd + ]; + }; + hl-fws1 = lib.makeNixOs { + hostName = "hl-fws1"; + configuration = [ + ./hosts/hl-fws1.nix + ./hosts/hl-fws1.hardware-configuration.nix + nixos-hardware.nixosModules.framework-11th-gen-intel + ]; + }; + hl-fwdesk = lib.makeNixOs { + hostName = "hl-fwdesk"; + systemStateVersion = "25.05"; + configuration = [ + ./hosts/hl-fwdesk.nix + ./hosts/hl-fwdesk.hardware-configuration.nix + nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series + ]; + }; + hl-bigbox1 = lib.makeNixOs { + hostName = "hl-bigbox1"; + configuration = [ + ./hosts/hl-bigbox1.nix + ./hosts/hl-bigbox1.hardware-configuration.nix + ]; + }; + hl-minipc1 = lib.makeNixOs { + hostName = "hl-minipc1"; + configuration = [ + ./hosts/hl-minipc1.nix + ./hosts/hl-minipc1.hardware-configuration.nix + ]; + }; + hl-minipc2 = lib.makeNixOs { + hostName = "hl-minipc2"; + configuration = [ + ./hosts/hl-minipc2.nix + ./hosts/hl-minipc2.hardware-configuration.nix + ]; + }; + hl-minipc3 = lib.makeNixOs { + hostName = "hl-minipc3"; + configuration = [ + ./hosts/hl-minipc3.nix + ./hosts/hl-minipc3.hardware-configuration.nix + ]; + }; + hl-terra1 = lib.makeNixOs { + hostName = "hl-terra1"; + configuration = [ + ./hosts/hl-terra1.nix + ./hosts/hl-terra1.hardware-configuration.nix + ]; + }; } - { hostName = "hl-minipc1"; } - { hostName = "hl-minipc2"; } - { hostName = "hl-minipc3"; } - { hostName = "hl-terra1"; } - { hostName = "hl-bigbox1"; } - { - hostName = "hl-fwdesk"; - systemStateVersion = "25.05"; - configuration = [ - nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series - ]; - } - { - hostName = "hl-fws1"; - configuration = [ - nixos-hardware.nixosModules.framework-11th-gen-intel - ]; - } - ]); - # // { - # fwbook = lib.makeNixOs { - # hostName = "fwbook"; - # systemStateVersion = "23.11"; - # configuration = [ - # - - # nixos-hardware.nixosModules.framework-13-7040-amd - # ]; - # }; - # } + ; }; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 6202dc0..7d2ffc0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,5 +1,4 @@ { pkgs -, system , unstablePkgs , user , ... diff --git a/modules/lib.nix b/modules/lib.nix index 0625821..6aa8792 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -8,7 +8,6 @@ , nix-flatpak , stylix , specialArgs -, hostFolder }: let skygUtils = import ./skyg-utils.nix; @@ -108,14 +107,7 @@ in value = makeNixOs { inherit hostName; - } // attrs // { - configuration = [ - import - (./hosts + "/${hostName}.nix") - import - (./hosts + "/${hostName}.hardware-configuration.nix") - ] ++ (if attrs.configuration then attrs.configuration else [ ]); - }; + } // attrs; }) nodes );