From f6f01771ab91097aa0a521d62cca5803756af439 Mon Sep 17 00:00:00 2001
From: Michael Mandl <michael.mandl@horsch.com>
Date: Wed, 10 Jul 2024 13:09:24 +0200
Subject: [PATCH] refactor: extract home configs

---
 flake.nix                       |  4 ++--
 horsch/home.nix => horsch.nix   | 37 +++++++++++++++++----------------
 private/home.nix => private.nix | 36 ++++++++++++++++----------------
 3 files changed, 39 insertions(+), 38 deletions(-)
 rename horsch/home.nix => horsch.nix (54%)
 rename private/home.nix => private.nix (78%)

diff --git a/flake.nix b/flake.nix
index b9eb1ff..5ca8177 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
           inherit pkgs;
 
           modules = [
-            ./private/home.nix
+            ./private.nix
             ./xps.nix
           ];
 
@@ -37,7 +37,7 @@
           inherit pkgs;
 
           modules = [
-            ./horsch/home.nix
+            ./horsch.nix
           ];
 
           extraSpecialArgs = {
diff --git a/horsch/home.nix b/horsch.nix
similarity index 54%
rename from horsch/home.nix
rename to horsch.nix
index e51921f..4ae54de 100644
--- a/horsch/home.nix
+++ b/horsch.nix
@@ -18,24 +18,25 @@
   ];
 
   imports = [
-    ../bat.nix
-    ../carapace.nix
-    ../direnv.nix
-    ../eza.nix
-    ../fzf.nix
-    ../git.nix
-    ../gpg
-    ../neovim
-    ../picocom.nix
-    ../podman.nix
-    ../ripgrep.nix
-    ../rsync.nix
-    ../shell_aliases.nix
-    ../starship.nix
-    ../tree.nix
-    ../zoxide.nix
-    ../zsh.nix
-    ./ssh.nix
+    ./bat.nix
+    ./carapace.nix
+    ./direnv.nix
+    ./eza.nix
+    ./fzf.nix
+    ./git.nix
+    ./gpg
+    ./neovim
+    ./picocom.nix
+    ./podman.nix
+    ./ripgrep.nix
+    ./rsync.nix
+    ./shell_aliases.nix
+    ./starship.nix
+    ./tree.nix
+    ./zoxide.nix
     ./zsh.nix
+
+    ./horsch/ssh.nix
+    ./horsch/zsh.nix
   ];
 }
diff --git a/private/home.nix b/private.nix
similarity index 78%
rename from private/home.nix
rename to private.nix
index bf61c77..20c5ecd 100644
--- a/private/home.nix
+++ b/private.nix
@@ -54,23 +54,23 @@
   programs.home-manager.enable = true;
 
   imports = [
-    ../bat.nix
-    ../carapace.nix
-    ../direnv.nix
-    ../eza.nix
-    ../firefox.nix
-    ../fzf.nix
-    ../git.nix
-    ../gpg
-    ../kitty.nix
-    ../neovim
-    ../nextcloud.nix
-    ../ripgrep.nix
-    ../shell_aliases.nix
-    ../starship.nix
-    ../sway
-    ../tree.nix
-    ../zoxide.nix
-    ../zsh.nix
+    ./bat.nix
+    ./carapace.nix
+    ./direnv.nix
+    ./eza.nix
+    ./firefox.nix
+    ./fzf.nix
+    ./git.nix
+    ./gpg
+    ./kitty.nix
+    ./neovim
+    ./nextcloud.nix
+    ./ripgrep.nix
+    ./shell_aliases.nix
+    ./starship.nix
+    ./sway
+    ./tree.nix
+    ./zoxide.nix
+    ./zsh.nix
   ];
 }