From e20be890d09d02c856c6bc5a6a67f98d9670da02 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 18 May 2023 10:20:37 -0400
Subject: [PATCH] Remove distinction between home-manager files

---
 {home-manager/bat => bat}/default.nix         |   0
 .../default.nix                               |   0
 {home-manager/dunst => dunst}/default.nix     |   0
 .../editorconfig => editorconfig}/default.nix |   0
 {home-manager/fcitx5 => fcitx5}/default.nix   |   0
 {home-manager/feh => feh}/default.nix         |   0
 {modules/firejail => firejail}/default.nix    |   0
 {home-manager/fish => fish}/default.nix       |   0
 flake.nix                                     |  78 ++++++++++++------
 {modules/fonts => fonts}/default.nix          |   0
 {home-manager/git => git}/default.nix         |   0
 .../gpg-agent => gpg-agent}/default.nix       |   0
 {home-manager/gpg => gpg}/default.nix         |   0
 {home-manager/gtk => gtk}/default.nix         |   0
 home-manager/default.nix                      |  39 ++-------
 {modules/htop => htop}/default.nix            |   0
 .../hyprland => hyprland}/default.nix         |   0
 .../hyprland => hyprland}/swapmaster.sh       |   0
 {home-manager/hyprland => hyprland}/tags.sh   |   0
 {home-manager/kitty => kitty}/default.nix     |   0
 .../librewolf => librewolf}/default.nix       |   0
 {modules/locale => locale}/default.nix        |   0
 modules/home-manager/default.nix              |   9 --
 {home-manager/mozc => mozc}/default.nix       |   0
 {home-manager/mpd => mpd}/default.nix         |   0
 {home-manager/mpv => mpv}/default.nix         |   0
 {modules/mullvad => mullvad}/default.nix      |   0
 {home-manager/ncmpcpp => ncmpcpp}/default.nix |   0
 {home-manager/neovim => neovim}/default.nix   |   0
 .../networking => networking}/default.nix     |   0
 {modules/nix => nix}/default.nix              |   0
 {modules/npm => npm}/default.nix              |   0
 {modules/osu => osu}/default.nix              |   0
 {modules/packages => packages}/default.nix    |   0
 {modules/piper => piper}/default.nix          |   0
 {modules/pipewire => pipewire}/default.nix    |   0
 .../qutebrowser => qutebrowser}/default.nix   |   0
 {home-manager/ranger => ranger}/default.nix   |   0
 {home-manager/rofi => rofi}/default.nix       |   0
 {home-manager/rofi => rofi}/launchpad.rasi    |   0
 {modules/srb2 => srb2}/default.nix            |   0
 {modules/srb2 => srb2}/package/default.nix    |   0
 {modules/starship => starship}/default.nix    |   0
 {modules/stylix => stylix}/default.nix        |   0
 {modules/stylix => stylix}/wallpaper.png      | Bin
 .../swaylock => swaylock}/default.nix         |   0
 {modules/systemd => systemd}/default.nix      |   0
 {home-manager/thunar => thunar}/default.nix   |   0
 {home-manager/tig => tig}/default.nix         |   0
 {modules/timezone => timezone}/default.nix    |   0
 {modules/tlp => tlp}/default.nix              |   0
 {home-manager/udiskie => udiskie}/default.nix |   0
 {modules/user => user}/default.nix            |   0
 .../default.nix                               |   0
 {modules/vnstat => vnstat}/default.nix        |   0
 {home-manager/waybar => waybar}/default.nix   |   0
 {home-manager/xcursor => xcursor}/default.nix |   0
 .../default.nix                               |   0
 .../xresources => xresources}/default.nix     |   0
 {modules/xserver => xserver}/default.nix      |   0
 {home-manager/zathura => zathura}/default.nix |   0
 61 files changed, 61 insertions(+), 65 deletions(-)
 rename {home-manager/bat => bat}/default.nix (100%)
 rename {modules/dual-function-keys => dual-function-keys}/default.nix (100%)
 rename {home-manager/dunst => dunst}/default.nix (100%)
 rename {home-manager/editorconfig => editorconfig}/default.nix (100%)
 rename {home-manager/fcitx5 => fcitx5}/default.nix (100%)
 rename {home-manager/feh => feh}/default.nix (100%)
 rename {modules/firejail => firejail}/default.nix (100%)
 rename {home-manager/fish => fish}/default.nix (100%)
 rename {modules/fonts => fonts}/default.nix (100%)
 rename {home-manager/git => git}/default.nix (100%)
 rename {home-manager/gpg-agent => gpg-agent}/default.nix (100%)
 rename {home-manager/gpg => gpg}/default.nix (100%)
 rename {home-manager/gtk => gtk}/default.nix (100%)
 rename {modules/htop => htop}/default.nix (100%)
 rename {home-manager/hyprland => hyprland}/default.nix (100%)
 rename {home-manager/hyprland => hyprland}/swapmaster.sh (100%)
 rename {home-manager/hyprland => hyprland}/tags.sh (100%)
 rename {home-manager/kitty => kitty}/default.nix (100%)
 rename {home-manager/librewolf => librewolf}/default.nix (100%)
 rename {modules/locale => locale}/default.nix (100%)
 delete mode 100644 modules/home-manager/default.nix
 rename {home-manager/mozc => mozc}/default.nix (100%)
 rename {home-manager/mpd => mpd}/default.nix (100%)
 rename {home-manager/mpv => mpv}/default.nix (100%)
 rename {modules/mullvad => mullvad}/default.nix (100%)
 rename {home-manager/ncmpcpp => ncmpcpp}/default.nix (100%)
 rename {home-manager/neovim => neovim}/default.nix (100%)
 rename {modules/networking => networking}/default.nix (100%)
 rename {modules/nix => nix}/default.nix (100%)
 rename {modules/npm => npm}/default.nix (100%)
 rename {modules/osu => osu}/default.nix (100%)
 rename {modules/packages => packages}/default.nix (100%)
 rename {modules/piper => piper}/default.nix (100%)
 rename {modules/pipewire => pipewire}/default.nix (100%)
 rename {home-manager/qutebrowser => qutebrowser}/default.nix (100%)
 rename {home-manager/ranger => ranger}/default.nix (100%)
 rename {home-manager/rofi => rofi}/default.nix (100%)
 rename {home-manager/rofi => rofi}/launchpad.rasi (100%)
 rename {modules/srb2 => srb2}/default.nix (100%)
 rename {modules/srb2 => srb2}/package/default.nix (100%)
 rename {modules/starship => starship}/default.nix (100%)
 rename {modules/stylix => stylix}/default.nix (100%)
 rename {modules/stylix => stylix}/wallpaper.png (100%)
 rename {home-manager/swaylock => swaylock}/default.nix (100%)
 rename {modules/systemd => systemd}/default.nix (100%)
 rename {home-manager/thunar => thunar}/default.nix (100%)
 rename {home-manager/tig => tig}/default.nix (100%)
 rename {modules/timezone => timezone}/default.nix (100%)
 rename {modules/tlp => tlp}/default.nix (100%)
 rename {home-manager/udiskie => udiskie}/default.nix (100%)
 rename {modules/user => user}/default.nix (100%)
 rename {modules/virtualization => virtualization}/default.nix (100%)
 rename {modules/vnstat => vnstat}/default.nix (100%)
 rename {home-manager/waybar => waybar}/default.nix (100%)
 rename {home-manager/xcursor => xcursor}/default.nix (100%)
 rename {home-manager/xdg-user-dirs => xdg-user-dirs}/default.nix (100%)
 rename {home-manager/xresources => xresources}/default.nix (100%)
 rename {modules/xserver => xserver}/default.nix (100%)
 rename {home-manager/zathura => zathura}/default.nix (100%)

diff --git a/home-manager/bat/default.nix b/bat/default.nix
similarity index 100%
rename from home-manager/bat/default.nix
rename to bat/default.nix
diff --git a/modules/dual-function-keys/default.nix b/dual-function-keys/default.nix
similarity index 100%
rename from modules/dual-function-keys/default.nix
rename to dual-function-keys/default.nix
diff --git a/home-manager/dunst/default.nix b/dunst/default.nix
similarity index 100%
rename from home-manager/dunst/default.nix
rename to dunst/default.nix
diff --git a/home-manager/editorconfig/default.nix b/editorconfig/default.nix
similarity index 100%
rename from home-manager/editorconfig/default.nix
rename to editorconfig/default.nix
diff --git a/home-manager/fcitx5/default.nix b/fcitx5/default.nix
similarity index 100%
rename from home-manager/fcitx5/default.nix
rename to fcitx5/default.nix
diff --git a/home-manager/feh/default.nix b/feh/default.nix
similarity index 100%
rename from home-manager/feh/default.nix
rename to feh/default.nix
diff --git a/modules/firejail/default.nix b/firejail/default.nix
similarity index 100%
rename from modules/firejail/default.nix
rename to firejail/default.nix
diff --git a/home-manager/fish/default.nix b/fish/default.nix
similarity index 100%
rename from home-manager/fish/default.nix
rename to fish/default.nix
diff --git a/flake.nix b/flake.nix
index a561b2c..56259b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,30 +31,60 @@
         stylix.nixosModules.stylix
         home-manager.nixosModules.home-manager
         ./laptop.nix
-        ./modules/starship
-        ./modules/fonts
-        ./modules/stylix
-        ./modules/htop
-        ./modules/dual-function-keys
-        ./modules/tlp
-        ./modules/osu
-        ./modules/srb2
-        ./modules/mullvad
-        ./modules/pipewire
-        ./modules/networking
-        ./modules/virtualization
-        ./modules/xserver
-        ./modules/systemd
-        ./modules/vnstat
-        ./modules/locale
-        ./modules/firejail
-        ./modules/timezone
-        ./modules/nix
-        ./modules/npm
-        ./modules/home-manager
-        ./modules/user
-        ./modules/piper
-        ./modules/packages
+        ./bat
+        ./dunst
+        ./editorconfig
+        ./fcitx5
+        ./feh
+        ./fish
+        ./git
+        ./gpg-agent
+        ./gpg
+        ./gtk
+        ./hyprland
+        ./kitty
+        ./librewolf
+        ./mozc
+        ./mpd
+        ./mpv
+        ./ncmpcpp
+        ./neovim
+        ./qutebrowser
+        ./ranger
+        ./rofi
+        ./swaylock
+        ./thunar
+        ./tig
+        ./udiskie
+        ./waybar
+        ./xcursor
+        ./xdg-user-dirs
+        ./xresources
+        ./zathura
+        ./starship
+        ./fonts
+        ./stylix
+        ./htop
+        ./dual-function-keys
+        ./tlp
+        ./osu
+        ./srb2
+        ./mullvad
+        ./pipewire
+        ./networking
+        ./virtualization
+        ./xserver
+        ./systemd
+        ./vnstat
+        ./locale
+        ./firejail
+        ./timezone
+        ./nix
+        ./npm
+        ./home-manager
+        ./user
+        ./piper
+        ./packages
         {
           boot.loader.systemd-boot.enable = true;
           boot.loader.efi.canTouchEfiVariables = true;
diff --git a/modules/fonts/default.nix b/fonts/default.nix
similarity index 100%
rename from modules/fonts/default.nix
rename to fonts/default.nix
diff --git a/home-manager/git/default.nix b/git/default.nix
similarity index 100%
rename from home-manager/git/default.nix
rename to git/default.nix
diff --git a/home-manager/gpg-agent/default.nix b/gpg-agent/default.nix
similarity index 100%
rename from home-manager/gpg-agent/default.nix
rename to gpg-agent/default.nix
diff --git a/home-manager/gpg/default.nix b/gpg/default.nix
similarity index 100%
rename from home-manager/gpg/default.nix
rename to gpg/default.nix
diff --git a/home-manager/gtk/default.nix b/gtk/default.nix
similarity index 100%
rename from home-manager/gtk/default.nix
rename to gtk/default.nix
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 684253f..6a010a2 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,34 +1,9 @@
 {
-  imports = [
-    ./bat
-    ./dunst
-    ./editorconfig
-    ./fcitx5
-    ./feh
-    ./fish
-    ./git
-    ./gpg-agent
-    ./gpg
-    ./gtk
-    ./hyprland
-    ./kitty
-    ./librewolf
-    ./mozc
-    ./mpd
-    ./mpv
-    ./ncmpcpp
-    ./neovim
-    ./qutebrowser
-    ./ranger
-    ./rofi
-    ./swaylock
-    ./thunar
-    ./tig
-    ./udiskie
-    ./waybar
-    ./xcursor
-    ./xdg-user-dirs
-    ./xresources
-    ./zathura
-  ];
+  home-manager = {
+    useGlobalPkgs = true;
+
+    sharedModules = [{
+      home.stateVersion = "22.11";
+    }];
+  };
 }
diff --git a/modules/htop/default.nix b/htop/default.nix
similarity index 100%
rename from modules/htop/default.nix
rename to htop/default.nix
diff --git a/home-manager/hyprland/default.nix b/hyprland/default.nix
similarity index 100%
rename from home-manager/hyprland/default.nix
rename to hyprland/default.nix
diff --git a/home-manager/hyprland/swapmaster.sh b/hyprland/swapmaster.sh
similarity index 100%
rename from home-manager/hyprland/swapmaster.sh
rename to hyprland/swapmaster.sh
diff --git a/home-manager/hyprland/tags.sh b/hyprland/tags.sh
similarity index 100%
rename from home-manager/hyprland/tags.sh
rename to hyprland/tags.sh
diff --git a/home-manager/kitty/default.nix b/kitty/default.nix
similarity index 100%
rename from home-manager/kitty/default.nix
rename to kitty/default.nix
diff --git a/home-manager/librewolf/default.nix b/librewolf/default.nix
similarity index 100%
rename from home-manager/librewolf/default.nix
rename to librewolf/default.nix
diff --git a/modules/locale/default.nix b/locale/default.nix
similarity index 100%
rename from modules/locale/default.nix
rename to locale/default.nix
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
deleted file mode 100644
index 6a010a2..0000000
--- a/modules/home-manager/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  home-manager = {
-    useGlobalPkgs = true;
-
-    sharedModules = [{
-      home.stateVersion = "22.11";
-    }];
-  };
-}
diff --git a/home-manager/mozc/default.nix b/mozc/default.nix
similarity index 100%
rename from home-manager/mozc/default.nix
rename to mozc/default.nix
diff --git a/home-manager/mpd/default.nix b/mpd/default.nix
similarity index 100%
rename from home-manager/mpd/default.nix
rename to mpd/default.nix
diff --git a/home-manager/mpv/default.nix b/mpv/default.nix
similarity index 100%
rename from home-manager/mpv/default.nix
rename to mpv/default.nix
diff --git a/modules/mullvad/default.nix b/mullvad/default.nix
similarity index 100%
rename from modules/mullvad/default.nix
rename to mullvad/default.nix
diff --git a/home-manager/ncmpcpp/default.nix b/ncmpcpp/default.nix
similarity index 100%
rename from home-manager/ncmpcpp/default.nix
rename to ncmpcpp/default.nix
diff --git a/home-manager/neovim/default.nix b/neovim/default.nix
similarity index 100%
rename from home-manager/neovim/default.nix
rename to neovim/default.nix
diff --git a/modules/networking/default.nix b/networking/default.nix
similarity index 100%
rename from modules/networking/default.nix
rename to networking/default.nix
diff --git a/modules/nix/default.nix b/nix/default.nix
similarity index 100%
rename from modules/nix/default.nix
rename to nix/default.nix
diff --git a/modules/npm/default.nix b/npm/default.nix
similarity index 100%
rename from modules/npm/default.nix
rename to npm/default.nix
diff --git a/modules/osu/default.nix b/osu/default.nix
similarity index 100%
rename from modules/osu/default.nix
rename to osu/default.nix
diff --git a/modules/packages/default.nix b/packages/default.nix
similarity index 100%
rename from modules/packages/default.nix
rename to packages/default.nix
diff --git a/modules/piper/default.nix b/piper/default.nix
similarity index 100%
rename from modules/piper/default.nix
rename to piper/default.nix
diff --git a/modules/pipewire/default.nix b/pipewire/default.nix
similarity index 100%
rename from modules/pipewire/default.nix
rename to pipewire/default.nix
diff --git a/home-manager/qutebrowser/default.nix b/qutebrowser/default.nix
similarity index 100%
rename from home-manager/qutebrowser/default.nix
rename to qutebrowser/default.nix
diff --git a/home-manager/ranger/default.nix b/ranger/default.nix
similarity index 100%
rename from home-manager/ranger/default.nix
rename to ranger/default.nix
diff --git a/home-manager/rofi/default.nix b/rofi/default.nix
similarity index 100%
rename from home-manager/rofi/default.nix
rename to rofi/default.nix
diff --git a/home-manager/rofi/launchpad.rasi b/rofi/launchpad.rasi
similarity index 100%
rename from home-manager/rofi/launchpad.rasi
rename to rofi/launchpad.rasi
diff --git a/modules/srb2/default.nix b/srb2/default.nix
similarity index 100%
rename from modules/srb2/default.nix
rename to srb2/default.nix
diff --git a/modules/srb2/package/default.nix b/srb2/package/default.nix
similarity index 100%
rename from modules/srb2/package/default.nix
rename to srb2/package/default.nix
diff --git a/modules/starship/default.nix b/starship/default.nix
similarity index 100%
rename from modules/starship/default.nix
rename to starship/default.nix
diff --git a/modules/stylix/default.nix b/stylix/default.nix
similarity index 100%
rename from modules/stylix/default.nix
rename to stylix/default.nix
diff --git a/modules/stylix/wallpaper.png b/stylix/wallpaper.png
similarity index 100%
rename from modules/stylix/wallpaper.png
rename to stylix/wallpaper.png
diff --git a/home-manager/swaylock/default.nix b/swaylock/default.nix
similarity index 100%
rename from home-manager/swaylock/default.nix
rename to swaylock/default.nix
diff --git a/modules/systemd/default.nix b/systemd/default.nix
similarity index 100%
rename from modules/systemd/default.nix
rename to systemd/default.nix
diff --git a/home-manager/thunar/default.nix b/thunar/default.nix
similarity index 100%
rename from home-manager/thunar/default.nix
rename to thunar/default.nix
diff --git a/home-manager/tig/default.nix b/tig/default.nix
similarity index 100%
rename from home-manager/tig/default.nix
rename to tig/default.nix
diff --git a/modules/timezone/default.nix b/timezone/default.nix
similarity index 100%
rename from modules/timezone/default.nix
rename to timezone/default.nix
diff --git a/modules/tlp/default.nix b/tlp/default.nix
similarity index 100%
rename from modules/tlp/default.nix
rename to tlp/default.nix
diff --git a/home-manager/udiskie/default.nix b/udiskie/default.nix
similarity index 100%
rename from home-manager/udiskie/default.nix
rename to udiskie/default.nix
diff --git a/modules/user/default.nix b/user/default.nix
similarity index 100%
rename from modules/user/default.nix
rename to user/default.nix
diff --git a/modules/virtualization/default.nix b/virtualization/default.nix
similarity index 100%
rename from modules/virtualization/default.nix
rename to virtualization/default.nix
diff --git a/modules/vnstat/default.nix b/vnstat/default.nix
similarity index 100%
rename from modules/vnstat/default.nix
rename to vnstat/default.nix
diff --git a/home-manager/waybar/default.nix b/waybar/default.nix
similarity index 100%
rename from home-manager/waybar/default.nix
rename to waybar/default.nix
diff --git a/home-manager/xcursor/default.nix b/xcursor/default.nix
similarity index 100%
rename from home-manager/xcursor/default.nix
rename to xcursor/default.nix
diff --git a/home-manager/xdg-user-dirs/default.nix b/xdg-user-dirs/default.nix
similarity index 100%
rename from home-manager/xdg-user-dirs/default.nix
rename to xdg-user-dirs/default.nix
diff --git a/home-manager/xresources/default.nix b/xresources/default.nix
similarity index 100%
rename from home-manager/xresources/default.nix
rename to xresources/default.nix
diff --git a/modules/xserver/default.nix b/xserver/default.nix
similarity index 100%
rename from modules/xserver/default.nix
rename to xserver/default.nix
diff --git a/home-manager/zathura/default.nix b/zathura/default.nix
similarity index 100%
rename from home-manager/zathura/default.nix
rename to zathura/default.nix