From 91fb6543956146da7d7c00caad99c75a419da0dc Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Wed, 2 Aug 2023 13:13:19 +0200 Subject: [PATCH] feat: refactored host config into folders --- flake.nix | 6 +++--- hosts/{capibara.nix => capibara/default.nix} | 8 ++++---- hosts/{lb.nix => lb/default.nix} | 4 ++-- hosts/{trantor.nix => trantor/default.nix} | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) rename hosts/{capibara.nix => capibara/default.nix} (98%) rename hosts/{lb.nix => lb/default.nix} (97%) rename hosts/{trantor.nix => trantor/default.nix} (98%) diff --git a/flake.nix b/flake.nix index 1714634..bba954d 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ }; modules = [ - ./hosts/trantor.nix + ./hosts/trantor home-manager.nixosModules.home-manager impermanence.nixosModules.impermanence ]; @@ -44,7 +44,7 @@ }; modules = [ - ./hosts/capibara.nix + ./hosts/capibara nixos-hardware.nixosModules.lenovo-thinkpad-x230 home-manager.nixosModules.home-manager impermanence.nixosModules.impermanence @@ -55,7 +55,7 @@ system = "aarch64-linux"; specialArgs = { impermanence = impermanence; }; modules = [ - ./hosts/lb.nix + ./hosts/lb impermanence.nixosModules.impermanence ]; }; diff --git a/hosts/capibara.nix b/hosts/capibara/default.nix similarity index 98% rename from hosts/capibara.nix rename to hosts/capibara/default.nix index c761cc0..1b94087 100644 --- a/hosts/capibara.nix +++ b/hosts/capibara/default.nix @@ -25,14 +25,14 @@ let in { imports = [ - ../hardware-configuration/capibara.nix - ../common - ../common/desktop.nix + ../../hardware-configuration/capibara.nix + ../../common + ../../common/desktop.nix ]; home-manager = { users.rilla.imports = [ - ../home/capibara.nix + ../../home/capibara.nix "${impermanence}/home-manager.nix" ]; }; diff --git a/hosts/lb.nix b/hosts/lb/default.nix similarity index 97% rename from hosts/lb.nix rename to hosts/lb/default.nix index f7640e4..e63444e 100644 --- a/hosts/lb.nix +++ b/hosts/lb/default.nix @@ -2,8 +2,8 @@ { imports = [ - ./hardware-configuration/lb.nix - ../common + ../../hardware-configuration/lb.nix + ../../common ]; boot.loader = { diff --git a/hosts/trantor.nix b/hosts/trantor/default.nix similarity index 98% rename from hosts/trantor.nix rename to hosts/trantor/default.nix index 5383d50..7d049ee 100644 --- a/hosts/trantor.nix +++ b/hosts/trantor/default.nix @@ -7,14 +7,14 @@ let home = "/home/rilla"; in { imports = [ - ../hardware-configuration/trantor.nix - ../common - ../common/desktop.nix + ../../hardware-configuration/trantor.nix + ../../common + ../../common/desktop.nix ]; home-manager = { users.rilla.imports = [ - ../home/trantor.nix + ../../home/trantor.nix "${impermanence}/home-manager.nix" ]; extraSpecialArgs.stablePkgs = stablePkgs;