HASH 2d1687c626cc
DATE 2025-05-13
SUBJECT refactor: move server profiles --> hosts/
FILES 13 CHANGED
HASH 2d1687c626cc
DATE 2025-05-13
SUBJECT refactor: move server profiles -->
hosts/
FILES 13 CHANGED
┌─ hosts/linode/base/boot.nix ───────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/base/boot.nix b/hosts/linode/bas │
│ e/boot.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/base/boot.nix │
│ rename to hosts/linode/base/boot.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/linode/base/boot.nix ─────────┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/base/boot.nix b/hosts/linode/base/boot │
│ .nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/base/boot.nix │
│ rename to hosts/linode/base/boot.nix │
└──────────────────────────────────────────────┘
┌─ hosts/linode/base/default.nix ────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/base/default.nix b/hosts/linode/ │
│ base/default.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/base/default.nix │
│ rename to hosts/linode/base/default.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/linode/base/default.nix ──────┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/base/default.nix b/hosts/linode/base/d │
│ efault.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/base/default.nix │
│ rename to hosts/linode/base/default.nix │
└──────────────────────────────────────────────┘
┌─ hosts/linode/base/file-system.nix ────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/base/file-system.nix b/hosts/lin │
│ ode/base/file-system.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/base/file-system.nix │
│ rename to hosts/linode/base/file-system.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ ...s/linode/base/file-system.nix ───┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/base/file-system.nix b/hosts/linode/ba │
│ se/file-system.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/base/file-system.nix │
│ rename to hosts/linode/base/file-system.nix │
└──────────────────────────────────────────────┘
┌─ hosts/linode/base/networking.nix ─────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/base/networking.nix b/hosts/lino │
│ de/base/networking.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/base/networking.nix │
│ rename to hosts/linode/base/networking.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/linode/base/networking.nix ───┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/base/networking.nix b/hosts/linode/bas │
│ e/networking.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/base/networking.nix │
│ rename to hosts/linode/base/networking.nix │
└──────────────────────────────────────────────┘
┌─ hosts/linode/default.nix ─────────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/default.nix b/hosts/linode/defau │
│ lt.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/default.nix │
│ rename to hosts/linode/default.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/linode/default.nix ───────────┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/default.nix b/hosts/linode/default.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/default.nix │
│ rename to hosts/linode/default.nix │
└──────────────────────────────────────────────┘
┌─ hosts/linode/image.nix ───────────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/image.nix b/hosts/linode/image.n │
│ ix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/image.nix │
│ rename to hosts/linode/image.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/linode/image.nix ─────────────┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/image.nix b/hosts/linode/image.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/image.nix │
│ rename to hosts/linode/image.nix │
└──────────────────────────────────────────────┘
┌─ hosts/linode/postgresql.nix ──────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/linode/postgresql.nix b/hosts/linode/po │
│ stgresql.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/linode/postgresql.nix │
│ rename to hosts/linode/postgresql.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/linode/postgresql.nix ────────┐
│ diff --git a/modules/nixos/server/profiles/l │
│ inode/postgresql.nix b/hosts/linode/postgres │
│ ql.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/li │
│ node/postgresql.nix │
│ rename to hosts/linode/postgresql.nix │
└──────────────────────────────────────────────┘
┌─ hosts/ooksmedia/hardware.nix ─────────────────────────────────────────────┐
│ diff --git a/hosts/ooksmedia/hardware.nix b/hosts/ooksmedia/hardware.nix │
│ index 6ed6778..a12d8f2 100644 │
│ --- a/hosts/ooksmedia/hardware.nix │
│ +++ b/hosts/ooksmedia/hardware.nix │
│ @@ -1,6 +1,9 @@ │
│ { │
│ ooknet.hardware = { │
│ - cpu.type = "intel"; │
│ + cpu = { │
│ + cores = 8; │
│ + type = "intel"; │
│ + }; │
│ gpu.type = "nvidia"; │
│ features = ["ssd" "audio" "video" "bluetooth"]; │
│ monitors = [ │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ooksmedia/hardware.nix ───────┐
│ diff --git a/hosts/ooksmedia/hardware.nix b/ │
│ hosts/ooksmedia/hardware.nix │
│ index 6ed6778..a12d8f2 100644 │
│ --- a/hosts/ooksmedia/hardware.nix │
│ +++ b/hosts/ooksmedia/hardware.nix │
│ @@ -1,6 +1,9 @@ │
│ { │
│ ooknet.hardware = { │
│ - cpu.type = "intel"; │
│ + cpu = { │
│ + cores = 8; │
│ + type = "intel"; │
│ + }; │
│ gpu.type = "nvidia"; │
│ features = ["ssd" "audio" "video" "blue │
│ tooth"]; │
│ monitors = [ │
└──────────────────────────────────────────────┘
┌─ hosts/ookstest/default.nix ───────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/ookstest/default.nix b/hosts/ookstest/d │
│ efault.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/ookstest/default.nix │
│ rename to hosts/ookstest/default.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookstest/default.nix ─────────┐
│ diff --git a/modules/nixos/server/profiles/o │
│ okstest/default.nix b/hosts/ookstest/default │
│ .nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/oo │
│ kstest/default.nix │
│ rename to hosts/ookstest/default.nix │
└──────────────────────────────────────────────┘
┌─ hosts/ookstest/disko.nix ─────────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/ookstest/disko.nix b/hosts/ookstest/dis │
│ ko.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/ookstest/disko.nix │
│ rename to hosts/ookstest/disko.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookstest/disko.nix ───────────┐
│ diff --git a/modules/nixos/server/profiles/o │
│ okstest/disko.nix b/hosts/ookstest/disko.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/oo │
│ kstest/disko.nix │
│ rename to hosts/ookstest/disko.nix │
└──────────────────────────────────────────────┘
┌─ hosts/ookstest/hardware.nix ──────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/ookstest/hardware.nix b/hosts/ookstest/ │
│ hardware.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/ookstest/hardware.nix │
│ rename to hosts/ookstest/hardware.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookstest/hardware.nix ────────┐
│ diff --git a/modules/nixos/server/profiles/o │
│ okstest/hardware.nix b/hosts/ookstest/hardwa │
│ re.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/oo │
│ kstest/hardware.nix │
│ rename to hosts/ookstest/hardware.nix │
└──────────────────────────────────────────────┘
┌─ hosts/ookstest/qemu.nix ──────────────────────────────────────────────────┐
│ diff --git a/modules/nixos/server/profiles/ookstest/qemu.nix b/hosts/ookstest/qemu │
│ .nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/ookstest/qemu.nix │
│ rename to hosts/ookstest/qemu.nix │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookstest/qemu.nix ────────────┐
│ diff --git a/modules/nixos/server/profiles/o │
│ okstest/qemu.nix b/hosts/ookstest/qemu.nix │
│ similarity index 100% │
│ rename from modules/nixos/server/profiles/oo │
│ kstest/qemu.nix │
│ rename to hosts/ookstest/qemu.nix │
└──────────────────────────────────────────────┘
┌─ outputs/lib/builders.nix ─────────────────────────────────────────────────┐
│ diff --git a/outputs/lib/builders.nix b/outputs/lib/builders.nix │
│ index 6944e04..c53f69c 100644 │
│ --- a/outputs/lib/builders.nix │
│ +++ b/outputs/lib/builders.nix │
│ @@ -29,7 +29,7 @@ │
│ }; │
│ common = { │
│ base = commonModules + "/base"; │
│ - appearance = commonModules + "/appearance"; │
│ + workstation = commonModules + "/workstation"; │
│ console = commonModules + "/console"; │
│ }; │
│ darwin = "${self}/modules/darwin"; │
│ @@ -42,7 +42,6 @@ │
│ │
│ core = [ │
│ common.base │
│ - common.appearance │
│ common.console │
│ ]; │
│ │
│ @@ -132,8 +131,8 @@ │
│ additionalModules = let │
│ platformModules = │
│ if (system == "aarch64-darwin") │
│ - then darwinCore │
│ - else nixosCore ++ [nixos.workstation]; │
│ + then darwinCore ++ [common.workstation] │
│ + else nixosCore ++ [nixos.workstation common.workstation]; │
│ in │
│ concatLists [ │
│ platformModules │
│ @@ -167,7 +166,7 @@ │
│ nixosCore │
│ ( │
│ if type == "vm" │
│ - then [(nixos.server + "/profiles/${profile}")] │
│ + then [(hostModules + "/${profile}")] │
│ else [(hostModules + "/${hostname}")] │
│ ) │
│ [nixos.server] │
│ @@ -202,7 +201,7 @@ │
│ ) │
│ ( │
│ if profile != null │
│ - then ["${self}/modules/server/profiles/${profile}/base"] │
│ + then [(hostModules + "/${profile}")] │
│ else [(hostModules + "/${hostname}")] │
│ ) │
│ ]; │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ outputs/lib/builders.nix ───────────┐
│ diff --git a/outputs/lib/builders.nix b/outp │
│ uts/lib/builders.nix │
│ index 6944e04..c53f69c 100644 │
│ --- a/outputs/lib/builders.nix │
│ +++ b/outputs/lib/builders.nix │
│ @@ -29,7 +29,7 @@ │
│ }; │
│ common = { │
│ base = commonModules + "/base"; │
│ - appearance = commonModules + "/appearan │
│ ce"; │
│ + workstation = commonModules + "/worksta │
│ tion"; │
│ console = commonModules + "/console"; │
│ }; │
│ darwin = "${self}/modules/darwin"; │
│ @@ -42,7 +42,6 @@ │
│ │
│ core = [ │
│ common.base │
│ - common.appearance │
│ common.console │
│ ]; │
│ │
│ @@ -132,8 +131,8 @@ │
│ additionalModules = let │
│ platformModules = │
│ if (system == "aarch64-darwin") │
│ - then darwinCore │
│ - else nixosCore ++ [nixos.workstat │
│ ion]; │
│ + then darwinCore ++ [common.workst │
│ ation] │
│ + else nixosCore ++ [nixos.workstat │
│ ion common.workstation]; │
│ in │
│ concatLists [ │
│ platformModules │
│ @@ -167,7 +166,7 @@ │
│ nixosCore │
│ ( │
│ if type == "vm" │
│ - then [(nixos.server + "/profile │
│ s/${profile}")] │
│ + then [(hostModules + "/${profil │
│ e}")] │
│ else [(hostModules + "/${hostna │
│ me}")] │
│ ) │
│ [nixos.server] │
│ @@ -202,7 +201,7 @@ │
│ ) │
│ ( │
│ if profile != null │
│ - then ["${self}/modules/server/pro │
│ files/${profile}/base"] │
│ + then [(hostModules + "/${profile} │
│ ")] │
│ else [(hostModules + "/${hostname │
│ }")] │
│ ) │
│ ]; │
└──────────────────────────────────────────────┘
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET