From ff0c287624437c9608603bf1ec745070edd96ab1 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 14 Sep 2025 13:09:37 +0200 Subject: [PATCH] default.nix for hosts --- flake.nix | 4 +--- .../forgejo-runner-1/{imports.nix => default.nix} | 3 +++ nixosConfigurations/hetzner-vpn2/default.nix | 7 +++++++ nixosConfigurations/hetzner-vpn2/imports.nix | 5 ----- nixosConfigurations/ronja-pc/{imports.nix => default.nix} | 3 +++ .../vinzenz-lpt2/{imports.nix => default.nix} | 3 +++ .../vinzenz-pc2/{imports.nix => default.nix} | 3 +++ 7 files changed, 20 insertions(+), 8 deletions(-) rename nixosConfigurations/forgejo-runner-1/{imports.nix => default.nix} (68%) create mode 100644 nixosConfigurations/hetzner-vpn2/default.nix delete mode 100644 nixosConfigurations/hetzner-vpn2/imports.nix rename nixosConfigurations/ronja-pc/{imports.nix => default.nix} (83%) rename nixosConfigurations/vinzenz-lpt2/{imports.nix => default.nix} (87%) rename nixosConfigurations/vinzenz-pc2/{imports.nix => default.nix} (88%) diff --git a/flake.nix b/flake.nix index 089732e..c55fb04 100644 --- a/flake.nix +++ b/flake.nix @@ -128,9 +128,7 @@ ]; } - ./nixosConfigurations/${device}/hardware.nix - ./nixosConfigurations/${device}/imports.nix - ./nixosConfigurations/${device}/configuration.nix + ./nixosConfigurations/${device} self.nixosModules.lix-is-nix self.nixosModules.globalinstalls diff --git a/nixosConfigurations/forgejo-runner-1/imports.nix b/nixosConfigurations/forgejo-runner-1/default.nix similarity index 68% rename from nixosConfigurations/forgejo-runner-1/imports.nix rename to nixosConfigurations/forgejo-runner-1/default.nix index 05d6c4d..93d4950 100644 --- a/nixosConfigurations/forgejo-runner-1/imports.nix +++ b/nixosConfigurations/forgejo-runner-1/default.nix @@ -1,6 +1,9 @@ { nixosModules, ... }: { imports = [ + ./configuration.nix + ./hardware.nix + nixosModules.podman ./forgejo-runner.nix ]; diff --git a/nixosConfigurations/hetzner-vpn2/default.nix b/nixosConfigurations/hetzner-vpn2/default.nix new file mode 100644 index 0000000..46ded48 --- /dev/null +++ b/nixosConfigurations/hetzner-vpn2/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ./configuration.nix + ./hardware.nix + ./nginx.nix + ]; +} diff --git a/nixosConfigurations/hetzner-vpn2/imports.nix b/nixosConfigurations/hetzner-vpn2/imports.nix deleted file mode 100644 index 3fadabb..0000000 --- a/nixosConfigurations/hetzner-vpn2/imports.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./nginx.nix - ]; -} diff --git a/nixosConfigurations/ronja-pc/imports.nix b/nixosConfigurations/ronja-pc/default.nix similarity index 83% rename from nixosConfigurations/ronja-pc/imports.nix rename to nixosConfigurations/ronja-pc/default.nix index ca628cc..9efb5f1 100644 --- a/nixosConfigurations/ronja-pc/imports.nix +++ b/nixosConfigurations/ronja-pc/default.nix @@ -1,6 +1,9 @@ { nixosModules, ... }: { imports = [ + ./configuration.nix + ./hardware.nix + ../../modules/gnome.nix ../../modules/gaming.nix nixosModules.steam diff --git a/nixosConfigurations/vinzenz-lpt2/imports.nix b/nixosConfigurations/vinzenz-lpt2/default.nix similarity index 87% rename from nixosConfigurations/vinzenz-lpt2/imports.nix rename to nixosConfigurations/vinzenz-lpt2/default.nix index 9335800..6b2603a 100644 --- a/nixosConfigurations/vinzenz-lpt2/imports.nix +++ b/nixosConfigurations/vinzenz-lpt2/default.nix @@ -1,6 +1,9 @@ { nixosModules, ... }: { imports = [ + ./configuration.nix + ./hardware.nix + ../../modules/gnome.nix ../../modules/gaming.nix nixosModules.steam diff --git a/nixosConfigurations/vinzenz-pc2/imports.nix b/nixosConfigurations/vinzenz-pc2/default.nix similarity index 88% rename from nixosConfigurations/vinzenz-pc2/imports.nix rename to nixosConfigurations/vinzenz-pc2/default.nix index ca29682..4d5df4d 100644 --- a/nixosConfigurations/vinzenz-pc2/imports.nix +++ b/nixosConfigurations/vinzenz-pc2/default.nix @@ -1,6 +1,9 @@ { nixosModules, ... }: { imports = [ + ./configuration.nix + ./hardware.nix + ../../modules/gnome.nix ../../modules/gaming.nix nixosModules.steam