From c0eca37f9d80d79947ea6711c870bfeec9c73217 Mon Sep 17 00:00:00 2001
From: Patrick Neff <odie86@gmail.com>
Date: Mon, 8 Apr 2024 19:14:16 +0200
Subject: [PATCH] reorganization

---
 lib/mkHomeNixosModule.nix                                     | 4 ++--
 lib/mkNixosConfiguration.nix                                  | 2 +-
 .../nixos/pi0}/configuration.nix                              | 0
 .../nixos/pi0}/hardware-configuration.nix                     | 0
 {hosts/pi0.odie.intranet => profiles/nixos/pi0}/home.nix      | 0
 {hosts => profiles/nixos}/vm/configuration.nix                | 2 +-
 {hosts => profiles/nixos}/vm/hardware-configuration.nix       | 0
 {hosts => profiles/nixos}/wsl-dev/configuration.nix           | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename {hosts/pi0.odie.intranet => profiles/nixos/pi0}/configuration.nix (100%)
 rename {hosts/pi0.odie.intranet => profiles/nixos/pi0}/hardware-configuration.nix (100%)
 rename {hosts/pi0.odie.intranet => profiles/nixos/pi0}/home.nix (100%)
 rename {hosts => profiles/nixos}/vm/configuration.nix (97%)
 rename {hosts => profiles/nixos}/vm/hardware-configuration.nix (100%)
 rename {hosts => profiles/nixos}/wsl-dev/configuration.nix (100%)

diff --git a/lib/mkHomeNixosModule.nix b/lib/mkHomeNixosModule.nix
index 372ba72..8614b89 100644
--- a/lib/mkHomeNixosModule.nix
+++ b/lib/mkHomeNixosModule.nix
@@ -3,7 +3,7 @@
   outputs,
   vars,
   flakeLib,
-  modules ? [],
+  imports ? [],
   ...
 }: {
   useGlobalPkgs = true;
@@ -13,6 +13,6 @@
     inherit (inputs) nix-colors;
   };
   users.${vars.username} = {
-    imports = modules;
+    inherit imports;
   };
 }
diff --git a/lib/mkNixosConfiguration.nix b/lib/mkNixosConfiguration.nix
index a17f842..19b56f3 100644
--- a/lib/mkNixosConfiguration.nix
+++ b/lib/mkNixosConfiguration.nix
@@ -20,7 +20,7 @@
         };
     };
     modules = [
-      ../hosts/${hostName}/configuration.nix
+      ../profiles/nixos/${hostName}/configuration.nix
     ];
   };
 }
diff --git a/hosts/pi0.odie.intranet/configuration.nix b/profiles/nixos/pi0/configuration.nix
similarity index 100%
rename from hosts/pi0.odie.intranet/configuration.nix
rename to profiles/nixos/pi0/configuration.nix
diff --git a/hosts/pi0.odie.intranet/hardware-configuration.nix b/profiles/nixos/pi0/hardware-configuration.nix
similarity index 100%
rename from hosts/pi0.odie.intranet/hardware-configuration.nix
rename to profiles/nixos/pi0/hardware-configuration.nix
diff --git a/hosts/pi0.odie.intranet/home.nix b/profiles/nixos/pi0/home.nix
similarity index 100%
rename from hosts/pi0.odie.intranet/home.nix
rename to profiles/nixos/pi0/home.nix
diff --git a/hosts/vm/configuration.nix b/profiles/nixos/vm/configuration.nix
similarity index 97%
rename from hosts/vm/configuration.nix
rename to profiles/nixos/vm/configuration.nix
index 9e98449..dc61ca4 100644
--- a/hosts/vm/configuration.nix
+++ b/profiles/nixos/vm/configuration.nix
@@ -15,7 +15,7 @@
 
   home-manager = flakeLib.mkHomeNixosModule {
     inherit inputs outputs vars flakeLib;
-    modules = [
+    imports = [
       ../../modules/home-manager/base.nix
       ../../modules/home-manager/desktop.nix
       ../../modules/home-manager/dev.nix
diff --git a/hosts/vm/hardware-configuration.nix b/profiles/nixos/vm/hardware-configuration.nix
similarity index 100%
rename from hosts/vm/hardware-configuration.nix
rename to profiles/nixos/vm/hardware-configuration.nix
diff --git a/hosts/wsl-dev/configuration.nix b/profiles/nixos/wsl-dev/configuration.nix
similarity index 100%
rename from hosts/wsl-dev/configuration.nix
rename to profiles/nixos/wsl-dev/configuration.nix