From 77a4563fdec2f983bd1ab9aefa27e7795be67bd9 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 9 Jan 2025 19:09:55 +1000 Subject: [PATCH] tidied --- {hosts => core/hosts}/hades/default.nix | 0 {hosts => core/hosts}/hades/modules/default.nix | 0 {hosts => core/hosts}/hades/modules/disko.nix | 0 {hosts => core/hosts}/hades/modules/hardware.nix | 0 {hosts => core/hosts}/hades/modules/network.nix | 0 {hosts => core/hosts}/hades/modules/zfs.nix | 0 {hosts => core/hosts}/iso/default.nix | 0 {hosts => core/hosts}/iso/modules/default.nix | 0 {hosts => core/hosts}/iso/modules/network.nix | 0 {hosts => core/hosts}/orcus/default.nix | 0 {hosts => core/hosts}/orcus/modules/default.nix | 0 {hosts => core/hosts}/orcus/modules/network.nix | 0 {hosts => core/hosts}/orcus/modules/zfs.nix | 0 {hosts => core/hosts}/persephone/default.nix | 0 {hosts => core/hosts}/persephone/modules/default.nix | 0 {hosts => core/hosts}/persephone/modules/disko.nix | 0 {hosts => core/hosts}/persephone/modules/hardware.nix | 0 {hosts => core/hosts}/persephone/modules/network.nix | 0 flake.nix | 6 +++--- 19 files changed, 3 insertions(+), 3 deletions(-) rename {hosts => core/hosts}/hades/default.nix (100%) rename {hosts => core/hosts}/hades/modules/default.nix (100%) rename {hosts => core/hosts}/hades/modules/disko.nix (100%) rename {hosts => core/hosts}/hades/modules/hardware.nix (100%) rename {hosts => core/hosts}/hades/modules/network.nix (100%) rename {hosts => core/hosts}/hades/modules/zfs.nix (100%) rename {hosts => core/hosts}/iso/default.nix (100%) rename {hosts => core/hosts}/iso/modules/default.nix (100%) rename {hosts => core/hosts}/iso/modules/network.nix (100%) rename {hosts => core/hosts}/orcus/default.nix (100%) rename {hosts => core/hosts}/orcus/modules/default.nix (100%) rename {hosts => core/hosts}/orcus/modules/network.nix (100%) rename {hosts => core/hosts}/orcus/modules/zfs.nix (100%) rename {hosts => core/hosts}/persephone/default.nix (100%) rename {hosts => core/hosts}/persephone/modules/default.nix (100%) rename {hosts => core/hosts}/persephone/modules/disko.nix (100%) rename {hosts => core/hosts}/persephone/modules/hardware.nix (100%) rename {hosts => core/hosts}/persephone/modules/network.nix (100%) diff --git a/hosts/hades/default.nix b/core/hosts/hades/default.nix similarity index 100% rename from hosts/hades/default.nix rename to core/hosts/hades/default.nix diff --git a/hosts/hades/modules/default.nix b/core/hosts/hades/modules/default.nix similarity index 100% rename from hosts/hades/modules/default.nix rename to core/hosts/hades/modules/default.nix diff --git a/hosts/hades/modules/disko.nix b/core/hosts/hades/modules/disko.nix similarity index 100% rename from hosts/hades/modules/disko.nix rename to core/hosts/hades/modules/disko.nix diff --git a/hosts/hades/modules/hardware.nix b/core/hosts/hades/modules/hardware.nix similarity index 100% rename from hosts/hades/modules/hardware.nix rename to core/hosts/hades/modules/hardware.nix diff --git a/hosts/hades/modules/network.nix b/core/hosts/hades/modules/network.nix similarity index 100% rename from hosts/hades/modules/network.nix rename to core/hosts/hades/modules/network.nix diff --git a/hosts/hades/modules/zfs.nix b/core/hosts/hades/modules/zfs.nix similarity index 100% rename from hosts/hades/modules/zfs.nix rename to core/hosts/hades/modules/zfs.nix diff --git a/hosts/iso/default.nix b/core/hosts/iso/default.nix similarity index 100% rename from hosts/iso/default.nix rename to core/hosts/iso/default.nix diff --git a/hosts/iso/modules/default.nix b/core/hosts/iso/modules/default.nix similarity index 100% rename from hosts/iso/modules/default.nix rename to core/hosts/iso/modules/default.nix diff --git a/hosts/iso/modules/network.nix b/core/hosts/iso/modules/network.nix similarity index 100% rename from hosts/iso/modules/network.nix rename to core/hosts/iso/modules/network.nix diff --git a/hosts/orcus/default.nix b/core/hosts/orcus/default.nix similarity index 100% rename from hosts/orcus/default.nix rename to core/hosts/orcus/default.nix diff --git a/hosts/orcus/modules/default.nix b/core/hosts/orcus/modules/default.nix similarity index 100% rename from hosts/orcus/modules/default.nix rename to core/hosts/orcus/modules/default.nix diff --git a/hosts/orcus/modules/network.nix b/core/hosts/orcus/modules/network.nix similarity index 100% rename from hosts/orcus/modules/network.nix rename to core/hosts/orcus/modules/network.nix diff --git a/hosts/orcus/modules/zfs.nix b/core/hosts/orcus/modules/zfs.nix similarity index 100% rename from hosts/orcus/modules/zfs.nix rename to core/hosts/orcus/modules/zfs.nix diff --git a/hosts/persephone/default.nix b/core/hosts/persephone/default.nix similarity index 100% rename from hosts/persephone/default.nix rename to core/hosts/persephone/default.nix diff --git a/hosts/persephone/modules/default.nix b/core/hosts/persephone/modules/default.nix similarity index 100% rename from hosts/persephone/modules/default.nix rename to core/hosts/persephone/modules/default.nix diff --git a/hosts/persephone/modules/disko.nix b/core/hosts/persephone/modules/disko.nix similarity index 100% rename from hosts/persephone/modules/disko.nix rename to core/hosts/persephone/modules/disko.nix diff --git a/hosts/persephone/modules/hardware.nix b/core/hosts/persephone/modules/hardware.nix similarity index 100% rename from hosts/persephone/modules/hardware.nix rename to core/hosts/persephone/modules/hardware.nix diff --git a/hosts/persephone/modules/network.nix b/core/hosts/persephone/modules/network.nix similarity index 100% rename from hosts/persephone/modules/network.nix rename to core/hosts/persephone/modules/network.nix diff --git a/flake.nix b/flake.nix index 219af25..bda2d31 100755 --- a/flake.nix +++ b/flake.nix @@ -112,8 +112,7 @@ }; - outputs = { self, nixpkgs, disko, sops-nix, musnix, nixos-generators - , + outputs = { self, nixpkgs, disko, sops-nix, musnix, nixos-generators, ## Disabled outputs - part of 'flakeification': enable and use correctly. #lix, lix-module, flake-utils, flake-parts, #nix-colors, home-manager, nixvim, @@ -166,7 +165,8 @@ sops-nix.nixosModules.sops musnix.nixosModules.musnix disko.nixosModules.disko - ./hosts/hades + ./core/hosts/hades + ./core/modules/zfs.nix ]; };