From d63992ed6362b0c989f0c0e93ddfaad65903af5e Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 11 Sep 2024 21:44:13 +0100
Subject: [PATCH] Re-organise Home Manager modules

---
 {lib/nixos/home-manager => home/opdavies}/default.nix           | 0
 {lib/nixos/home-manager => home/opdavies}/desktop.nix           | 0
 {lib/nixos/home-manager => home/opdavies}/modules/alacritty.nix | 0
 {lib/nixos/home-manager => home/opdavies}/modules/copyq.nix     | 0
 .../opdavies}/modules/desktop/bluetuith.nix                     | 0
 {lib/nixos/home-manager => home/opdavies}/modules/espanso.nix   | 0
 .../home-manager => home/opdavies}/modules/espanso/matches.nix  | 0
 {lib/nixos/home-manager => home/opdavies}/modules/flameshot.nix | 0
 {lib/nixos/home-manager => home/opdavies}/modules/gtk.nix       | 0
 {lib/nixos/home-manager => home/opdavies}/modules/mpv.nix       | 0
 lib/nixos/default.nix                                           | 2 +-
 11 files changed, 1 insertion(+), 1 deletion(-)
 rename {lib/nixos/home-manager => home/opdavies}/default.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/desktop.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/alacritty.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/copyq.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/desktop/bluetuith.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/espanso.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/espanso/matches.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/flameshot.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/gtk.nix (100%)
 rename {lib/nixos/home-manager => home/opdavies}/modules/mpv.nix (100%)

diff --git a/lib/nixos/home-manager/default.nix b/home/opdavies/default.nix
similarity index 100%
rename from lib/nixos/home-manager/default.nix
rename to home/opdavies/default.nix
diff --git a/lib/nixos/home-manager/desktop.nix b/home/opdavies/desktop.nix
similarity index 100%
rename from lib/nixos/home-manager/desktop.nix
rename to home/opdavies/desktop.nix
diff --git a/lib/nixos/home-manager/modules/alacritty.nix b/home/opdavies/modules/alacritty.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/alacritty.nix
rename to home/opdavies/modules/alacritty.nix
diff --git a/lib/nixos/home-manager/modules/copyq.nix b/home/opdavies/modules/copyq.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/copyq.nix
rename to home/opdavies/modules/copyq.nix
diff --git a/lib/nixos/home-manager/modules/desktop/bluetuith.nix b/home/opdavies/modules/desktop/bluetuith.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/desktop/bluetuith.nix
rename to home/opdavies/modules/desktop/bluetuith.nix
diff --git a/lib/nixos/home-manager/modules/espanso.nix b/home/opdavies/modules/espanso.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/espanso.nix
rename to home/opdavies/modules/espanso.nix
diff --git a/lib/nixos/home-manager/modules/espanso/matches.nix b/home/opdavies/modules/espanso/matches.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/espanso/matches.nix
rename to home/opdavies/modules/espanso/matches.nix
diff --git a/lib/nixos/home-manager/modules/flameshot.nix b/home/opdavies/modules/flameshot.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/flameshot.nix
rename to home/opdavies/modules/flameshot.nix
diff --git a/lib/nixos/home-manager/modules/gtk.nix b/home/opdavies/modules/gtk.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/gtk.nix
rename to home/opdavies/modules/gtk.nix
diff --git a/lib/nixos/home-manager/modules/mpv.nix b/home/opdavies/modules/mpv.nix
similarity index 100%
rename from lib/nixos/home-manager/modules/mpv.nix
rename to home/opdavies/modules/mpv.nix
diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix
index 74e47575..aabd5a29 100644
--- a/lib/nixos/default.nix
+++ b/lib/nixos/default.nix
@@ -34,7 +34,7 @@ inputs.nixpkgs.lib.nixosSystem {
         };
         useGlobalPkgs = true;
         useUserPackages = true;
-        users."${username}" = import ./home-manager;
+        users."${username}" = import "${self}/home/${username}";
       };
     }