From 7ceb15e6e1271334eadf271ff5cebdd13d5d0525 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 21 Dec 2024 12:09:19 +0000
Subject: [PATCH] modules: move darwin/home-manager/nixos to it

---
 hosts/Sekai-MacBook-Pro/default.nix                           | 2 +-
 hosts/hachune-nixos/default.nix                               | 2 +-
 hosts/miku-nixos/default.nix                                  | 2 +-
 hosts/mirai-nixos/default.nix                                 | 2 +-
 hosts/sankyuu-nixos/default.nix                               | 2 +-
 hosts/zachune-nixos/default.nix                               | 2 +-
 hosts/zatsune-nixos/default.nix                               | 2 +-
 lib/flake-helpers.nix                                         | 2 +-
 {home-manager => modules/home-manager}/cli/default.nix        | 0
 {home-manager => modules/home-manager}/cli/git.nix            | 0
 {home-manager => modules/home-manager}/cli/htop.nix           | 0
 {home-manager => modules/home-manager}/cli/irssi.nix          | 0
 {home-manager => modules/home-manager}/cli/nixpkgs.nix        | 0
 {home-manager => modules/home-manager}/cli/ssh/default.nix    | 0
 {home-manager => modules/home-manager}/cli/ssh/ssh-agent.zsh  | 0
 {home-manager => modules/home-manager}/cli/tmux.nix           | 0
 {home-manager => modules/home-manager}/cli/yazi.nix           | 0
 {home-manager => modules/home-manager}/cli/zsh/default.nix    | 0
 {home-manager => modules/home-manager}/crostini.nix           | 0
 {home-manager => modules/home-manager}/darwin/default.nix     | 0
 .../home-manager}/darwin/trampoline-apps.nix                  | 0
 .../home-manager}/darwin/trampoline-apps.sh                   | 0
 {home-manager => modules/home-manager}/default.nix            | 2 +-
 {home-manager => modules/home-manager}/desktop/chromium.nix   | 0
 {home-manager => modules/home-manager}/desktop/default.nix    | 0
 {home-manager => modules/home-manager}/desktop/dunst.nix      | 0
 {home-manager => modules/home-manager}/desktop/firefox.nix    | 0
 {home-manager => modules/home-manager}/desktop/gammastep.nix  | 0
 {home-manager => modules/home-manager}/desktop/kitty.nix      | 0
 .../home-manager}/desktop/mpv/default.nix                     | 0
 .../home-manager}/desktop/mpv/motion-based-interpolation.vpy  | 0
 {home-manager => modules/home-manager}/desktop/nixgl.nix      | 0
 .../home-manager}/desktop/theme/colors.json                   | 0
 .../home-manager}/desktop/theme/default.nix                   | 0
 .../home-manager}/desktop/theme/fonts.nix                     | 0
 .../home-manager}/desktop/theme/get-base16-colors.sh          | 0
 {home-manager => modules/home-manager}/desktop/theme/gtk.nix  | 0
 {home-manager => modules/home-manager}/desktop/theme/qt.nix   | 0
 .../home-manager}/desktop/wayland/default.nix                 | 0
 .../home-manager}/desktop/wayland/fuzzel.nix                  | 0
 .../home-manager}/desktop/wayland/hyprland/default.nix        | 0
 .../home-manager}/desktop/wayland/kanshi/default.nix          | 0
 .../home-manager}/desktop/wayland/kanshi/sankyuu-nixos.nix    | 0
 .../home-manager}/desktop/wayland/sway.nix                    | 0
 .../home-manager}/desktop/wayland/swayidle.nix                | 0
 .../home-manager}/desktop/wayland/swaylock.nix                | 0
 .../home-manager}/desktop/wayland/waybar.nix                  | 0
 {home-manager => modules/home-manager}/desktop/wezterm.nix    | 0
 .../home-manager}/desktop/x11/autorandr/default.nix           | 0
 .../home-manager}/desktop/x11/default.nix                     | 0
 .../home-manager}/desktop/x11/i3/common.nix                   | 0
 .../home-manager}/desktop/x11/i3/default.nix                  | 0
 .../home-manager}/desktop/x11/i3status-rust.nix               | 0
 {home-manager => modules/home-manager}/desktop/x11/picom.nix  | 0
 {home-manager => modules/home-manager}/desktop/x11/rofi.nix   | 0
 .../home-manager}/desktop/x11/screen-locker.nix               | 0
 .../home-manager}/desktop/x11/wallpaper.nix                   | 0
 {home-manager => modules/home-manager}/desktop/xterm.nix      | 0
 {home-manager => modules/home-manager}/dev/asdf.nix           | 0
 {home-manager => modules/home-manager}/dev/clojure.nix        | 0
 {home-manager => modules/home-manager}/dev/default.nix        | 0
 {home-manager => modules/home-manager}/dev/go.nix             | 0
 {home-manager => modules/home-manager}/dev/nix.nix            | 0
 {home-manager => modules/home-manager}/dev/node.nix           | 0
 {home-manager => modules/home-manager}/dev/python.nix         | 0
 {home-manager => modules/home-manager}/editor/default.nix     | 0
 .../home-manager}/editor/emacs/default.nix                    | 0
 .../editor/emacs/disable_pgtk_display_x_warning.patch         | 0
 .../home-manager}/editor/emacs/doom-emacs/.gitignore          | 0
 .../home-manager}/editor/emacs/doom-emacs/autoload.el         | 0
 .../home-manager}/editor/emacs/doom-emacs/config.el           | 0
 .../home-manager}/editor/emacs/doom-emacs/init.el             | 0
 .../home-manager}/editor/emacs/doom-emacs/packages.el         | 0
 .../editor/emacs/doom-emacs/snippets/nix-mode/shell           | 0
 {home-manager => modules/home-manager}/editor/helix.nix       | 0
 {home-manager => modules/home-manager}/editor/jetbrains.nix   | 0
 {home-manager => modules/home-manager}/editor/neovim.nix      | 0
 {home-manager => modules/home-manager}/meta/default.nix       | 0
 {home-manager => modules/home-manager}/meta/diff.nix          | 0
 .../home-manager}/meta/home-manager-auto-expire.nix           | 0
 {home-manager => modules/home-manager}/nix/default.nix        | 0
 {home-manager => modules/home-manager}/nix/nixpkgs-config.nix | 0
 {nix-darwin => modules/nix-darwin}/cli.nix                    | 0
 {nix-darwin => modules/nix-darwin}/default.nix                | 4 ++--
 {nix-darwin => modules/nix-darwin}/home.nix                   | 0
 {nix-darwin => modules/nix-darwin}/homebrew.nix               | 0
 {nix-darwin => modules/nix-darwin}/nix/default.nix            | 0
 {nix-darwin => modules/nix-darwin}/nix/linux-builder.nix      | 0
 {nix-darwin => modules/nix-darwin}/system.nix                 | 0
 {nixos => modules/nixos}/default.nix                          | 4 ++--
 {nixos => modules/nixos}/desktop/audio.nix                    | 0
 {nixos => modules/nixos}/desktop/default.nix                  | 0
 {nixos => modules/nixos}/desktop/fonts.nix                    | 0
 {nixos => modules/nixos}/desktop/greetd.nix                   | 0
 {nixos => modules/nixos}/desktop/locale.nix                   | 0
 {nixos => modules/nixos}/desktop/tailscale.nix                | 0
 {nixos => modules/nixos}/desktop/wayland.nix                  | 0
 {nixos => modules/nixos}/desktop/xserver.nix                  | 0
 {nixos => modules/nixos}/dev/default.nix                      | 0
 {nixos => modules/nixos}/dev/virtualisation.nix               | 0
 {nixos => modules/nixos}/games/default.nix                    | 0
 {nixos => modules/nixos}/games/osu.nix                        | 0
 {nixos => modules/nixos}/games/ratbag.nix                     | 0
 {nixos => modules/nixos}/games/retroarch.nix                  | 0
 {nixos => modules/nixos}/games/steam.nix                      | 0
 {nixos => modules/nixos}/home.nix                             | 0
 {nixos => modules/nixos}/laptop/default.nix                   | 0
 {nixos => modules/nixos}/laptop/tlp.nix                       | 0
 {nixos => modules/nixos}/laptop/wireless.nix                  | 0
 {nixos => modules/nixos}/nix/default.nix                      | 0
 {nixos => modules/nixos}/nix/diff.nix                         | 0
 {nixos => modules/nixos}/nix/remote-builders.nix              | 0
 {nixos => modules/nixos}/server/default.nix                   | 0
 {nixos => modules/nixos}/server/duckdns-updater.nix           | 0
 {nixos => modules/nixos}/server/iperf3.nix                    | 0
 {nixos => modules/nixos}/server/jellyfin.nix                  | 0
 {nixos => modules/nixos}/server/networkd.nix                  | 0
 {nixos => modules/nixos}/server/plex.nix                      | 0
 {nixos => modules/nixos}/server/rtorrent.nix                  | 0
 {nixos => modules/nixos}/server/samba.nix                     | 0
 {nixos => modules/nixos}/server/ssh.nix                       | 0
 {nixos => modules/nixos}/server/tailscale.nix                 | 0
 {nixos => modules/nixos}/server/watchdogd.nix                 | 0
 {nixos => modules/nixos}/system/binfmt.nix                    | 0
 {nixos => modules/nixos}/system/btrfs.nix                     | 0
 {nixos => modules/nixos}/system/cli.nix                       | 0
 {nixos => modules/nixos}/system/default.nix                   | 0
 {nixos => modules/nixos}/system/smart.nix                     | 0
 {nixos => modules/nixos}/system/vm.nix                        | 0
 modules/{ => shared}/default.nix                              | 0
 modules/{ => shared}/device.nix                               | 0
 modules/{ => shared}/main-user.nix                            | 0
 {shared => modules/shared}/nix-conf.nix                       | 0
 {shared => modules/shared}/substituters.nix                   | 0
 134 files changed, 13 insertions(+), 13 deletions(-)
 rename {home-manager => modules/home-manager}/cli/default.nix (100%)
 rename {home-manager => modules/home-manager}/cli/git.nix (100%)
 rename {home-manager => modules/home-manager}/cli/htop.nix (100%)
 rename {home-manager => modules/home-manager}/cli/irssi.nix (100%)
 rename {home-manager => modules/home-manager}/cli/nixpkgs.nix (100%)
 rename {home-manager => modules/home-manager}/cli/ssh/default.nix (100%)
 rename {home-manager => modules/home-manager}/cli/ssh/ssh-agent.zsh (100%)
 rename {home-manager => modules/home-manager}/cli/tmux.nix (100%)
 rename {home-manager => modules/home-manager}/cli/yazi.nix (100%)
 rename {home-manager => modules/home-manager}/cli/zsh/default.nix (100%)
 rename {home-manager => modules/home-manager}/crostini.nix (100%)
 rename {home-manager => modules/home-manager}/darwin/default.nix (100%)
 rename {home-manager => modules/home-manager}/darwin/trampoline-apps.nix (100%)
 rename {home-manager => modules/home-manager}/darwin/trampoline-apps.sh (100%)
 rename {home-manager => modules/home-manager}/default.nix (96%)
 rename {home-manager => modules/home-manager}/desktop/chromium.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/dunst.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/firefox.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/gammastep.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/kitty.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/mpv/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/mpv/motion-based-interpolation.vpy (100%)
 rename {home-manager => modules/home-manager}/desktop/nixgl.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/theme/colors.json (100%)
 rename {home-manager => modules/home-manager}/desktop/theme/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/theme/fonts.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/theme/get-base16-colors.sh (100%)
 rename {home-manager => modules/home-manager}/desktop/theme/gtk.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/theme/qt.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/fuzzel.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/hyprland/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/kanshi/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/kanshi/sankyuu-nixos.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/sway.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/swayidle.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/swaylock.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wayland/waybar.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/wezterm.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/autorandr/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/i3/common.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/i3/default.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/i3status-rust.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/picom.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/rofi.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/screen-locker.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/x11/wallpaper.nix (100%)
 rename {home-manager => modules/home-manager}/desktop/xterm.nix (100%)
 rename {home-manager => modules/home-manager}/dev/asdf.nix (100%)
 rename {home-manager => modules/home-manager}/dev/clojure.nix (100%)
 rename {home-manager => modules/home-manager}/dev/default.nix (100%)
 rename {home-manager => modules/home-manager}/dev/go.nix (100%)
 rename {home-manager => modules/home-manager}/dev/nix.nix (100%)
 rename {home-manager => modules/home-manager}/dev/node.nix (100%)
 rename {home-manager => modules/home-manager}/dev/python.nix (100%)
 rename {home-manager => modules/home-manager}/editor/default.nix (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/default.nix (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/disable_pgtk_display_x_warning.patch (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/doom-emacs/.gitignore (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/doom-emacs/autoload.el (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/doom-emacs/config.el (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/doom-emacs/init.el (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/doom-emacs/packages.el (100%)
 rename {home-manager => modules/home-manager}/editor/emacs/doom-emacs/snippets/nix-mode/shell (100%)
 rename {home-manager => modules/home-manager}/editor/helix.nix (100%)
 rename {home-manager => modules/home-manager}/editor/jetbrains.nix (100%)
 rename {home-manager => modules/home-manager}/editor/neovim.nix (100%)
 rename {home-manager => modules/home-manager}/meta/default.nix (100%)
 rename {home-manager => modules/home-manager}/meta/diff.nix (100%)
 rename {home-manager => modules/home-manager}/meta/home-manager-auto-expire.nix (100%)
 rename {home-manager => modules/home-manager}/nix/default.nix (100%)
 rename {home-manager => modules/home-manager}/nix/nixpkgs-config.nix (100%)
 rename {nix-darwin => modules/nix-darwin}/cli.nix (100%)
 rename {nix-darwin => modules/nix-darwin}/default.nix (58%)
 rename {nix-darwin => modules/nix-darwin}/home.nix (100%)
 rename {nix-darwin => modules/nix-darwin}/homebrew.nix (100%)
 rename {nix-darwin => modules/nix-darwin}/nix/default.nix (100%)
 rename {nix-darwin => modules/nix-darwin}/nix/linux-builder.nix (100%)
 rename {nix-darwin => modules/nix-darwin}/system.nix (100%)
 rename {nixos => modules/nixos}/default.nix (62%)
 rename {nixos => modules/nixos}/desktop/audio.nix (100%)
 rename {nixos => modules/nixos}/desktop/default.nix (100%)
 rename {nixos => modules/nixos}/desktop/fonts.nix (100%)
 rename {nixos => modules/nixos}/desktop/greetd.nix (100%)
 rename {nixos => modules/nixos}/desktop/locale.nix (100%)
 rename {nixos => modules/nixos}/desktop/tailscale.nix (100%)
 rename {nixos => modules/nixos}/desktop/wayland.nix (100%)
 rename {nixos => modules/nixos}/desktop/xserver.nix (100%)
 rename {nixos => modules/nixos}/dev/default.nix (100%)
 rename {nixos => modules/nixos}/dev/virtualisation.nix (100%)
 rename {nixos => modules/nixos}/games/default.nix (100%)
 rename {nixos => modules/nixos}/games/osu.nix (100%)
 rename {nixos => modules/nixos}/games/ratbag.nix (100%)
 rename {nixos => modules/nixos}/games/retroarch.nix (100%)
 rename {nixos => modules/nixos}/games/steam.nix (100%)
 rename {nixos => modules/nixos}/home.nix (100%)
 rename {nixos => modules/nixos}/laptop/default.nix (100%)
 rename {nixos => modules/nixos}/laptop/tlp.nix (100%)
 rename {nixos => modules/nixos}/laptop/wireless.nix (100%)
 rename {nixos => modules/nixos}/nix/default.nix (100%)
 rename {nixos => modules/nixos}/nix/diff.nix (100%)
 rename {nixos => modules/nixos}/nix/remote-builders.nix (100%)
 rename {nixos => modules/nixos}/server/default.nix (100%)
 rename {nixos => modules/nixos}/server/duckdns-updater.nix (100%)
 rename {nixos => modules/nixos}/server/iperf3.nix (100%)
 rename {nixos => modules/nixos}/server/jellyfin.nix (100%)
 rename {nixos => modules/nixos}/server/networkd.nix (100%)
 rename {nixos => modules/nixos}/server/plex.nix (100%)
 rename {nixos => modules/nixos}/server/rtorrent.nix (100%)
 rename {nixos => modules/nixos}/server/samba.nix (100%)
 rename {nixos => modules/nixos}/server/ssh.nix (100%)
 rename {nixos => modules/nixos}/server/tailscale.nix (100%)
 rename {nixos => modules/nixos}/server/watchdogd.nix (100%)
 rename {nixos => modules/nixos}/system/binfmt.nix (100%)
 rename {nixos => modules/nixos}/system/btrfs.nix (100%)
 rename {nixos => modules/nixos}/system/cli.nix (100%)
 rename {nixos => modules/nixos}/system/default.nix (100%)
 rename {nixos => modules/nixos}/system/smart.nix (100%)
 rename {nixos => modules/nixos}/system/vm.nix (100%)
 rename modules/{ => shared}/default.nix (100%)
 rename modules/{ => shared}/device.nix (100%)
 rename modules/{ => shared}/main-user.nix (100%)
 rename {shared => modules/shared}/nix-conf.nix (100%)
 rename {shared => modules/shared}/substituters.nix (100%)

diff --git a/hosts/Sekai-MacBook-Pro/default.nix b/hosts/Sekai-MacBook-Pro/default.nix
index e2206b9c..fbb74174 100644
--- a/hosts/Sekai-MacBook-Pro/default.nix
+++ b/hosts/Sekai-MacBook-Pro/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  imports = [ ../../nix-darwin ];
+  imports = [ ../../modules/nix-darwin ];
 
   mainUser.username = "thiago.okada";
 
diff --git a/hosts/hachune-nixos/default.nix b/hosts/hachune-nixos/default.nix
index c368e415..0639f099 100644
--- a/hosts/hachune-nixos/default.nix
+++ b/hosts/hachune-nixos/default.nix
@@ -15,7 +15,7 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ../../nixos
+    ../../modules/nixos
     inputs.hardware.nixosModules.common-cpu-amd
     inputs.hardware.nixosModules.common-gpu-amd
   ];
diff --git a/hosts/miku-nixos/default.nix b/hosts/miku-nixos/default.nix
index 2a757a91..00f8e009 100644
--- a/hosts/miku-nixos/default.nix
+++ b/hosts/miku-nixos/default.nix
@@ -15,7 +15,7 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ../../nixos
+    ../../modules/nixos
     inputs.hardware.nixosModules.common-cpu-intel
   ];
 
diff --git a/hosts/mirai-nixos/default.nix b/hosts/mirai-nixos/default.nix
index 3c0e4372..cbd48fc2 100644
--- a/hosts/mirai-nixos/default.nix
+++ b/hosts/mirai-nixos/default.nix
@@ -8,7 +8,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../nixos
+    ../../modules/nixos
     flake.inputs.disko.nixosModules.disko
   ];
 
diff --git a/hosts/sankyuu-nixos/default.nix b/hosts/sankyuu-nixos/default.nix
index 0cf854d1..ec5873e4 100644
--- a/hosts/sankyuu-nixos/default.nix
+++ b/hosts/sankyuu-nixos/default.nix
@@ -15,7 +15,7 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ../../nixos
+    ../../modules/nixos
     inputs.hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
   ];
 
diff --git a/hosts/zachune-nixos/default.nix b/hosts/zachune-nixos/default.nix
index b5457e54..bc347f50 100644
--- a/hosts/zachune-nixos/default.nix
+++ b/hosts/zachune-nixos/default.nix
@@ -13,7 +13,7 @@ in
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../nixos
+    ../../modules/nixos
     flake.inputs.disko.nixosModules.disko
   ] ++ oci-common.imports;
 
diff --git a/hosts/zatsune-nixos/default.nix b/hosts/zatsune-nixos/default.nix
index 3ad053ad..16c06f8a 100644
--- a/hosts/zatsune-nixos/default.nix
+++ b/hosts/zatsune-nixos/default.nix
@@ -13,7 +13,7 @@ in
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../nixos
+    ../../modules/nixos
     flake.inputs.disko.nixosModules.disko
   ] ++ oci-common.imports;
 
diff --git a/lib/flake-helpers.nix b/lib/flake-helpers.nix
index c61afe28..b8d51b54 100644
--- a/lib/flake-helpers.nix
+++ b/lib/flake-helpers.nix
@@ -154,7 +154,7 @@ in
       username ? "thiagoko",
       homePath ? "/home",
       homeDirectory ? "${homePath}/${username}",
-      configuration ? ../home-manager,
+      configuration ? ../modules/home-manager,
       deviceType ? "desktop",
       extraModules ? [ ],
       system ? "x86_64-linux",
diff --git a/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
similarity index 100%
rename from home-manager/cli/default.nix
rename to modules/home-manager/cli/default.nix
diff --git a/home-manager/cli/git.nix b/modules/home-manager/cli/git.nix
similarity index 100%
rename from home-manager/cli/git.nix
rename to modules/home-manager/cli/git.nix
diff --git a/home-manager/cli/htop.nix b/modules/home-manager/cli/htop.nix
similarity index 100%
rename from home-manager/cli/htop.nix
rename to modules/home-manager/cli/htop.nix
diff --git a/home-manager/cli/irssi.nix b/modules/home-manager/cli/irssi.nix
similarity index 100%
rename from home-manager/cli/irssi.nix
rename to modules/home-manager/cli/irssi.nix
diff --git a/home-manager/cli/nixpkgs.nix b/modules/home-manager/cli/nixpkgs.nix
similarity index 100%
rename from home-manager/cli/nixpkgs.nix
rename to modules/home-manager/cli/nixpkgs.nix
diff --git a/home-manager/cli/ssh/default.nix b/modules/home-manager/cli/ssh/default.nix
similarity index 100%
rename from home-manager/cli/ssh/default.nix
rename to modules/home-manager/cli/ssh/default.nix
diff --git a/home-manager/cli/ssh/ssh-agent.zsh b/modules/home-manager/cli/ssh/ssh-agent.zsh
similarity index 100%
rename from home-manager/cli/ssh/ssh-agent.zsh
rename to modules/home-manager/cli/ssh/ssh-agent.zsh
diff --git a/home-manager/cli/tmux.nix b/modules/home-manager/cli/tmux.nix
similarity index 100%
rename from home-manager/cli/tmux.nix
rename to modules/home-manager/cli/tmux.nix
diff --git a/home-manager/cli/yazi.nix b/modules/home-manager/cli/yazi.nix
similarity index 100%
rename from home-manager/cli/yazi.nix
rename to modules/home-manager/cli/yazi.nix
diff --git a/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix
similarity index 100%
rename from home-manager/cli/zsh/default.nix
rename to modules/home-manager/cli/zsh/default.nix
diff --git a/home-manager/crostini.nix b/modules/home-manager/crostini.nix
similarity index 100%
rename from home-manager/crostini.nix
rename to modules/home-manager/crostini.nix
diff --git a/home-manager/darwin/default.nix b/modules/home-manager/darwin/default.nix
similarity index 100%
rename from home-manager/darwin/default.nix
rename to modules/home-manager/darwin/default.nix
diff --git a/home-manager/darwin/trampoline-apps.nix b/modules/home-manager/darwin/trampoline-apps.nix
similarity index 100%
rename from home-manager/darwin/trampoline-apps.nix
rename to modules/home-manager/darwin/trampoline-apps.nix
diff --git a/home-manager/darwin/trampoline-apps.sh b/modules/home-manager/darwin/trampoline-apps.sh
similarity index 100%
rename from home-manager/darwin/trampoline-apps.sh
rename to modules/home-manager/darwin/trampoline-apps.sh
diff --git a/home-manager/default.nix b/modules/home-manager/default.nix
similarity index 96%
rename from home-manager/default.nix
rename to modules/home-manager/default.nix
index dd575dc5..eb324fe8 100644
--- a/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -7,7 +7,7 @@
 
 {
   imports = [
-    ../modules
+    ../shared
     ./cli
     ./crostini.nix
     ./darwin
diff --git a/home-manager/desktop/chromium.nix b/modules/home-manager/desktop/chromium.nix
similarity index 100%
rename from home-manager/desktop/chromium.nix
rename to modules/home-manager/desktop/chromium.nix
diff --git a/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
similarity index 100%
rename from home-manager/desktop/default.nix
rename to modules/home-manager/desktop/default.nix
diff --git a/home-manager/desktop/dunst.nix b/modules/home-manager/desktop/dunst.nix
similarity index 100%
rename from home-manager/desktop/dunst.nix
rename to modules/home-manager/desktop/dunst.nix
diff --git a/home-manager/desktop/firefox.nix b/modules/home-manager/desktop/firefox.nix
similarity index 100%
rename from home-manager/desktop/firefox.nix
rename to modules/home-manager/desktop/firefox.nix
diff --git a/home-manager/desktop/gammastep.nix b/modules/home-manager/desktop/gammastep.nix
similarity index 100%
rename from home-manager/desktop/gammastep.nix
rename to modules/home-manager/desktop/gammastep.nix
diff --git a/home-manager/desktop/kitty.nix b/modules/home-manager/desktop/kitty.nix
similarity index 100%
rename from home-manager/desktop/kitty.nix
rename to modules/home-manager/desktop/kitty.nix
diff --git a/home-manager/desktop/mpv/default.nix b/modules/home-manager/desktop/mpv/default.nix
similarity index 100%
rename from home-manager/desktop/mpv/default.nix
rename to modules/home-manager/desktop/mpv/default.nix
diff --git a/home-manager/desktop/mpv/motion-based-interpolation.vpy b/modules/home-manager/desktop/mpv/motion-based-interpolation.vpy
similarity index 100%
rename from home-manager/desktop/mpv/motion-based-interpolation.vpy
rename to modules/home-manager/desktop/mpv/motion-based-interpolation.vpy
diff --git a/home-manager/desktop/nixgl.nix b/modules/home-manager/desktop/nixgl.nix
similarity index 100%
rename from home-manager/desktop/nixgl.nix
rename to modules/home-manager/desktop/nixgl.nix
diff --git a/home-manager/desktop/theme/colors.json b/modules/home-manager/desktop/theme/colors.json
similarity index 100%
rename from home-manager/desktop/theme/colors.json
rename to modules/home-manager/desktop/theme/colors.json
diff --git a/home-manager/desktop/theme/default.nix b/modules/home-manager/desktop/theme/default.nix
similarity index 100%
rename from home-manager/desktop/theme/default.nix
rename to modules/home-manager/desktop/theme/default.nix
diff --git a/home-manager/desktop/theme/fonts.nix b/modules/home-manager/desktop/theme/fonts.nix
similarity index 100%
rename from home-manager/desktop/theme/fonts.nix
rename to modules/home-manager/desktop/theme/fonts.nix
diff --git a/home-manager/desktop/theme/get-base16-colors.sh b/modules/home-manager/desktop/theme/get-base16-colors.sh
similarity index 100%
rename from home-manager/desktop/theme/get-base16-colors.sh
rename to modules/home-manager/desktop/theme/get-base16-colors.sh
diff --git a/home-manager/desktop/theme/gtk.nix b/modules/home-manager/desktop/theme/gtk.nix
similarity index 100%
rename from home-manager/desktop/theme/gtk.nix
rename to modules/home-manager/desktop/theme/gtk.nix
diff --git a/home-manager/desktop/theme/qt.nix b/modules/home-manager/desktop/theme/qt.nix
similarity index 100%
rename from home-manager/desktop/theme/qt.nix
rename to modules/home-manager/desktop/theme/qt.nix
diff --git a/home-manager/desktop/wayland/default.nix b/modules/home-manager/desktop/wayland/default.nix
similarity index 100%
rename from home-manager/desktop/wayland/default.nix
rename to modules/home-manager/desktop/wayland/default.nix
diff --git a/home-manager/desktop/wayland/fuzzel.nix b/modules/home-manager/desktop/wayland/fuzzel.nix
similarity index 100%
rename from home-manager/desktop/wayland/fuzzel.nix
rename to modules/home-manager/desktop/wayland/fuzzel.nix
diff --git a/home-manager/desktop/wayland/hyprland/default.nix b/modules/home-manager/desktop/wayland/hyprland/default.nix
similarity index 100%
rename from home-manager/desktop/wayland/hyprland/default.nix
rename to modules/home-manager/desktop/wayland/hyprland/default.nix
diff --git a/home-manager/desktop/wayland/kanshi/default.nix b/modules/home-manager/desktop/wayland/kanshi/default.nix
similarity index 100%
rename from home-manager/desktop/wayland/kanshi/default.nix
rename to modules/home-manager/desktop/wayland/kanshi/default.nix
diff --git a/home-manager/desktop/wayland/kanshi/sankyuu-nixos.nix b/modules/home-manager/desktop/wayland/kanshi/sankyuu-nixos.nix
similarity index 100%
rename from home-manager/desktop/wayland/kanshi/sankyuu-nixos.nix
rename to modules/home-manager/desktop/wayland/kanshi/sankyuu-nixos.nix
diff --git a/home-manager/desktop/wayland/sway.nix b/modules/home-manager/desktop/wayland/sway.nix
similarity index 100%
rename from home-manager/desktop/wayland/sway.nix
rename to modules/home-manager/desktop/wayland/sway.nix
diff --git a/home-manager/desktop/wayland/swayidle.nix b/modules/home-manager/desktop/wayland/swayidle.nix
similarity index 100%
rename from home-manager/desktop/wayland/swayidle.nix
rename to modules/home-manager/desktop/wayland/swayidle.nix
diff --git a/home-manager/desktop/wayland/swaylock.nix b/modules/home-manager/desktop/wayland/swaylock.nix
similarity index 100%
rename from home-manager/desktop/wayland/swaylock.nix
rename to modules/home-manager/desktop/wayland/swaylock.nix
diff --git a/home-manager/desktop/wayland/waybar.nix b/modules/home-manager/desktop/wayland/waybar.nix
similarity index 100%
rename from home-manager/desktop/wayland/waybar.nix
rename to modules/home-manager/desktop/wayland/waybar.nix
diff --git a/home-manager/desktop/wezterm.nix b/modules/home-manager/desktop/wezterm.nix
similarity index 100%
rename from home-manager/desktop/wezterm.nix
rename to modules/home-manager/desktop/wezterm.nix
diff --git a/home-manager/desktop/x11/autorandr/default.nix b/modules/home-manager/desktop/x11/autorandr/default.nix
similarity index 100%
rename from home-manager/desktop/x11/autorandr/default.nix
rename to modules/home-manager/desktop/x11/autorandr/default.nix
diff --git a/home-manager/desktop/x11/default.nix b/modules/home-manager/desktop/x11/default.nix
similarity index 100%
rename from home-manager/desktop/x11/default.nix
rename to modules/home-manager/desktop/x11/default.nix
diff --git a/home-manager/desktop/x11/i3/common.nix b/modules/home-manager/desktop/x11/i3/common.nix
similarity index 100%
rename from home-manager/desktop/x11/i3/common.nix
rename to modules/home-manager/desktop/x11/i3/common.nix
diff --git a/home-manager/desktop/x11/i3/default.nix b/modules/home-manager/desktop/x11/i3/default.nix
similarity index 100%
rename from home-manager/desktop/x11/i3/default.nix
rename to modules/home-manager/desktop/x11/i3/default.nix
diff --git a/home-manager/desktop/x11/i3status-rust.nix b/modules/home-manager/desktop/x11/i3status-rust.nix
similarity index 100%
rename from home-manager/desktop/x11/i3status-rust.nix
rename to modules/home-manager/desktop/x11/i3status-rust.nix
diff --git a/home-manager/desktop/x11/picom.nix b/modules/home-manager/desktop/x11/picom.nix
similarity index 100%
rename from home-manager/desktop/x11/picom.nix
rename to modules/home-manager/desktop/x11/picom.nix
diff --git a/home-manager/desktop/x11/rofi.nix b/modules/home-manager/desktop/x11/rofi.nix
similarity index 100%
rename from home-manager/desktop/x11/rofi.nix
rename to modules/home-manager/desktop/x11/rofi.nix
diff --git a/home-manager/desktop/x11/screen-locker.nix b/modules/home-manager/desktop/x11/screen-locker.nix
similarity index 100%
rename from home-manager/desktop/x11/screen-locker.nix
rename to modules/home-manager/desktop/x11/screen-locker.nix
diff --git a/home-manager/desktop/x11/wallpaper.nix b/modules/home-manager/desktop/x11/wallpaper.nix
similarity index 100%
rename from home-manager/desktop/x11/wallpaper.nix
rename to modules/home-manager/desktop/x11/wallpaper.nix
diff --git a/home-manager/desktop/xterm.nix b/modules/home-manager/desktop/xterm.nix
similarity index 100%
rename from home-manager/desktop/xterm.nix
rename to modules/home-manager/desktop/xterm.nix
diff --git a/home-manager/dev/asdf.nix b/modules/home-manager/dev/asdf.nix
similarity index 100%
rename from home-manager/dev/asdf.nix
rename to modules/home-manager/dev/asdf.nix
diff --git a/home-manager/dev/clojure.nix b/modules/home-manager/dev/clojure.nix
similarity index 100%
rename from home-manager/dev/clojure.nix
rename to modules/home-manager/dev/clojure.nix
diff --git a/home-manager/dev/default.nix b/modules/home-manager/dev/default.nix
similarity index 100%
rename from home-manager/dev/default.nix
rename to modules/home-manager/dev/default.nix
diff --git a/home-manager/dev/go.nix b/modules/home-manager/dev/go.nix
similarity index 100%
rename from home-manager/dev/go.nix
rename to modules/home-manager/dev/go.nix
diff --git a/home-manager/dev/nix.nix b/modules/home-manager/dev/nix.nix
similarity index 100%
rename from home-manager/dev/nix.nix
rename to modules/home-manager/dev/nix.nix
diff --git a/home-manager/dev/node.nix b/modules/home-manager/dev/node.nix
similarity index 100%
rename from home-manager/dev/node.nix
rename to modules/home-manager/dev/node.nix
diff --git a/home-manager/dev/python.nix b/modules/home-manager/dev/python.nix
similarity index 100%
rename from home-manager/dev/python.nix
rename to modules/home-manager/dev/python.nix
diff --git a/home-manager/editor/default.nix b/modules/home-manager/editor/default.nix
similarity index 100%
rename from home-manager/editor/default.nix
rename to modules/home-manager/editor/default.nix
diff --git a/home-manager/editor/emacs/default.nix b/modules/home-manager/editor/emacs/default.nix
similarity index 100%
rename from home-manager/editor/emacs/default.nix
rename to modules/home-manager/editor/emacs/default.nix
diff --git a/home-manager/editor/emacs/disable_pgtk_display_x_warning.patch b/modules/home-manager/editor/emacs/disable_pgtk_display_x_warning.patch
similarity index 100%
rename from home-manager/editor/emacs/disable_pgtk_display_x_warning.patch
rename to modules/home-manager/editor/emacs/disable_pgtk_display_x_warning.patch
diff --git a/home-manager/editor/emacs/doom-emacs/.gitignore b/modules/home-manager/editor/emacs/doom-emacs/.gitignore
similarity index 100%
rename from home-manager/editor/emacs/doom-emacs/.gitignore
rename to modules/home-manager/editor/emacs/doom-emacs/.gitignore
diff --git a/home-manager/editor/emacs/doom-emacs/autoload.el b/modules/home-manager/editor/emacs/doom-emacs/autoload.el
similarity index 100%
rename from home-manager/editor/emacs/doom-emacs/autoload.el
rename to modules/home-manager/editor/emacs/doom-emacs/autoload.el
diff --git a/home-manager/editor/emacs/doom-emacs/config.el b/modules/home-manager/editor/emacs/doom-emacs/config.el
similarity index 100%
rename from home-manager/editor/emacs/doom-emacs/config.el
rename to modules/home-manager/editor/emacs/doom-emacs/config.el
diff --git a/home-manager/editor/emacs/doom-emacs/init.el b/modules/home-manager/editor/emacs/doom-emacs/init.el
similarity index 100%
rename from home-manager/editor/emacs/doom-emacs/init.el
rename to modules/home-manager/editor/emacs/doom-emacs/init.el
diff --git a/home-manager/editor/emacs/doom-emacs/packages.el b/modules/home-manager/editor/emacs/doom-emacs/packages.el
similarity index 100%
rename from home-manager/editor/emacs/doom-emacs/packages.el
rename to modules/home-manager/editor/emacs/doom-emacs/packages.el
diff --git a/home-manager/editor/emacs/doom-emacs/snippets/nix-mode/shell b/modules/home-manager/editor/emacs/doom-emacs/snippets/nix-mode/shell
similarity index 100%
rename from home-manager/editor/emacs/doom-emacs/snippets/nix-mode/shell
rename to modules/home-manager/editor/emacs/doom-emacs/snippets/nix-mode/shell
diff --git a/home-manager/editor/helix.nix b/modules/home-manager/editor/helix.nix
similarity index 100%
rename from home-manager/editor/helix.nix
rename to modules/home-manager/editor/helix.nix
diff --git a/home-manager/editor/jetbrains.nix b/modules/home-manager/editor/jetbrains.nix
similarity index 100%
rename from home-manager/editor/jetbrains.nix
rename to modules/home-manager/editor/jetbrains.nix
diff --git a/home-manager/editor/neovim.nix b/modules/home-manager/editor/neovim.nix
similarity index 100%
rename from home-manager/editor/neovim.nix
rename to modules/home-manager/editor/neovim.nix
diff --git a/home-manager/meta/default.nix b/modules/home-manager/meta/default.nix
similarity index 100%
rename from home-manager/meta/default.nix
rename to modules/home-manager/meta/default.nix
diff --git a/home-manager/meta/diff.nix b/modules/home-manager/meta/diff.nix
similarity index 100%
rename from home-manager/meta/diff.nix
rename to modules/home-manager/meta/diff.nix
diff --git a/home-manager/meta/home-manager-auto-expire.nix b/modules/home-manager/meta/home-manager-auto-expire.nix
similarity index 100%
rename from home-manager/meta/home-manager-auto-expire.nix
rename to modules/home-manager/meta/home-manager-auto-expire.nix
diff --git a/home-manager/nix/default.nix b/modules/home-manager/nix/default.nix
similarity index 100%
rename from home-manager/nix/default.nix
rename to modules/home-manager/nix/default.nix
diff --git a/home-manager/nix/nixpkgs-config.nix b/modules/home-manager/nix/nixpkgs-config.nix
similarity index 100%
rename from home-manager/nix/nixpkgs-config.nix
rename to modules/home-manager/nix/nixpkgs-config.nix
diff --git a/nix-darwin/cli.nix b/modules/nix-darwin/cli.nix
similarity index 100%
rename from nix-darwin/cli.nix
rename to modules/nix-darwin/cli.nix
diff --git a/nix-darwin/default.nix b/modules/nix-darwin/default.nix
similarity index 58%
rename from nix-darwin/default.nix
rename to modules/nix-darwin/default.nix
index eedeb45b..4a7239b0 100644
--- a/nix-darwin/default.nix
+++ b/modules/nix-darwin/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../modules
+    ../shared
     ./cli.nix
     ./home.nix
     ./homebrew.nix
@@ -10,5 +10,5 @@
     ./system.nix
   ];
 
-  nixpkgs.overlays = [ (import ../overlays { inherit flake; }) ];
+  nixpkgs.overlays = [ (import ../../overlays { inherit flake; }) ];
 }
diff --git a/nix-darwin/home.nix b/modules/nix-darwin/home.nix
similarity index 100%
rename from nix-darwin/home.nix
rename to modules/nix-darwin/home.nix
diff --git a/nix-darwin/homebrew.nix b/modules/nix-darwin/homebrew.nix
similarity index 100%
rename from nix-darwin/homebrew.nix
rename to modules/nix-darwin/homebrew.nix
diff --git a/nix-darwin/nix/default.nix b/modules/nix-darwin/nix/default.nix
similarity index 100%
rename from nix-darwin/nix/default.nix
rename to modules/nix-darwin/nix/default.nix
diff --git a/nix-darwin/nix/linux-builder.nix b/modules/nix-darwin/nix/linux-builder.nix
similarity index 100%
rename from nix-darwin/nix/linux-builder.nix
rename to modules/nix-darwin/nix/linux-builder.nix
diff --git a/nix-darwin/system.nix b/modules/nix-darwin/system.nix
similarity index 100%
rename from nix-darwin/system.nix
rename to modules/nix-darwin/system.nix
diff --git a/nixos/default.nix b/modules/nixos/default.nix
similarity index 62%
rename from nixos/default.nix
rename to modules/nixos/default.nix
index 74c54acd..e1d6955b 100644
--- a/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../modules
+    ../shared
     ./desktop
     ./dev
     ./games
@@ -13,5 +13,5 @@
     ./system
   ];
 
-  nixpkgs.overlays = [ (import ../overlays { inherit flake; }) ];
+  nixpkgs.overlays = [ (import ../../overlays { inherit flake; }) ];
 }
diff --git a/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix
similarity index 100%
rename from nixos/desktop/audio.nix
rename to modules/nixos/desktop/audio.nix
diff --git a/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
similarity index 100%
rename from nixos/desktop/default.nix
rename to modules/nixos/desktop/default.nix
diff --git a/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix
similarity index 100%
rename from nixos/desktop/fonts.nix
rename to modules/nixos/desktop/fonts.nix
diff --git a/nixos/desktop/greetd.nix b/modules/nixos/desktop/greetd.nix
similarity index 100%
rename from nixos/desktop/greetd.nix
rename to modules/nixos/desktop/greetd.nix
diff --git a/nixos/desktop/locale.nix b/modules/nixos/desktop/locale.nix
similarity index 100%
rename from nixos/desktop/locale.nix
rename to modules/nixos/desktop/locale.nix
diff --git a/nixos/desktop/tailscale.nix b/modules/nixos/desktop/tailscale.nix
similarity index 100%
rename from nixos/desktop/tailscale.nix
rename to modules/nixos/desktop/tailscale.nix
diff --git a/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix
similarity index 100%
rename from nixos/desktop/wayland.nix
rename to modules/nixos/desktop/wayland.nix
diff --git a/nixos/desktop/xserver.nix b/modules/nixos/desktop/xserver.nix
similarity index 100%
rename from nixos/desktop/xserver.nix
rename to modules/nixos/desktop/xserver.nix
diff --git a/nixos/dev/default.nix b/modules/nixos/dev/default.nix
similarity index 100%
rename from nixos/dev/default.nix
rename to modules/nixos/dev/default.nix
diff --git a/nixos/dev/virtualisation.nix b/modules/nixos/dev/virtualisation.nix
similarity index 100%
rename from nixos/dev/virtualisation.nix
rename to modules/nixos/dev/virtualisation.nix
diff --git a/nixos/games/default.nix b/modules/nixos/games/default.nix
similarity index 100%
rename from nixos/games/default.nix
rename to modules/nixos/games/default.nix
diff --git a/nixos/games/osu.nix b/modules/nixos/games/osu.nix
similarity index 100%
rename from nixos/games/osu.nix
rename to modules/nixos/games/osu.nix
diff --git a/nixos/games/ratbag.nix b/modules/nixos/games/ratbag.nix
similarity index 100%
rename from nixos/games/ratbag.nix
rename to modules/nixos/games/ratbag.nix
diff --git a/nixos/games/retroarch.nix b/modules/nixos/games/retroarch.nix
similarity index 100%
rename from nixos/games/retroarch.nix
rename to modules/nixos/games/retroarch.nix
diff --git a/nixos/games/steam.nix b/modules/nixos/games/steam.nix
similarity index 100%
rename from nixos/games/steam.nix
rename to modules/nixos/games/steam.nix
diff --git a/nixos/home.nix b/modules/nixos/home.nix
similarity index 100%
rename from nixos/home.nix
rename to modules/nixos/home.nix
diff --git a/nixos/laptop/default.nix b/modules/nixos/laptop/default.nix
similarity index 100%
rename from nixos/laptop/default.nix
rename to modules/nixos/laptop/default.nix
diff --git a/nixos/laptop/tlp.nix b/modules/nixos/laptop/tlp.nix
similarity index 100%
rename from nixos/laptop/tlp.nix
rename to modules/nixos/laptop/tlp.nix
diff --git a/nixos/laptop/wireless.nix b/modules/nixos/laptop/wireless.nix
similarity index 100%
rename from nixos/laptop/wireless.nix
rename to modules/nixos/laptop/wireless.nix
diff --git a/nixos/nix/default.nix b/modules/nixos/nix/default.nix
similarity index 100%
rename from nixos/nix/default.nix
rename to modules/nixos/nix/default.nix
diff --git a/nixos/nix/diff.nix b/modules/nixos/nix/diff.nix
similarity index 100%
rename from nixos/nix/diff.nix
rename to modules/nixos/nix/diff.nix
diff --git a/nixos/nix/remote-builders.nix b/modules/nixos/nix/remote-builders.nix
similarity index 100%
rename from nixos/nix/remote-builders.nix
rename to modules/nixos/nix/remote-builders.nix
diff --git a/nixos/server/default.nix b/modules/nixos/server/default.nix
similarity index 100%
rename from nixos/server/default.nix
rename to modules/nixos/server/default.nix
diff --git a/nixos/server/duckdns-updater.nix b/modules/nixos/server/duckdns-updater.nix
similarity index 100%
rename from nixos/server/duckdns-updater.nix
rename to modules/nixos/server/duckdns-updater.nix
diff --git a/nixos/server/iperf3.nix b/modules/nixos/server/iperf3.nix
similarity index 100%
rename from nixos/server/iperf3.nix
rename to modules/nixos/server/iperf3.nix
diff --git a/nixos/server/jellyfin.nix b/modules/nixos/server/jellyfin.nix
similarity index 100%
rename from nixos/server/jellyfin.nix
rename to modules/nixos/server/jellyfin.nix
diff --git a/nixos/server/networkd.nix b/modules/nixos/server/networkd.nix
similarity index 100%
rename from nixos/server/networkd.nix
rename to modules/nixos/server/networkd.nix
diff --git a/nixos/server/plex.nix b/modules/nixos/server/plex.nix
similarity index 100%
rename from nixos/server/plex.nix
rename to modules/nixos/server/plex.nix
diff --git a/nixos/server/rtorrent.nix b/modules/nixos/server/rtorrent.nix
similarity index 100%
rename from nixos/server/rtorrent.nix
rename to modules/nixos/server/rtorrent.nix
diff --git a/nixos/server/samba.nix b/modules/nixos/server/samba.nix
similarity index 100%
rename from nixos/server/samba.nix
rename to modules/nixos/server/samba.nix
diff --git a/nixos/server/ssh.nix b/modules/nixos/server/ssh.nix
similarity index 100%
rename from nixos/server/ssh.nix
rename to modules/nixos/server/ssh.nix
diff --git a/nixos/server/tailscale.nix b/modules/nixos/server/tailscale.nix
similarity index 100%
rename from nixos/server/tailscale.nix
rename to modules/nixos/server/tailscale.nix
diff --git a/nixos/server/watchdogd.nix b/modules/nixos/server/watchdogd.nix
similarity index 100%
rename from nixos/server/watchdogd.nix
rename to modules/nixos/server/watchdogd.nix
diff --git a/nixos/system/binfmt.nix b/modules/nixos/system/binfmt.nix
similarity index 100%
rename from nixos/system/binfmt.nix
rename to modules/nixos/system/binfmt.nix
diff --git a/nixos/system/btrfs.nix b/modules/nixos/system/btrfs.nix
similarity index 100%
rename from nixos/system/btrfs.nix
rename to modules/nixos/system/btrfs.nix
diff --git a/nixos/system/cli.nix b/modules/nixos/system/cli.nix
similarity index 100%
rename from nixos/system/cli.nix
rename to modules/nixos/system/cli.nix
diff --git a/nixos/system/default.nix b/modules/nixos/system/default.nix
similarity index 100%
rename from nixos/system/default.nix
rename to modules/nixos/system/default.nix
diff --git a/nixos/system/smart.nix b/modules/nixos/system/smart.nix
similarity index 100%
rename from nixos/system/smart.nix
rename to modules/nixos/system/smart.nix
diff --git a/nixos/system/vm.nix b/modules/nixos/system/vm.nix
similarity index 100%
rename from nixos/system/vm.nix
rename to modules/nixos/system/vm.nix
diff --git a/modules/default.nix b/modules/shared/default.nix
similarity index 100%
rename from modules/default.nix
rename to modules/shared/default.nix
diff --git a/modules/device.nix b/modules/shared/device.nix
similarity index 100%
rename from modules/device.nix
rename to modules/shared/device.nix
diff --git a/modules/main-user.nix b/modules/shared/main-user.nix
similarity index 100%
rename from modules/main-user.nix
rename to modules/shared/main-user.nix
diff --git a/shared/nix-conf.nix b/modules/shared/nix-conf.nix
similarity index 100%
rename from shared/nix-conf.nix
rename to modules/shared/nix-conf.nix
diff --git a/shared/substituters.nix b/modules/shared/substituters.nix
similarity index 100%
rename from shared/substituters.nix
rename to modules/shared/substituters.nix