modules: move darwin/home-manager/nixos to it

thiagokokada · Dec 21, 2024 · 7ceb15e · 7ceb15e
1 parent 8058362
commit 7ceb15e
Show file tree

Hide file tree

Showing 134 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → modules/home-manager/cli/default.nix b/home-manager/cli/default.nix → modules/home-manager/cli/default.nix
diff --git a/home-manager/cli/git.nix → modules/home-manager/cli/git.nix b/home-manager/cli/git.nix → modules/home-manager/cli/git.nix
diff --git a/home-manager/cli/htop.nix → modules/home-manager/cli/htop.nix b/home-manager/cli/htop.nix → modules/home-manager/cli/htop.nix
diff --git a/home-manager/cli/irssi.nix → modules/home-manager/cli/irssi.nix b/home-manager/cli/irssi.nix → modules/home-manager/cli/irssi.nix
diff --git a/home-manager/cli/nixpkgs.nix → modules/home-manager/cli/nixpkgs.nix b/home-manager/cli/nixpkgs.nix → modules/home-manager/cli/nixpkgs.nix
diff --git a/home-manager/cli/ssh/default.nix → modules/home-manager/cli/ssh/default.nix b/home-manager/cli/ssh/default.nix → modules/home-manager/cli/ssh/default.nix
diff --git a/home-manager/cli/ssh/ssh-agent.zsh → modules/home-manager/cli/ssh/ssh-agent.zsh b/home-manager/cli/ssh/ssh-agent.zsh → modules/home-manager/cli/ssh/ssh-agent.zsh
diff --git a/home-manager/cli/tmux.nix → modules/home-manager/cli/tmux.nix b/home-manager/cli/tmux.nix → modules/home-manager/cli/tmux.nix
diff --git a/home-manager/cli/yazi.nix → modules/home-manager/cli/yazi.nix b/home-manager/cli/yazi.nix → modules/home-manager/cli/yazi.nix
diff --git a/home-manager/cli/zsh/default.nix → modules/home-manager/cli/zsh/default.nix b/home-manager/cli/zsh/default.nix → modules/home-manager/cli/zsh/default.nix
diff --git a/home-manager/crostini.nix → modules/home-manager/crostini.nix b/home-manager/crostini.nix → modules/home-manager/crostini.nix
diff --git a/home-manager/darwin/default.nix → modules/home-manager/darwin/default.nix b/home-manager/darwin/default.nix → modules/home-manager/darwin/default.nix
diff --git a/home-manager/darwin/trampoline-apps.nix → ...s/home-manager/darwin/trampoline-apps.nix b/home-manager/darwin/trampoline-apps.nix → ...s/home-manager/darwin/trampoline-apps.nix
diff --git a/home-manager/darwin/trampoline-apps.sh → ...es/home-manager/darwin/trampoline-apps.sh b/home-manager/darwin/trampoline-apps.sh → ...es/home-manager/darwin/trampoline-apps.sh
diff --git a/home-manager/default.nix → modules/home-manager/default.nix b/home-manager/default.nix → modules/home-manager/default.nix
@@ -7,7 +7,7 @@
 
 {
   imports = [
-    ../modules
+    ../shared
     ./cli
     ./crostini.nix
     ./darwin

diff --git a/home-manager/desktop/chromium.nix → modules/home-manager/desktop/chromium.nix b/home-manager/desktop/chromium.nix → modules/home-manager/desktop/chromium.nix
diff --git a/home-manager/desktop/default.nix → modules/home-manager/desktop/default.nix b/home-manager/desktop/default.nix → modules/home-manager/desktop/default.nix
diff --git a/home-manager/desktop/dunst.nix → modules/home-manager/desktop/dunst.nix b/home-manager/desktop/dunst.nix → modules/home-manager/desktop/dunst.nix
diff --git a/home-manager/desktop/firefox.nix → modules/home-manager/desktop/firefox.nix b/home-manager/desktop/firefox.nix → modules/home-manager/desktop/firefox.nix
diff --git a/home-manager/desktop/gammastep.nix → modules/home-manager/desktop/gammastep.nix b/home-manager/desktop/gammastep.nix → modules/home-manager/desktop/gammastep.nix
diff --git a/home-manager/desktop/kitty.nix → modules/home-manager/desktop/kitty.nix b/home-manager/desktop/kitty.nix → modules/home-manager/desktop/kitty.nix
diff --git a/home-manager/desktop/mpv/default.nix → modules/home-manager/desktop/mpv/default.nix b/home-manager/desktop/mpv/default.nix → modules/home-manager/desktop/mpv/default.nix
diff --git a/...esktop/mpv/motion-based-interpolation.vpy → ...esktop/mpv/motion-based-interpolation.vpy b/...esktop/mpv/motion-based-interpolation.vpy → ...esktop/mpv/motion-based-interpolation.vpy
diff --git a/home-manager/desktop/nixgl.nix → modules/home-manager/desktop/nixgl.nix b/home-manager/desktop/nixgl.nix → modules/home-manager/desktop/nixgl.nix
diff --git a/home-manager/desktop/theme/colors.json → ...es/home-manager/desktop/theme/colors.json b/home-manager/desktop/theme/colors.json → ...es/home-manager/desktop/theme/colors.json
diff --git a/home-manager/desktop/theme/default.nix → ...es/home-manager/desktop/theme/default.nix b/home-manager/desktop/theme/default.nix → ...es/home-manager/desktop/theme/default.nix
diff --git a/home-manager/desktop/theme/fonts.nix → modules/home-manager/desktop/theme/fonts.nix b/home-manager/desktop/theme/fonts.nix → modules/home-manager/desktop/theme/fonts.nix
diff --git a/...anager/desktop/theme/get-base16-colors.sh → ...anager/desktop/theme/get-base16-colors.sh b/...anager/desktop/theme/get-base16-colors.sh → ...anager/desktop/theme/get-base16-colors.sh
diff --git a/home-manager/desktop/theme/gtk.nix → modules/home-manager/desktop/theme/gtk.nix b/home-manager/desktop/theme/gtk.nix → modules/home-manager/desktop/theme/gtk.nix
diff --git a/home-manager/desktop/theme/qt.nix → modules/home-manager/desktop/theme/qt.nix b/home-manager/desktop/theme/qt.nix → modules/home-manager/desktop/theme/qt.nix
diff --git a/home-manager/desktop/wayland/default.nix → .../home-manager/desktop/wayland/default.nix b/home-manager/desktop/wayland/default.nix → .../home-manager/desktop/wayland/default.nix
diff --git a/home-manager/desktop/wayland/fuzzel.nix → ...s/home-manager/desktop/wayland/fuzzel.nix b/home-manager/desktop/wayland/fuzzel.nix → ...s/home-manager/desktop/wayland/fuzzel.nix
diff --git a/...ager/desktop/wayland/hyprland/default.nix → ...ager/desktop/wayland/hyprland/default.nix b/...ager/desktop/wayland/hyprland/default.nix → ...ager/desktop/wayland/hyprland/default.nix
diff --git a/...anager/desktop/wayland/kanshi/default.nix → ...anager/desktop/wayland/kanshi/default.nix b/...anager/desktop/wayland/kanshi/default.nix → ...anager/desktop/wayland/kanshi/default.nix
diff --git a/.../desktop/wayland/kanshi/sankyuu-nixos.nix → .../desktop/wayland/kanshi/sankyuu-nixos.nix b/.../desktop/wayland/kanshi/sankyuu-nixos.nix → .../desktop/wayland/kanshi/sankyuu-nixos.nix
diff --git a/home-manager/desktop/wayland/sway.nix → ...les/home-manager/desktop/wayland/sway.nix b/home-manager/desktop/wayland/sway.nix → ...les/home-manager/desktop/wayland/sway.nix
diff --git a/home-manager/desktop/wayland/swayidle.nix → ...home-manager/desktop/wayland/swayidle.nix b/home-manager/desktop/wayland/swayidle.nix → ...home-manager/desktop/wayland/swayidle.nix
diff --git a/home-manager/desktop/wayland/swaylock.nix → ...home-manager/desktop/wayland/swaylock.nix b/home-manager/desktop/wayland/swaylock.nix → ...home-manager/desktop/wayland/swaylock.nix
diff --git a/home-manager/desktop/wayland/waybar.nix → ...s/home-manager/desktop/wayland/waybar.nix b/home-manager/desktop/wayland/waybar.nix → ...s/home-manager/desktop/wayland/waybar.nix
diff --git a/home-manager/desktop/wezterm.nix → modules/home-manager/desktop/wezterm.nix b/home-manager/desktop/wezterm.nix → modules/home-manager/desktop/wezterm.nix
diff --git a/...manager/desktop/x11/autorandr/default.nix → ...manager/desktop/x11/autorandr/default.nix b/...manager/desktop/x11/autorandr/default.nix → ...manager/desktop/x11/autorandr/default.nix
diff --git a/home-manager/desktop/x11/default.nix → modules/home-manager/desktop/x11/default.nix b/home-manager/desktop/x11/default.nix → modules/home-manager/desktop/x11/default.nix
diff --git a/home-manager/desktop/x11/i3/common.nix → ...es/home-manager/desktop/x11/i3/common.nix b/home-manager/desktop/x11/i3/common.nix → ...es/home-manager/desktop/x11/i3/common.nix
diff --git a/home-manager/desktop/x11/i3/default.nix → ...s/home-manager/desktop/x11/i3/default.nix b/home-manager/desktop/x11/i3/default.nix → ...s/home-manager/desktop/x11/i3/default.nix
diff --git a/home-manager/desktop/x11/i3status-rust.nix → ...ome-manager/desktop/x11/i3status-rust.nix b/home-manager/desktop/x11/i3status-rust.nix → ...ome-manager/desktop/x11/i3status-rust.nix
diff --git a/home-manager/desktop/x11/picom.nix → modules/home-manager/desktop/x11/picom.nix b/home-manager/desktop/x11/picom.nix → modules/home-manager/desktop/x11/picom.nix
diff --git a/home-manager/desktop/x11/rofi.nix → modules/home-manager/desktop/x11/rofi.nix b/home-manager/desktop/x11/rofi.nix → modules/home-manager/desktop/x11/rofi.nix
diff --git a/home-manager/desktop/x11/screen-locker.nix → ...ome-manager/desktop/x11/screen-locker.nix b/home-manager/desktop/x11/screen-locker.nix → ...ome-manager/desktop/x11/screen-locker.nix
diff --git a/home-manager/desktop/x11/wallpaper.nix → ...es/home-manager/desktop/x11/wallpaper.nix b/home-manager/desktop/x11/wallpaper.nix → ...es/home-manager/desktop/x11/wallpaper.nix
diff --git a/home-manager/desktop/xterm.nix → modules/home-manager/desktop/xterm.nix b/home-manager/desktop/xterm.nix → modules/home-manager/desktop/xterm.nix
diff --git a/home-manager/dev/asdf.nix → modules/home-manager/dev/asdf.nix b/home-manager/dev/asdf.nix → modules/home-manager/dev/asdf.nix
diff --git a/home-manager/dev/clojure.nix → modules/home-manager/dev/clojure.nix b/home-manager/dev/clojure.nix → modules/home-manager/dev/clojure.nix
diff --git a/home-manager/dev/default.nix → modules/home-manager/dev/default.nix b/home-manager/dev/default.nix → modules/home-manager/dev/default.nix
diff --git a/home-manager/dev/go.nix → modules/home-manager/dev/go.nix b/home-manager/dev/go.nix → modules/home-manager/dev/go.nix
diff --git a/home-manager/dev/nix.nix → modules/home-manager/dev/nix.nix b/home-manager/dev/nix.nix → modules/home-manager/dev/nix.nix
diff --git a/home-manager/dev/node.nix → modules/home-manager/dev/node.nix b/home-manager/dev/node.nix → modules/home-manager/dev/node.nix
diff --git a/home-manager/dev/python.nix → modules/home-manager/dev/python.nix b/home-manager/dev/python.nix → modules/home-manager/dev/python.nix
diff --git a/home-manager/editor/default.nix → modules/home-manager/editor/default.nix b/home-manager/editor/default.nix → modules/home-manager/editor/default.nix
diff --git a/home-manager/editor/emacs/default.nix → ...les/home-manager/editor/emacs/default.nix b/home-manager/editor/emacs/default.nix → ...les/home-manager/editor/emacs/default.nix
diff --git a/...macs/disable_pgtk_display_x_warning.patch → ...macs/disable_pgtk_display_x_warning.patch b/...macs/disable_pgtk_display_x_warning.patch → ...macs/disable_pgtk_display_x_warning.patch
diff --git a/...anager/editor/emacs/doom-emacs/.gitignore → ...anager/editor/emacs/doom-emacs/.gitignore b/...anager/editor/emacs/doom-emacs/.gitignore → ...anager/editor/emacs/doom-emacs/.gitignore
diff --git a/...nager/editor/emacs/doom-emacs/autoload.el → ...nager/editor/emacs/doom-emacs/autoload.el b/...nager/editor/emacs/doom-emacs/autoload.el → ...nager/editor/emacs/doom-emacs/autoload.el
diff --git a/...manager/editor/emacs/doom-emacs/config.el → ...manager/editor/emacs/doom-emacs/config.el b/...manager/editor/emacs/doom-emacs/config.el → ...manager/editor/emacs/doom-emacs/config.el
diff --git a/home-manager/editor/emacs/doom-emacs/init.el → ...e-manager/editor/emacs/doom-emacs/init.el b/home-manager/editor/emacs/doom-emacs/init.el → ...e-manager/editor/emacs/doom-emacs/init.el
diff --git a/...nager/editor/emacs/doom-emacs/packages.el → ...nager/editor/emacs/doom-emacs/packages.el b/...nager/editor/emacs/doom-emacs/packages.el → ...nager/editor/emacs/doom-emacs/packages.el
diff --git a/.../emacs/doom-emacs/snippets/nix-mode/shell → .../emacs/doom-emacs/snippets/nix-mode/shell b/.../emacs/doom-emacs/snippets/nix-mode/shell → .../emacs/doom-emacs/snippets/nix-mode/shell
diff --git a/home-manager/editor/helix.nix → modules/home-manager/editor/helix.nix b/home-manager/editor/helix.nix → modules/home-manager/editor/helix.nix
diff --git a/home-manager/editor/jetbrains.nix → modules/home-manager/editor/jetbrains.nix b/home-manager/editor/jetbrains.nix → modules/home-manager/editor/jetbrains.nix
diff --git a/home-manager/editor/neovim.nix → modules/home-manager/editor/neovim.nix b/home-manager/editor/neovim.nix → modules/home-manager/editor/neovim.nix
diff --git a/home-manager/meta/default.nix → modules/home-manager/meta/default.nix b/home-manager/meta/default.nix → modules/home-manager/meta/default.nix
diff --git a/home-manager/meta/diff.nix → modules/home-manager/meta/diff.nix b/home-manager/meta/diff.nix → modules/home-manager/meta/diff.nix
diff --git a/...manager/meta/home-manager-auto-expire.nix → ...manager/meta/home-manager-auto-expire.nix b/...manager/meta/home-manager-auto-expire.nix → ...manager/meta/home-manager-auto-expire.nix
diff --git a/home-manager/nix/default.nix → modules/home-manager/nix/default.nix b/home-manager/nix/default.nix → modules/home-manager/nix/default.nix
diff --git a/home-manager/nix/nixpkgs-config.nix → modules/home-manager/nix/nixpkgs-config.nix b/home-manager/nix/nixpkgs-config.nix → modules/home-manager/nix/nixpkgs-config.nix
diff --git a/nix-darwin/cli.nix → modules/nix-darwin/cli.nix b/nix-darwin/cli.nix → modules/nix-darwin/cli.nix
diff --git a/nix-darwin/default.nix → modules/nix-darwin/default.nix b/nix-darwin/default.nix → modules/nix-darwin/default.nix
@@ -2,13 +2,13 @@
 
 {
   imports = [
-    ../modules
+    ../shared
     ./cli.nix
     ./home.nix
     ./homebrew.nix
     ./nix
     ./system.nix
   ];
 
-  nixpkgs.overlays = [ (import ../overlays { inherit flake; }) ];
+  nixpkgs.overlays = [ (import ../../overlays { inherit flake; }) ];
 }
diff --git a/nix-darwin/home.nix → modules/nix-darwin/home.nix b/nix-darwin/home.nix → modules/nix-darwin/home.nix
diff --git a/nix-darwin/homebrew.nix → modules/nix-darwin/homebrew.nix b/nix-darwin/homebrew.nix → modules/nix-darwin/homebrew.nix
diff --git a/nix-darwin/nix/default.nix → modules/nix-darwin/nix/default.nix b/nix-darwin/nix/default.nix → modules/nix-darwin/nix/default.nix
diff --git a/nix-darwin/nix/linux-builder.nix → modules/nix-darwin/nix/linux-builder.nix b/nix-darwin/nix/linux-builder.nix → modules/nix-darwin/nix/linux-builder.nix
diff --git a/nix-darwin/system.nix → modules/nix-darwin/system.nix b/nix-darwin/system.nix → modules/nix-darwin/system.nix
diff --git a/nixos/default.nix → modules/nixos/default.nix b/nixos/default.nix → 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 → modules/nixos/desktop/audio.nix b/nixos/desktop/audio.nix → modules/nixos/desktop/audio.nix
diff --git a/nixos/desktop/default.nix → modules/nixos/desktop/default.nix b/nixos/desktop/default.nix → modules/nixos/desktop/default.nix
diff --git a/nixos/desktop/fonts.nix → modules/nixos/desktop/fonts.nix b/nixos/desktop/fonts.nix → modules/nixos/desktop/fonts.nix
diff --git a/nixos/desktop/greetd.nix → modules/nixos/desktop/greetd.nix b/nixos/desktop/greetd.nix → modules/nixos/desktop/greetd.nix
diff --git a/nixos/desktop/locale.nix → modules/nixos/desktop/locale.nix b/nixos/desktop/locale.nix → modules/nixos/desktop/locale.nix
diff --git a/nixos/desktop/tailscale.nix → modules/nixos/desktop/tailscale.nix b/nixos/desktop/tailscale.nix → modules/nixos/desktop/tailscale.nix
diff --git a/nixos/desktop/wayland.nix → modules/nixos/desktop/wayland.nix b/nixos/desktop/wayland.nix → modules/nixos/desktop/wayland.nix
diff --git a/nixos/desktop/xserver.nix → modules/nixos/desktop/xserver.nix b/nixos/desktop/xserver.nix → modules/nixos/desktop/xserver.nix
diff --git a/nixos/dev/default.nix → modules/nixos/dev/default.nix b/nixos/dev/default.nix → modules/nixos/dev/default.nix
diff --git a/nixos/dev/virtualisation.nix → modules/nixos/dev/virtualisation.nix b/nixos/dev/virtualisation.nix → modules/nixos/dev/virtualisation.nix
diff --git a/nixos/games/default.nix → modules/nixos/games/default.nix b/nixos/games/default.nix → modules/nixos/games/default.nix
diff --git a/nixos/games/osu.nix → modules/nixos/games/osu.nix b/nixos/games/osu.nix → modules/nixos/games/osu.nix
diff --git a/nixos/games/ratbag.nix → modules/nixos/games/ratbag.nix b/nixos/games/ratbag.nix → modules/nixos/games/ratbag.nix
diff --git a/nixos/games/retroarch.nix → modules/nixos/games/retroarch.nix b/nixos/games/retroarch.nix → modules/nixos/games/retroarch.nix
diff --git a/nixos/games/steam.nix → modules/nixos/games/steam.nix b/nixos/games/steam.nix → modules/nixos/games/steam.nix
diff --git a/nixos/home.nix → modules/nixos/home.nix b/nixos/home.nix → modules/nixos/home.nix
diff --git a/nixos/laptop/default.nix → modules/nixos/laptop/default.nix b/nixos/laptop/default.nix → modules/nixos/laptop/default.nix
diff --git a/nixos/laptop/tlp.nix → modules/nixos/laptop/tlp.nix b/nixos/laptop/tlp.nix → modules/nixos/laptop/tlp.nix
diff --git a/nixos/laptop/wireless.nix → modules/nixos/laptop/wireless.nix b/nixos/laptop/wireless.nix → modules/nixos/laptop/wireless.nix
diff --git a/nixos/nix/default.nix → modules/nixos/nix/default.nix b/nixos/nix/default.nix → modules/nixos/nix/default.nix
diff --git a/nixos/nix/diff.nix → modules/nixos/nix/diff.nix b/nixos/nix/diff.nix → modules/nixos/nix/diff.nix
diff --git a/nixos/nix/remote-builders.nix → modules/nixos/nix/remote-builders.nix b/nixos/nix/remote-builders.nix → modules/nixos/nix/remote-builders.nix
diff --git a/nixos/server/default.nix → modules/nixos/server/default.nix b/nixos/server/default.nix → modules/nixos/server/default.nix
diff --git a/nixos/server/duckdns-updater.nix → modules/nixos/server/duckdns-updater.nix b/nixos/server/duckdns-updater.nix → modules/nixos/server/duckdns-updater.nix
diff --git a/nixos/server/iperf3.nix → modules/nixos/server/iperf3.nix b/nixos/server/iperf3.nix → modules/nixos/server/iperf3.nix
diff --git a/nixos/server/jellyfin.nix → modules/nixos/server/jellyfin.nix b/nixos/server/jellyfin.nix → modules/nixos/server/jellyfin.nix
diff --git a/nixos/server/networkd.nix → modules/nixos/server/networkd.nix b/nixos/server/networkd.nix → modules/nixos/server/networkd.nix
diff --git a/nixos/server/plex.nix → modules/nixos/server/plex.nix b/nixos/server/plex.nix → modules/nixos/server/plex.nix
diff --git a/nixos/server/rtorrent.nix → modules/nixos/server/rtorrent.nix b/nixos/server/rtorrent.nix → modules/nixos/server/rtorrent.nix
diff --git a/nixos/server/samba.nix → modules/nixos/server/samba.nix b/nixos/server/samba.nix → modules/nixos/server/samba.nix
diff --git a/nixos/server/ssh.nix → modules/nixos/server/ssh.nix b/nixos/server/ssh.nix → modules/nixos/server/ssh.nix
diff --git a/nixos/server/tailscale.nix → modules/nixos/server/tailscale.nix b/nixos/server/tailscale.nix → modules/nixos/server/tailscale.nix
diff --git a/nixos/server/watchdogd.nix → modules/nixos/server/watchdogd.nix b/nixos/server/watchdogd.nix → modules/nixos/server/watchdogd.nix
diff --git a/nixos/system/binfmt.nix → modules/nixos/system/binfmt.nix b/nixos/system/binfmt.nix → modules/nixos/system/binfmt.nix
diff --git a/nixos/system/btrfs.nix → modules/nixos/system/btrfs.nix b/nixos/system/btrfs.nix → modules/nixos/system/btrfs.nix
diff --git a/nixos/system/cli.nix → modules/nixos/system/cli.nix b/nixos/system/cli.nix → modules/nixos/system/cli.nix
diff --git a/nixos/system/default.nix → modules/nixos/system/default.nix b/nixos/system/default.nix → modules/nixos/system/default.nix
diff --git a/nixos/system/smart.nix → modules/nixos/system/smart.nix b/nixos/system/smart.nix → modules/nixos/system/smart.nix
diff --git a/nixos/system/vm.nix → modules/nixos/system/vm.nix b/nixos/system/vm.nix → modules/nixos/system/vm.nix
diff --git a/modules/default.nix → modules/shared/default.nix b/modules/default.nix → modules/shared/default.nix
diff --git a/modules/device.nix → modules/shared/device.nix b/modules/device.nix → modules/shared/device.nix
diff --git a/modules/main-user.nix → modules/shared/main-user.nix b/modules/main-user.nix → modules/shared/main-user.nix
diff --git a/shared/nix-conf.nix → modules/shared/nix-conf.nix b/shared/nix-conf.nix → modules/shared/nix-conf.nix
diff --git a/shared/substituters.nix → modules/shared/substituters.nix b/shared/substituters.nix → modules/shared/substituters.nix