From 93816b76bbd64b288998d59ec92debd49090b1a5 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 17 Nov 2024 23:03:19 +0100 Subject: [PATCH] Restructure machine files --- colmena.nix | 4 ++-- machines/default.nix | 4 ++-- machines/gamepc/{default.nix => configuration.nix} | 0 machines/sue/{default.nix => configuration.nix} | 0 nixos-configurations.nix | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename machines/gamepc/{default.nix => configuration.nix} (100%) rename machines/sue/{default.nix => configuration.nix} (100%) diff --git a/colmena.nix b/colmena.nix index 44662ea..680d7c8 100644 --- a/colmena.nix +++ b/colmena.nix @@ -16,14 +16,14 @@ inputs @ { sue = { imports = [ - (import ./machines).sue.module + (import ./machines).sue.nixosModule ./nixos ]; }; gamepc = { imports = [ - (import ./machines).gamepc.module + (import ./machines).gamepc.nixosModule ./nixos ]; }; diff --git a/machines/default.nix b/machines/default.nix index ec75d0d..6f911eb 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -1,11 +1,11 @@ { sue = { system = "x86_64-linux"; - module = import ./sue; + nixosModule = import ./sue/configuration.nix; }; gamepc = { system = "x86_64-linux"; - module = import ./gamepc; + nixosModule = import ./gamepc/configuration.nix; }; } diff --git a/machines/gamepc/default.nix b/machines/gamepc/configuration.nix similarity index 100% rename from machines/gamepc/default.nix rename to machines/gamepc/configuration.nix diff --git a/machines/sue/default.nix b/machines/sue/configuration.nix similarity index 100% rename from machines/sue/default.nix rename to machines/sue/configuration.nix diff --git a/nixos-configurations.nix b/nixos-configurations.nix index 63ca907..12539cf 100644 --- a/nixos-configurations.nix +++ b/nixos-configurations.nix @@ -5,11 +5,11 @@ inputs @ { }: { nixosConfigurations = nixpkgs.lib.mapAttrs (name: { system, - module, + nixosModule, }: nixpkgs.lib.nixosSystem { inherit system; - modules = [./nixos module]; + modules = [./nixos nixosModule]; specialArgs = { inherit inputs system self;