From 9a8cc63674070bbcc33196f87d3aba1e26a61e0d Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Tue, 20 May 2025 21:52:00 +0200
Subject: [PATCH] :truck: [shared] Added shared config that shared desktop
 config inherits from

---
 flake.nix                                       |   1 -
 hosts/desktop/default.nix                       |   2 +-
 hosts/desktop/home-manager/default.nix          |   2 +-
 hosts/pi4/default.nix                           |   8 ++++----
 hosts/pi4/home-manager/default.nix              |  16 ++++++++--------
 hosts/thinkpad/default.nix                      |   2 +-
 hosts/thinkpad/home-manager/default.nix         |   2 +-
 lib/default.nix                                 |  11 +++++++----
 shared/base/home-manager/default.nix            |   3 +++
 shared/{ => base}/home-manager/ssh.nix          |   9 +++++++--
 shared/base/modules/default.nix                 |   3 +++
 shared/{ => base}/modules/networking.nix        |   0
 shared/{ => desktop}/home-manager/cursors.nix   |   0
 .../home-manager/default-applications.nix       |   0
 shared/{ => desktop}/home-manager/default.nix   |   3 ++-
 .../home-manager/development/default.nix        |   0
 .../home-manager/development/git.nix            |   0
 .../home-manager/development/helix.nix          |   0
 .../home-manager/development/zed.nix            |   0
 shared/{ => desktop}/home-manager/freetube.nix  |   0
 shared/{ => desktop}/home-manager/gpg.nix       |   0
 shared/{ => desktop}/home-manager/gtk.nix       |   0
 .../home-manager/hyprland/binds.nix             |   0
 .../home-manager/hyprland/default.nix           |   0
 .../home-manager/hyprland/hypridle/default.nix  |   0
 .../home-manager/hyprland/hyprlock/default.nix  |   0
 .../home-manager/hyprland/hyprpanel/default.nix |   0
 .../home-manager/hyprland/hyprpaper.nix         |   0
 .../home-manager/hyprland/hyprshot.nix          |   0
 .../home-manager/hyprland/settings.nix          |   0
 shared/{ => desktop}/home-manager/kitty.nix     |   0
 .../home-manager/media/default.nix              |   0
 shared/{ => desktop}/home-manager/media/imv.nix |   0
 shared/{ => desktop}/home-manager/media/mpv.nix |   0
 shared/{ => desktop}/home-manager/nextcloud.nix |   0
 .../home-manager/rofi/catppuccin-mocha.rasi     |   0
 .../{ => desktop}/home-manager/rofi/config.rasi |   0
 .../{ => desktop}/home-manager/rofi/default.nix |   0
 .../{ => desktop}/home-manager/rofi/rofimoji.rc |   0
 .../{ => desktop}/home-manager/shell/btop.nix   |   0
 .../home-manager/shell/cava/cava.png            | Bin
 .../home-manager/shell/cava/default.nix         |   0
 .../home-manager/shell/default.nix              |   0
 shared/{ => desktop}/home-manager/shell/eza.nix |   0
 .../home-manager/shell/fastfetch.nix            |   0
 .../{ => desktop}/home-manager/shell/fish.nix   |   0
 shared/{ => desktop}/home-manager/shell/fzf.nix |   0
 .../home-manager/shell/yazi/default.nix         |   0
 .../{ => desktop}/home-manager/shell/zoxide.nix |   0
 shared/{ => desktop}/home-manager/sioyek.nix    |   0
 shared/{ => desktop}/home-manager/spicetify.nix |   0
 .../{ => desktop}/home-manager/zen/default.nix  |   0
 shared/{ => desktop}/modules/boot.nix           |   0
 shared/{ => desktop}/modules/default.nix        |   4 +++-
 .../modules/development/default.nix             |   0
 .../modules/development/docker.nix              |   0
 .../modules/development/dotnet.nix              |   0
 .../modules/development/formatters.nix          |   0
 .../{ => desktop}/modules/development/nix.nix   |   0
 .../{ => desktop}/modules/development/node.nix  |   0
 .../modules/development/ollama.nix              |   0
 .../{ => desktop}/modules/development/rust.nix  |   0
 shared/{ => desktop}/modules/electron.nix       |   0
 shared/{ => desktop}/modules/fonts.nix          |   0
 shared/{ => desktop}/modules/gaming/default.nix |   0
 shared/{ => desktop}/modules/gaming/steam.nix   |   0
 shared/{ => desktop}/modules/gnome/default.nix  |   0
 shared/{ => desktop}/modules/gnome/nautilus.nix |   0
 shared/{ => desktop}/modules/hardware/audio.nix |   0
 .../{ => desktop}/modules/hardware/default.nix  |   0
 .../modules/hardware/graphics/default.nix       |   0
 .../modules/hardware/graphics/nvidia.nix        |   0
 .../{ => desktop}/modules/hardware/keyboard.nix |   0
 .../{ => desktop}/modules/hyprland/default.nix  |   0
 shared/{ => desktop}/modules/kdeconnect.nix     |   0
 shared/{ => desktop}/modules/locale.nix         |   0
 shared/{ => desktop}/modules/mail.nix           |   0
 shared/{ => desktop}/modules/media.nix          |   0
 shared/{ => desktop}/modules/nix-helper.nix     |   0
 shared/{ => desktop}/modules/nixos.nix          |   0
 shared/{ => desktop}/modules/office.nix         |   0
 shared/{ => desktop}/modules/qt.nix             |   0
 shared/{ => desktop}/modules/sddm.nix           |   0
 .../{ => desktop}/modules/security/default.nix  |   0
 shared/{ => desktop}/modules/security/sops.nix  |   0
 shared/{ => desktop}/modules/security/ssh.nix   |   0
 .../{ => desktop}/modules/security/yubikey.nix  |   0
 shared/{ => desktop}/modules/shell.nix          |   0
 shared/{ => desktop}/modules/social.nix         |   0
 shared/{ => desktop}/modules/users.nix          |   0
 shared/{ => desktop}/modules/xdg.nix            |   0
 shared/{ => desktop}/modules/xserver.nix        |   0
 92 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 shared/base/home-manager/default.nix
 rename shared/{ => base}/home-manager/ssh.nix (78%)
 create mode 100644 shared/base/modules/default.nix
 rename shared/{ => base}/modules/networking.nix (100%)
 rename shared/{ => desktop}/home-manager/cursors.nix (100%)
 rename shared/{ => desktop}/home-manager/default-applications.nix (100%)
 rename shared/{ => desktop}/home-manager/default.nix (95%)
 rename shared/{ => desktop}/home-manager/development/default.nix (100%)
 rename shared/{ => desktop}/home-manager/development/git.nix (100%)
 rename shared/{ => desktop}/home-manager/development/helix.nix (100%)
 rename shared/{ => desktop}/home-manager/development/zed.nix (100%)
 rename shared/{ => desktop}/home-manager/freetube.nix (100%)
 rename shared/{ => desktop}/home-manager/gpg.nix (100%)
 rename shared/{ => desktop}/home-manager/gtk.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/binds.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/default.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/hypridle/default.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/hyprlock/default.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/hyprpanel/default.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/hyprpaper.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/hyprshot.nix (100%)
 rename shared/{ => desktop}/home-manager/hyprland/settings.nix (100%)
 rename shared/{ => desktop}/home-manager/kitty.nix (100%)
 rename shared/{ => desktop}/home-manager/media/default.nix (100%)
 rename shared/{ => desktop}/home-manager/media/imv.nix (100%)
 rename shared/{ => desktop}/home-manager/media/mpv.nix (100%)
 rename shared/{ => desktop}/home-manager/nextcloud.nix (100%)
 rename shared/{ => desktop}/home-manager/rofi/catppuccin-mocha.rasi (100%)
 rename shared/{ => desktop}/home-manager/rofi/config.rasi (100%)
 rename shared/{ => desktop}/home-manager/rofi/default.nix (100%)
 rename shared/{ => desktop}/home-manager/rofi/rofimoji.rc (100%)
 rename shared/{ => desktop}/home-manager/shell/btop.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/cava/cava.png (100%)
 rename shared/{ => desktop}/home-manager/shell/cava/default.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/default.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/eza.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/fastfetch.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/fish.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/fzf.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/yazi/default.nix (100%)
 rename shared/{ => desktop}/home-manager/shell/zoxide.nix (100%)
 rename shared/{ => desktop}/home-manager/sioyek.nix (100%)
 rename shared/{ => desktop}/home-manager/spicetify.nix (100%)
 rename shared/{ => desktop}/home-manager/zen/default.nix (100%)
 rename shared/{ => desktop}/modules/boot.nix (100%)
 rename shared/{ => desktop}/modules/default.nix (87%)
 rename shared/{ => desktop}/modules/development/default.nix (100%)
 rename shared/{ => desktop}/modules/development/docker.nix (100%)
 rename shared/{ => desktop}/modules/development/dotnet.nix (100%)
 rename shared/{ => desktop}/modules/development/formatters.nix (100%)
 rename shared/{ => desktop}/modules/development/nix.nix (100%)
 rename shared/{ => desktop}/modules/development/node.nix (100%)
 rename shared/{ => desktop}/modules/development/ollama.nix (100%)
 rename shared/{ => desktop}/modules/development/rust.nix (100%)
 rename shared/{ => desktop}/modules/electron.nix (100%)
 rename shared/{ => desktop}/modules/fonts.nix (100%)
 rename shared/{ => desktop}/modules/gaming/default.nix (100%)
 rename shared/{ => desktop}/modules/gaming/steam.nix (100%)
 rename shared/{ => desktop}/modules/gnome/default.nix (100%)
 rename shared/{ => desktop}/modules/gnome/nautilus.nix (100%)
 rename shared/{ => desktop}/modules/hardware/audio.nix (100%)
 rename shared/{ => desktop}/modules/hardware/default.nix (100%)
 rename shared/{ => desktop}/modules/hardware/graphics/default.nix (100%)
 rename shared/{ => desktop}/modules/hardware/graphics/nvidia.nix (100%)
 rename shared/{ => desktop}/modules/hardware/keyboard.nix (100%)
 rename shared/{ => desktop}/modules/hyprland/default.nix (100%)
 rename shared/{ => desktop}/modules/kdeconnect.nix (100%)
 rename shared/{ => desktop}/modules/locale.nix (100%)
 rename shared/{ => desktop}/modules/mail.nix (100%)
 rename shared/{ => desktop}/modules/media.nix (100%)
 rename shared/{ => desktop}/modules/nix-helper.nix (100%)
 rename shared/{ => desktop}/modules/nixos.nix (100%)
 rename shared/{ => desktop}/modules/office.nix (100%)
 rename shared/{ => desktop}/modules/qt.nix (100%)
 rename shared/{ => desktop}/modules/sddm.nix (100%)
 rename shared/{ => desktop}/modules/security/default.nix (100%)
 rename shared/{ => desktop}/modules/security/sops.nix (100%)
 rename shared/{ => desktop}/modules/security/ssh.nix (100%)
 rename shared/{ => desktop}/modules/security/yubikey.nix (100%)
 rename shared/{ => desktop}/modules/shell.nix (100%)
 rename shared/{ => desktop}/modules/social.nix (100%)
 rename shared/{ => desktop}/modules/users.nix (100%)
 rename shared/{ => desktop}/modules/xdg.nix (100%)
 rename shared/{ => desktop}/modules/xserver.nix (100%)

diff --git a/flake.nix b/flake.nix
index 70cfc9e..f17a0cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,6 @@
           wayland.enable = false;
           ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARDv5nRlfPDXdV+Db4FaqeSJZ3/3MO0frYGzuVeqYAl";
         }
-        # TODO Homelab config
       ];
 
       defaultAttrs = {
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 14b26f2..0b1372a 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -6,7 +6,7 @@
 
 {
   imports = [
-    (lib.custom.relativeToRoot "shared/modules")
+    (lib.custom.relativeToDesktop "modules")
     ./bluetooth.nix
     ./hardware-configuration.nix
   ];
diff --git a/hosts/desktop/home-manager/default.nix b/hosts/desktop/home-manager/default.nix
index 510a6a6..8a70580 100644
--- a/hosts/desktop/home-manager/default.nix
+++ b/hosts/desktop/home-manager/default.nix
@@ -5,7 +5,7 @@
 
 {
   imports = [
-    (lib.custom.relativeToRoot "shared/home-manager")
+    (lib.custom.relativeToDesktop "home-manager")
     ./hyprpaper.nix
     ./settings.nix
   ];
diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix
index ebe13ed..47535b8 100644
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@@ -7,10 +7,10 @@
 
 {
   imports = with lib.custom; [
-    (relativeToRoot "shared/modules/nix-helper.nix")
-    (relativeToRoot "shared/modules/nixos.nix")
-    (relativeToRoot "shared/modules/shell.nix")
-    (relativeToRoot "shared/modules/security/sops.nix")
+    (relativeToRoot "shared/desktop/modules/nix-helper.nix")
+    (relativeToRoot "shared/desktop/modules/nixos.nix")
+    (relativeToRoot "shared/desktop/modules/shell.nix")
+    (relativeToRoot "shared/desktop/modules/security/sops.nix")
     ./boot.nix
     ./development.nix
     ./hardware.nix
diff --git a/hosts/pi4/home-manager/default.nix b/hosts/pi4/home-manager/default.nix
index cabb995..47866a7 100644
--- a/hosts/pi4/home-manager/default.nix
+++ b/hosts/pi4/home-manager/default.nix
@@ -9,14 +9,14 @@
 {
   imports = [
     inputs.catppuccin.homeModules.catppuccin
-    (lib.custom.relativeToRoot "shared/home-manager/development/git.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/development/helix.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/shell/btop.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/shell/eza.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/shell/fastfetch.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/shell/fish.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/shell/zoxide.nix")
-    (lib.custom.relativeToRoot "shared/home-manager/gpg.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/development/git.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/development/helix.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/btop.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/eza.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fastfetch.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fish.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/zoxide.nix")
+    (lib.custom.relativeToRoot "shared/desktop/home-manager/gpg.nix")
   ];
 
   home.stateVersion = systemConfig.version;
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 48dd47b..2b4698d 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -6,7 +6,7 @@
 
 {
   imports = [
-    (lib.custom.relativeToRoot "shared/modules")
+    (lib.custom.relativeToDesktop "modules")
     ./battery.nix
     ./bluetooth.nix
     ./hardware-configuration.nix
diff --git a/hosts/thinkpad/home-manager/default.nix b/hosts/thinkpad/home-manager/default.nix
index d5b2ba3..6ba4253 100644
--- a/hosts/thinkpad/home-manager/default.nix
+++ b/hosts/thinkpad/home-manager/default.nix
@@ -5,7 +5,7 @@
 
 {
   imports = [
-    (lib.custom.relativeToRoot "shared/home-manager")
+    (lib.custom.relativeToDesktop "home-manager")
     ./hyprland
     ./zen
   ];
diff --git a/lib/default.nix b/lib/default.nix
index 5093e51..d5dbd1b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,16 +1,19 @@
 # FIXME(lib.custom): Add some stuff from hmajid2301/dotfiles/lib/module/default.nix, as simplifies option declaration
 { lib, ... }:
+with builtins;
 
 {
-  getSecret = with lib.strings; filePath: trim (removeSuffix "\n" (builtins.readFile filePath));
+  getSecret = with lib.strings; filePath: trim (removeSuffix "\n" (readFile filePath));
 
   # use path relative to the root of the project
   relativeToRoot = lib.path.append ../.;
+  relativeToBase = lib.path.append ../shared/base;
+  relativeToDesktop = lib.path.append ../shared/desktop;
 
   scanPaths =
     path:
-    builtins.map (f: (path + "/${f}")) (
-      builtins.attrNames (
+    map (f: (path + "/${f}")) (
+      attrNames (
         lib.attrsets.filterAttrs (
           path: _type:
           (_type == "directory") # include directories
@@ -18,7 +21,7 @@
             (path != "default.nix") # ignore default.nix
             && (lib.strings.hasSuffix ".nix" path) # include .nix files
           )
-        ) (builtins.readDir path)
+        ) (readDir path)
       )
     );
 }
diff --git a/shared/base/home-manager/default.nix b/shared/base/home-manager/default.nix
new file mode 100644
index 0000000..cd6e3f1
--- /dev/null
+++ b/shared/base/home-manager/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./ssh.nix ];
+}
diff --git a/shared/home-manager/ssh.nix b/shared/base/home-manager/ssh.nix
similarity index 78%
rename from shared/home-manager/ssh.nix
rename to shared/base/home-manager/ssh.nix
index 500c92d..742b3b3 100644
--- a/shared/home-manager/ssh.nix
+++ b/shared/base/home-manager/ssh.nix
@@ -1,5 +1,10 @@
 # ~/.ssh/config
-{ systemConfig, ... }:
+{
+  systemConfig,
+  systems,
+  common,
+  ...
+}:
 
 {
   programs.ssh = {
@@ -9,7 +14,7 @@
         block = hostname: {
           port = 22;
           user = systemConfig.username;
-          hostname = "${hostname}.dns.martials.no";
+          hostname = "${hostname}.dns.${common.domain}";
         };
       in
       {
diff --git a/shared/base/modules/default.nix b/shared/base/modules/default.nix
new file mode 100644
index 0000000..fbd27be
--- /dev/null
+++ b/shared/base/modules/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./networking.nix ];
+}
diff --git a/shared/modules/networking.nix b/shared/base/modules/networking.nix
similarity index 100%
rename from shared/modules/networking.nix
rename to shared/base/modules/networking.nix
diff --git a/shared/home-manager/cursors.nix b/shared/desktop/home-manager/cursors.nix
similarity index 100%
rename from shared/home-manager/cursors.nix
rename to shared/desktop/home-manager/cursors.nix
diff --git a/shared/home-manager/default-applications.nix b/shared/desktop/home-manager/default-applications.nix
similarity index 100%
rename from shared/home-manager/default-applications.nix
rename to shared/desktop/home-manager/default-applications.nix
diff --git a/shared/home-manager/default.nix b/shared/desktop/home-manager/default.nix
similarity index 95%
rename from shared/home-manager/default.nix
rename to shared/desktop/home-manager/default.nix
index f1b6b23..8377e87 100644
--- a/shared/home-manager/default.nix
+++ b/shared/desktop/home-manager/default.nix
@@ -1,6 +1,7 @@
 {
   inputs,
   outputs,
+  lib,
   common,
   systemConfig,
   ...
@@ -10,6 +11,7 @@ let
 in
 {
   imports = [
+    (lib.custom.relativeToBase "home-manager")
     inputs.catppuccin.homeModules.catppuccin
     ./cursors.nix
     ./default-applications.nix
@@ -25,7 +27,6 @@ in
     ./shell
     ./sioyek.nix
     ./spicetify.nix
-    ./ssh.nix
     ./zen
   ];
 
diff --git a/shared/home-manager/development/default.nix b/shared/desktop/home-manager/development/default.nix
similarity index 100%
rename from shared/home-manager/development/default.nix
rename to shared/desktop/home-manager/development/default.nix
diff --git a/shared/home-manager/development/git.nix b/shared/desktop/home-manager/development/git.nix
similarity index 100%
rename from shared/home-manager/development/git.nix
rename to shared/desktop/home-manager/development/git.nix
diff --git a/shared/home-manager/development/helix.nix b/shared/desktop/home-manager/development/helix.nix
similarity index 100%
rename from shared/home-manager/development/helix.nix
rename to shared/desktop/home-manager/development/helix.nix
diff --git a/shared/home-manager/development/zed.nix b/shared/desktop/home-manager/development/zed.nix
similarity index 100%
rename from shared/home-manager/development/zed.nix
rename to shared/desktop/home-manager/development/zed.nix
diff --git a/shared/home-manager/freetube.nix b/shared/desktop/home-manager/freetube.nix
similarity index 100%
rename from shared/home-manager/freetube.nix
rename to shared/desktop/home-manager/freetube.nix
diff --git a/shared/home-manager/gpg.nix b/shared/desktop/home-manager/gpg.nix
similarity index 100%
rename from shared/home-manager/gpg.nix
rename to shared/desktop/home-manager/gpg.nix
diff --git a/shared/home-manager/gtk.nix b/shared/desktop/home-manager/gtk.nix
similarity index 100%
rename from shared/home-manager/gtk.nix
rename to shared/desktop/home-manager/gtk.nix
diff --git a/shared/home-manager/hyprland/binds.nix b/shared/desktop/home-manager/hyprland/binds.nix
similarity index 100%
rename from shared/home-manager/hyprland/binds.nix
rename to shared/desktop/home-manager/hyprland/binds.nix
diff --git a/shared/home-manager/hyprland/default.nix b/shared/desktop/home-manager/hyprland/default.nix
similarity index 100%
rename from shared/home-manager/hyprland/default.nix
rename to shared/desktop/home-manager/hyprland/default.nix
diff --git a/shared/home-manager/hyprland/hypridle/default.nix b/shared/desktop/home-manager/hyprland/hypridle/default.nix
similarity index 100%
rename from shared/home-manager/hyprland/hypridle/default.nix
rename to shared/desktop/home-manager/hyprland/hypridle/default.nix
diff --git a/shared/home-manager/hyprland/hyprlock/default.nix b/shared/desktop/home-manager/hyprland/hyprlock/default.nix
similarity index 100%
rename from shared/home-manager/hyprland/hyprlock/default.nix
rename to shared/desktop/home-manager/hyprland/hyprlock/default.nix
diff --git a/shared/home-manager/hyprland/hyprpanel/default.nix b/shared/desktop/home-manager/hyprland/hyprpanel/default.nix
similarity index 100%
rename from shared/home-manager/hyprland/hyprpanel/default.nix
rename to shared/desktop/home-manager/hyprland/hyprpanel/default.nix
diff --git a/shared/home-manager/hyprland/hyprpaper.nix b/shared/desktop/home-manager/hyprland/hyprpaper.nix
similarity index 100%
rename from shared/home-manager/hyprland/hyprpaper.nix
rename to shared/desktop/home-manager/hyprland/hyprpaper.nix
diff --git a/shared/home-manager/hyprland/hyprshot.nix b/shared/desktop/home-manager/hyprland/hyprshot.nix
similarity index 100%
rename from shared/home-manager/hyprland/hyprshot.nix
rename to shared/desktop/home-manager/hyprland/hyprshot.nix
diff --git a/shared/home-manager/hyprland/settings.nix b/shared/desktop/home-manager/hyprland/settings.nix
similarity index 100%
rename from shared/home-manager/hyprland/settings.nix
rename to shared/desktop/home-manager/hyprland/settings.nix
diff --git a/shared/home-manager/kitty.nix b/shared/desktop/home-manager/kitty.nix
similarity index 100%
rename from shared/home-manager/kitty.nix
rename to shared/desktop/home-manager/kitty.nix
diff --git a/shared/home-manager/media/default.nix b/shared/desktop/home-manager/media/default.nix
similarity index 100%
rename from shared/home-manager/media/default.nix
rename to shared/desktop/home-manager/media/default.nix
diff --git a/shared/home-manager/media/imv.nix b/shared/desktop/home-manager/media/imv.nix
similarity index 100%
rename from shared/home-manager/media/imv.nix
rename to shared/desktop/home-manager/media/imv.nix
diff --git a/shared/home-manager/media/mpv.nix b/shared/desktop/home-manager/media/mpv.nix
similarity index 100%
rename from shared/home-manager/media/mpv.nix
rename to shared/desktop/home-manager/media/mpv.nix
diff --git a/shared/home-manager/nextcloud.nix b/shared/desktop/home-manager/nextcloud.nix
similarity index 100%
rename from shared/home-manager/nextcloud.nix
rename to shared/desktop/home-manager/nextcloud.nix
diff --git a/shared/home-manager/rofi/catppuccin-mocha.rasi b/shared/desktop/home-manager/rofi/catppuccin-mocha.rasi
similarity index 100%
rename from shared/home-manager/rofi/catppuccin-mocha.rasi
rename to shared/desktop/home-manager/rofi/catppuccin-mocha.rasi
diff --git a/shared/home-manager/rofi/config.rasi b/shared/desktop/home-manager/rofi/config.rasi
similarity index 100%
rename from shared/home-manager/rofi/config.rasi
rename to shared/desktop/home-manager/rofi/config.rasi
diff --git a/shared/home-manager/rofi/default.nix b/shared/desktop/home-manager/rofi/default.nix
similarity index 100%
rename from shared/home-manager/rofi/default.nix
rename to shared/desktop/home-manager/rofi/default.nix
diff --git a/shared/home-manager/rofi/rofimoji.rc b/shared/desktop/home-manager/rofi/rofimoji.rc
similarity index 100%
rename from shared/home-manager/rofi/rofimoji.rc
rename to shared/desktop/home-manager/rofi/rofimoji.rc
diff --git a/shared/home-manager/shell/btop.nix b/shared/desktop/home-manager/shell/btop.nix
similarity index 100%
rename from shared/home-manager/shell/btop.nix
rename to shared/desktop/home-manager/shell/btop.nix
diff --git a/shared/home-manager/shell/cava/cava.png b/shared/desktop/home-manager/shell/cava/cava.png
similarity index 100%
rename from shared/home-manager/shell/cava/cava.png
rename to shared/desktop/home-manager/shell/cava/cava.png
diff --git a/shared/home-manager/shell/cava/default.nix b/shared/desktop/home-manager/shell/cava/default.nix
similarity index 100%
rename from shared/home-manager/shell/cava/default.nix
rename to shared/desktop/home-manager/shell/cava/default.nix
diff --git a/shared/home-manager/shell/default.nix b/shared/desktop/home-manager/shell/default.nix
similarity index 100%
rename from shared/home-manager/shell/default.nix
rename to shared/desktop/home-manager/shell/default.nix
diff --git a/shared/home-manager/shell/eza.nix b/shared/desktop/home-manager/shell/eza.nix
similarity index 100%
rename from shared/home-manager/shell/eza.nix
rename to shared/desktop/home-manager/shell/eza.nix
diff --git a/shared/home-manager/shell/fastfetch.nix b/shared/desktop/home-manager/shell/fastfetch.nix
similarity index 100%
rename from shared/home-manager/shell/fastfetch.nix
rename to shared/desktop/home-manager/shell/fastfetch.nix
diff --git a/shared/home-manager/shell/fish.nix b/shared/desktop/home-manager/shell/fish.nix
similarity index 100%
rename from shared/home-manager/shell/fish.nix
rename to shared/desktop/home-manager/shell/fish.nix
diff --git a/shared/home-manager/shell/fzf.nix b/shared/desktop/home-manager/shell/fzf.nix
similarity index 100%
rename from shared/home-manager/shell/fzf.nix
rename to shared/desktop/home-manager/shell/fzf.nix
diff --git a/shared/home-manager/shell/yazi/default.nix b/shared/desktop/home-manager/shell/yazi/default.nix
similarity index 100%
rename from shared/home-manager/shell/yazi/default.nix
rename to shared/desktop/home-manager/shell/yazi/default.nix
diff --git a/shared/home-manager/shell/zoxide.nix b/shared/desktop/home-manager/shell/zoxide.nix
similarity index 100%
rename from shared/home-manager/shell/zoxide.nix
rename to shared/desktop/home-manager/shell/zoxide.nix
diff --git a/shared/home-manager/sioyek.nix b/shared/desktop/home-manager/sioyek.nix
similarity index 100%
rename from shared/home-manager/sioyek.nix
rename to shared/desktop/home-manager/sioyek.nix
diff --git a/shared/home-manager/spicetify.nix b/shared/desktop/home-manager/spicetify.nix
similarity index 100%
rename from shared/home-manager/spicetify.nix
rename to shared/desktop/home-manager/spicetify.nix
diff --git a/shared/home-manager/zen/default.nix b/shared/desktop/home-manager/zen/default.nix
similarity index 100%
rename from shared/home-manager/zen/default.nix
rename to shared/desktop/home-manager/zen/default.nix
diff --git a/shared/modules/boot.nix b/shared/desktop/modules/boot.nix
similarity index 100%
rename from shared/modules/boot.nix
rename to shared/desktop/modules/boot.nix
diff --git a/shared/modules/default.nix b/shared/desktop/modules/default.nix
similarity index 87%
rename from shared/modules/default.nix
rename to shared/desktop/modules/default.nix
index c9f43ed..6322647 100644
--- a/shared/modules/default.nix
+++ b/shared/desktop/modules/default.nix
@@ -1,5 +1,8 @@
+{ lib, ... }:
+
 {
   imports = [
+    (lib.custom.relativeToBase "modules")
     ./boot.nix
     ./development
     ./electron.nix
@@ -11,7 +14,6 @@
     ./locale.nix
     ./mail.nix
     ./media.nix
-    ./networking.nix
     ./nixos.nix
     ./nix-helper.nix
     ./office.nix
diff --git a/shared/modules/development/default.nix b/shared/desktop/modules/development/default.nix
similarity index 100%
rename from shared/modules/development/default.nix
rename to shared/desktop/modules/development/default.nix
diff --git a/shared/modules/development/docker.nix b/shared/desktop/modules/development/docker.nix
similarity index 100%
rename from shared/modules/development/docker.nix
rename to shared/desktop/modules/development/docker.nix
diff --git a/shared/modules/development/dotnet.nix b/shared/desktop/modules/development/dotnet.nix
similarity index 100%
rename from shared/modules/development/dotnet.nix
rename to shared/desktop/modules/development/dotnet.nix
diff --git a/shared/modules/development/formatters.nix b/shared/desktop/modules/development/formatters.nix
similarity index 100%
rename from shared/modules/development/formatters.nix
rename to shared/desktop/modules/development/formatters.nix
diff --git a/shared/modules/development/nix.nix b/shared/desktop/modules/development/nix.nix
similarity index 100%
rename from shared/modules/development/nix.nix
rename to shared/desktop/modules/development/nix.nix
diff --git a/shared/modules/development/node.nix b/shared/desktop/modules/development/node.nix
similarity index 100%
rename from shared/modules/development/node.nix
rename to shared/desktop/modules/development/node.nix
diff --git a/shared/modules/development/ollama.nix b/shared/desktop/modules/development/ollama.nix
similarity index 100%
rename from shared/modules/development/ollama.nix
rename to shared/desktop/modules/development/ollama.nix
diff --git a/shared/modules/development/rust.nix b/shared/desktop/modules/development/rust.nix
similarity index 100%
rename from shared/modules/development/rust.nix
rename to shared/desktop/modules/development/rust.nix
diff --git a/shared/modules/electron.nix b/shared/desktop/modules/electron.nix
similarity index 100%
rename from shared/modules/electron.nix
rename to shared/desktop/modules/electron.nix
diff --git a/shared/modules/fonts.nix b/shared/desktop/modules/fonts.nix
similarity index 100%
rename from shared/modules/fonts.nix
rename to shared/desktop/modules/fonts.nix
diff --git a/shared/modules/gaming/default.nix b/shared/desktop/modules/gaming/default.nix
similarity index 100%
rename from shared/modules/gaming/default.nix
rename to shared/desktop/modules/gaming/default.nix
diff --git a/shared/modules/gaming/steam.nix b/shared/desktop/modules/gaming/steam.nix
similarity index 100%
rename from shared/modules/gaming/steam.nix
rename to shared/desktop/modules/gaming/steam.nix
diff --git a/shared/modules/gnome/default.nix b/shared/desktop/modules/gnome/default.nix
similarity index 100%
rename from shared/modules/gnome/default.nix
rename to shared/desktop/modules/gnome/default.nix
diff --git a/shared/modules/gnome/nautilus.nix b/shared/desktop/modules/gnome/nautilus.nix
similarity index 100%
rename from shared/modules/gnome/nautilus.nix
rename to shared/desktop/modules/gnome/nautilus.nix
diff --git a/shared/modules/hardware/audio.nix b/shared/desktop/modules/hardware/audio.nix
similarity index 100%
rename from shared/modules/hardware/audio.nix
rename to shared/desktop/modules/hardware/audio.nix
diff --git a/shared/modules/hardware/default.nix b/shared/desktop/modules/hardware/default.nix
similarity index 100%
rename from shared/modules/hardware/default.nix
rename to shared/desktop/modules/hardware/default.nix
diff --git a/shared/modules/hardware/graphics/default.nix b/shared/desktop/modules/hardware/graphics/default.nix
similarity index 100%
rename from shared/modules/hardware/graphics/default.nix
rename to shared/desktop/modules/hardware/graphics/default.nix
diff --git a/shared/modules/hardware/graphics/nvidia.nix b/shared/desktop/modules/hardware/graphics/nvidia.nix
similarity index 100%
rename from shared/modules/hardware/graphics/nvidia.nix
rename to shared/desktop/modules/hardware/graphics/nvidia.nix
diff --git a/shared/modules/hardware/keyboard.nix b/shared/desktop/modules/hardware/keyboard.nix
similarity index 100%
rename from shared/modules/hardware/keyboard.nix
rename to shared/desktop/modules/hardware/keyboard.nix
diff --git a/shared/modules/hyprland/default.nix b/shared/desktop/modules/hyprland/default.nix
similarity index 100%
rename from shared/modules/hyprland/default.nix
rename to shared/desktop/modules/hyprland/default.nix
diff --git a/shared/modules/kdeconnect.nix b/shared/desktop/modules/kdeconnect.nix
similarity index 100%
rename from shared/modules/kdeconnect.nix
rename to shared/desktop/modules/kdeconnect.nix
diff --git a/shared/modules/locale.nix b/shared/desktop/modules/locale.nix
similarity index 100%
rename from shared/modules/locale.nix
rename to shared/desktop/modules/locale.nix
diff --git a/shared/modules/mail.nix b/shared/desktop/modules/mail.nix
similarity index 100%
rename from shared/modules/mail.nix
rename to shared/desktop/modules/mail.nix
diff --git a/shared/modules/media.nix b/shared/desktop/modules/media.nix
similarity index 100%
rename from shared/modules/media.nix
rename to shared/desktop/modules/media.nix
diff --git a/shared/modules/nix-helper.nix b/shared/desktop/modules/nix-helper.nix
similarity index 100%
rename from shared/modules/nix-helper.nix
rename to shared/desktop/modules/nix-helper.nix
diff --git a/shared/modules/nixos.nix b/shared/desktop/modules/nixos.nix
similarity index 100%
rename from shared/modules/nixos.nix
rename to shared/desktop/modules/nixos.nix
diff --git a/shared/modules/office.nix b/shared/desktop/modules/office.nix
similarity index 100%
rename from shared/modules/office.nix
rename to shared/desktop/modules/office.nix
diff --git a/shared/modules/qt.nix b/shared/desktop/modules/qt.nix
similarity index 100%
rename from shared/modules/qt.nix
rename to shared/desktop/modules/qt.nix
diff --git a/shared/modules/sddm.nix b/shared/desktop/modules/sddm.nix
similarity index 100%
rename from shared/modules/sddm.nix
rename to shared/desktop/modules/sddm.nix
diff --git a/shared/modules/security/default.nix b/shared/desktop/modules/security/default.nix
similarity index 100%
rename from shared/modules/security/default.nix
rename to shared/desktop/modules/security/default.nix
diff --git a/shared/modules/security/sops.nix b/shared/desktop/modules/security/sops.nix
similarity index 100%
rename from shared/modules/security/sops.nix
rename to shared/desktop/modules/security/sops.nix
diff --git a/shared/modules/security/ssh.nix b/shared/desktop/modules/security/ssh.nix
similarity index 100%
rename from shared/modules/security/ssh.nix
rename to shared/desktop/modules/security/ssh.nix
diff --git a/shared/modules/security/yubikey.nix b/shared/desktop/modules/security/yubikey.nix
similarity index 100%
rename from shared/modules/security/yubikey.nix
rename to shared/desktop/modules/security/yubikey.nix
diff --git a/shared/modules/shell.nix b/shared/desktop/modules/shell.nix
similarity index 100%
rename from shared/modules/shell.nix
rename to shared/desktop/modules/shell.nix
diff --git a/shared/modules/social.nix b/shared/desktop/modules/social.nix
similarity index 100%
rename from shared/modules/social.nix
rename to shared/desktop/modules/social.nix
diff --git a/shared/modules/users.nix b/shared/desktop/modules/users.nix
similarity index 100%
rename from shared/modules/users.nix
rename to shared/desktop/modules/users.nix
diff --git a/shared/modules/xdg.nix b/shared/desktop/modules/xdg.nix
similarity index 100%
rename from shared/modules/xdg.nix
rename to shared/desktop/modules/xdg.nix
diff --git a/shared/modules/xserver.nix b/shared/desktop/modules/xserver.nix
similarity index 100%
rename from shared/modules/xserver.nix
rename to shared/desktop/modules/xserver.nix