From d48e4d4f101d1a387bee90d62499d0012dd526de Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Mon, 13 Jul 2026 16:03:48 +1000 Subject: [PATCH] moved common into modules --- flake.nix | 14 +++++++------- hosts/docker/configuration.nix | 2 +- hosts/nix-cache/configuration.nix | 2 +- hosts/nix-minimal/configuration.nix | 2 +- hosts/nixos/configuration.nix | 2 +- hosts/pxe-boot/configuration.nix | 2 +- hosts/server/configuration.nix | 2 +- {common => modules/common}/aliases.nix | 0 {common => modules/common}/configuration.nix | 2 +- {common => modules/common}/home.nix | 0 .../hardware-configuration/vm/proxmox.nix | 0 11 files changed, 14 insertions(+), 14 deletions(-) rename {common => modules/common}/aliases.nix (100%) rename {common => modules/common}/configuration.nix (98%) rename {common => modules/common}/home.nix (100%) rename common/hardware-configuration.nix => modules/hardware-configuration/vm/proxmox.nix (100%) diff --git a/flake.nix b/flake.nix index 9b4ee32..7808cdf 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ inherit system; modules = [ ./hosts/nixos/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -58,7 +58,7 @@ docker = nixpkgs.lib.nixosSystem { modules = [ ./hosts/docker/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -71,7 +71,7 @@ docker = nixpkgs.lib.nixosSystem { inherit system; modules = [ ./hosts/kuma/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -85,7 +85,7 @@ docker = nixpkgs.lib.nixosSystem { inherit system; modules = [ ./hosts/server/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -99,7 +99,7 @@ docker = nixpkgs.lib.nixosSystem { inherit system; modules = [ ./hosts/nix-cache/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -113,7 +113,7 @@ docker = nixpkgs.lib.nixosSystem { inherit system; modules = [ ./hosts/nix-minimal/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -127,7 +127,7 @@ docker = nixpkgs.lib.nixosSystem { inherit system; modules = [ ./hosts/pxe-boot/configuration.nix - ./common/hardware-configuration.nix + ./modules/hardware-configuration/vm/proxmox.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix index e4c8373..9ef6ffa 100644 --- a/hosts/docker/configuration.nix +++ b/hosts/docker/configuration.nix @@ -7,7 +7,7 @@ { imports = [ - ../../common/configuration.nix + ../../modules/common/configuration.nix ../../modules/nix-cache/client.nix ../../modules/remote-builder-client.nix ../../modules/docker/mount-data.nix diff --git a/hosts/nix-cache/configuration.nix b/hosts/nix-cache/configuration.nix index 98689d7..9eb0a0f 100644 --- a/hosts/nix-cache/configuration.nix +++ b/hosts/nix-cache/configuration.nix @@ -7,7 +7,7 @@ { imports = [ # Include the results of the hardware scan. - ../../common/configuration.nix + ../../modules/common/configuration.nix ../../modules/nix-cache/server.nix ../../modules/beszel/enable-agent.nix ]; diff --git a/hosts/nix-minimal/configuration.nix b/hosts/nix-minimal/configuration.nix index e06fd2e..2622600 100644 --- a/hosts/nix-minimal/configuration.nix +++ b/hosts/nix-minimal/configuration.nix @@ -7,7 +7,7 @@ { imports = [ # Include the results of the hardware scan. - ../../common/configuration.nix + ../../modules/common/configuration.nix ../../modules/nix/cache-client.nix ../../modules/nix/remote-builder-client.nix ]; diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index 6cab841..a14661a 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -27,7 +27,7 @@ in { imports = [ # Include the results of the hardware scan. - ../../common/configuration.nix + ../../modules/common/configuration.nix ../../modules/nix/cache-client.nix ../../modules/nix/remote-builder-client.nix ]; diff --git a/hosts/pxe-boot/configuration.nix b/hosts/pxe-boot/configuration.nix index b876511..c4b4d07 100644 --- a/hosts/pxe-boot/configuration.nix +++ b/hosts/pxe-boot/configuration.nix @@ -93,7 +93,7 @@ in { imports = [ - ../../common/configuration.nix + ../../modules/common/configuration.nix ../../modules/nix/cache-client.nix ../../modules/nix/remote-builder-client.nix ]; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index c4cdbd4..0c0b6fa 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -6,7 +6,7 @@ { imports = [ # Include the results of the hardware scan. - ../../common/configuration.nix + ../../modules/common/configuration.nix ../../modules/nix-cache/client.nix ../../modules/remote-builder-client.nix ../../modules/beszel/enable-agent.nix diff --git a/common/aliases.nix b/modules/common/aliases.nix similarity index 100% rename from common/aliases.nix rename to modules/common/aliases.nix diff --git a/common/configuration.nix b/modules/common/configuration.nix similarity index 98% rename from common/configuration.nix rename to modules/common/configuration.nix index 90a0480..ce674ba 100644 --- a/common/configuration.nix +++ b/modules/common/configuration.nix @@ -4,7 +4,7 @@ imports = [ # Include the results of the hardware scan. # ./hardware-configuration.nix - ../modules/set-locale.nix + ../set-locale.nix ]; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/common/home.nix b/modules/common/home.nix similarity index 100% rename from common/home.nix rename to modules/common/home.nix diff --git a/common/hardware-configuration.nix b/modules/hardware-configuration/vm/proxmox.nix similarity index 100% rename from common/hardware-configuration.nix rename to modules/hardware-configuration/vm/proxmox.nix