move tarrel into new structure

3 files changed, 4 insertions, 3 deletions

diff --git a/hosts/tarrel.nix b/configuration/tarrel/default.nix
index 71b70af..ca573fa 100644
--- a/hosts/tarrel.nix
+++ b/configuration/tarrel/default.nix
@@ -1,7 +1,7 @@
 { pkgs, inputs, config, ... }:
 {
   imports = [
-    ./hardware-configuration/tarrel.nix
+    ./hardware-configuration.nix
   ];
 
   boot.loader.systemd-boot.enable = true;
@@ -67,7 +67,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    users.jras = import ../home-manager/entrypoints/personal.nix;
+    users.jras = import ../../home-manager/entrypoints/personal.nix;
     extraSpecialArgs = { inherit inputs; monitor-names = ["DP-2" "HDMI-A-1"]; };
   };
 
diff --git a/hosts/hardware-configuration/tarrel.nix b/configuration/tarrel/hardware-configuration.nix
index 4604fcd..4604fcd 100644
--- a/hosts/hardware-configuration/tarrel.nix
+++ b/configuration/tarrel/hardware-configuration.nix
diff --git a/flake.nix b/flake.nix
index f2245d1..53b78d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,12 +67,13 @@
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
       modules = [
-        ./hosts/tarrel.nix
         {
           environment.systemPackages = [ agenix.packages."x86_64-linux".default ];
         }
         home-manager.nixosModules.home-manager
         agenix.nixosModules.default
+
+        ./configuration/tarrel
         ./config/shared.nix
 
         {