From 48b88ff3ca0d2bc8c89599984f8e93730affdbd3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 28 Jul 2025 19:38:17 +0100 Subject: [PATCH] Refactor --- modules2/hosts/PW05CH3L/imports.nix | 2 +- modules2/hosts/PW05CH3L/tmux-sessionizer.nix | 2 +- modules2/hosts/lemp11/imports.nix | 2 +- modules2/hosts/t480/imports.nix | 2 +- modules2/hosts/t480/tmux-sessionizer.nix | 2 +- modules2/hosts/t490/imports.nix | 2 +- modules2/nixos-configurations.nix | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules2/hosts/PW05CH3L/imports.nix b/modules2/hosts/PW05CH3L/imports.nix index 37ab440e..00d11197 100644 --- a/modules2/hosts/PW05CH3L/imports.nix +++ b/modules2/hosts/PW05CH3L/imports.nix @@ -1,7 +1,7 @@ { config, ... }: { - flake.modules.nixos."hosts/PW05CH3L".imports = with config.flake.modules.nixos; [ + flake.modules.nixos."nixosConfigurations/PW05CH3L".imports = with config.flake.modules.nixos; [ workstation ]; } diff --git a/modules2/hosts/PW05CH3L/tmux-sessionizer.nix b/modules2/hosts/PW05CH3L/tmux-sessionizer.nix index 1078b777..ee17711d 100644 --- a/modules2/hosts/PW05CH3L/tmux-sessionizer.nix +++ b/modules2/hosts/PW05CH3L/tmux-sessionizer.nix @@ -1,7 +1,7 @@ { config, ... }: { - flake.modules.nixos."hosts/PW05CH3L".home-manager.users.${config.flake.meta.owner.username} = + flake.modules.nixos."nixosConfigurations/PW05CH3L".home-manager.users.${config.flake.meta.owner.username} = args: { programs.tmux-sessionizer.searchPaths = let diff --git a/modules2/hosts/lemp11/imports.nix b/modules2/hosts/lemp11/imports.nix index 3b832d67..20958001 100644 --- a/modules2/hosts/lemp11/imports.nix +++ b/modules2/hosts/lemp11/imports.nix @@ -1,7 +1,7 @@ { config, ... }: { - flake.modules.nixos."hosts/lemp11".imports = with config.flake.modules.nixos; [ + flake.modules.nixos."nixosConfigurations/lemp11".imports = with config.flake.modules.nixos; [ pc ]; } diff --git a/modules2/hosts/t480/imports.nix b/modules2/hosts/t480/imports.nix index 99e72a01..58d63476 100644 --- a/modules2/hosts/t480/imports.nix +++ b/modules2/hosts/t480/imports.nix @@ -1,7 +1,7 @@ { config, ... }: { - flake.modules.nixos."hosts/t480".imports = with config.flake.modules.nixos; [ + flake.modules.nixos."nixosConfigurations/t480".imports = with config.flake.modules.nixos; [ pc ]; } diff --git a/modules2/hosts/t480/tmux-sessionizer.nix b/modules2/hosts/t480/tmux-sessionizer.nix index 12d4545a..4dcb0f45 100644 --- a/modules2/hosts/t480/tmux-sessionizer.nix +++ b/modules2/hosts/t480/tmux-sessionizer.nix @@ -1,7 +1,7 @@ { config, ... }: { - flake.modules.nixos."hosts/t480".home-manager.users.${config.flake.meta.owner.username} = args: { + flake.modules.nixos."nixosConfigurations/t480".home-manager.users.${config.flake.meta.owner.username} = args: { programs.tmux-sessionizer.searchPaths = let inherit (args.config.xdg) userDirs; diff --git a/modules2/hosts/t490/imports.nix b/modules2/hosts/t490/imports.nix index 80ce1936..f7afa2ed 100644 --- a/modules2/hosts/t490/imports.nix +++ b/modules2/hosts/t490/imports.nix @@ -1,7 +1,7 @@ { config, ... }: { - flake.modules.nixos."hosts/t490".imports = with config.flake.modules.nixos; [ + flake.modules.nixos."nixosConfigurations/t490".imports = with config.flake.modules.nixos; [ pc ]; } diff --git a/modules2/nixos-configurations.nix b/modules2/nixos-configurations.nix index f6fccfdc..3daa39dc 100644 --- a/modules2/nixos-configurations.nix +++ b/modules2/nixos-configurations.nix @@ -41,7 +41,7 @@ lemp11 = mkNixosConfiguration rec { hostname = "lemp11"; - modules = [ config.flake.modules.nixos."hosts/${hostname}" ]; + modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ]; }; nixedo = mkNixosConfiguration { @@ -52,18 +52,18 @@ t480 = mkNixosConfiguration rec { hostname = "t480"; - modules = [ config.flake.modules.nixos."hosts/${hostname}" ]; + modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ]; }; t490 = mkNixosConfiguration rec { hostname = "t490"; - modules = [ config.flake.modules.nixos."hosts/${hostname}" ]; + modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ]; }; PW05CH3L = mkNixosConfiguration rec { hostname = "PW05CH3L"; - modules = [ config.flake.modules.nixos."hosts/${hostname}" ]; + modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ]; }; }; };