host back up

This commit is contained in:
ari committed 2026-01-01 16:10:27 -05:00
1 parent b5ec1e383f
commit 67c2023bfe
3 files changed
+64 -49

No files matched your search

+63 -39
View File
@@ -53,7 +53,6 @@
lib = lib =
import modules/lib.nix import modules/lib.nix
{ {
hostFolder = builtins.toString ./hosts;
user = { user = {
name = "ari"; name = "ari";
fullName = "Ari Sosnovsky"; fullName = "Ari Sosnovsky";
@@ -113,45 +112,70 @@
# NIXOS LINUX Setups # NIXOS LINUX Setups
# ------------- # -------------
nixosConfigurations = (lib.makeNixosConfigurations [ nixosConfigurations =
{ {
hostName = "fwbook"; fwbook = lib.makeNixOs {
systemStateVersion = "23.11"; hostName = "fwbook";
configuration = [ systemStateVersion = "23.11";
./hosts/fwbook.nix configuration = [
./hosts/fwbook.hardware-configuration.nix ./hosts/fwbook.nix
nixos-hardware.nixosModules.framework-13-7040-amd ./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
# ];
# };
# }
}; };
} }
-1
View File
@@ -1,5 +1,4 @@
{ pkgs { pkgs
, system
, unstablePkgs , unstablePkgs
, user , user
, ... , ...
+1 -9
View File
@@ -8,7 +8,6 @@
, nix-flatpak , nix-flatpak
, stylix , stylix
, specialArgs , specialArgs
, hostFolder
}: }:
let let
skygUtils = import ./skyg-utils.nix; skygUtils = import ./skyg-utils.nix;
@@ -108,14 +107,7 @@ in
value = makeNixOs value = makeNixOs
{ {
inherit hostName; inherit hostName;
} // attrs // { } // attrs;
configuration = [
import
(./hosts + "/${hostName}.nix")
import
(./hosts + "/${hostName}.hardware-configuration.nix")
] ++ (if attrs.configuration then attrs.configuration else [ ]);
};
}) })
nodes nodes
); );