From e87961276abe745005be620d9358fef47110e5f2 Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Sat, 7 Mar 2026 18:20:11 +0100
Subject: [PATCH] Rename namespace `de` to `desktop` and `dm` to `login`

---
 modules/home/{de => desktop}/hyprland/classic.nix  | 4 ++--
 modules/home/{de => desktop}/hyprland/noctalia.nix | 4 ++--
 modules/nixos/{de => desktop}/hyprland.nix         | 4 ++--
 modules/nixos/{dm => login}/tuigreet.nix           | 6 +++---
 profiles/workstation.nix                           | 4 ++--
 users/seb/home.nix                                 | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename modules/home/{de => desktop}/hyprland/classic.nix (89%)
 rename modules/home/{de => desktop}/hyprland/noctalia.nix (86%)
 rename modules/nixos/{de => desktop}/hyprland.nix (65%)
 rename modules/nixos/{dm => login}/tuigreet.nix (89%)

diff --git a/modules/home/de/hyprland/classic.nix b/modules/home/desktop/hyprland/classic.nix
similarity index 89%
rename from modules/home/de/hyprland/classic.nix
rename to modules/home/desktop/hyprland/classic.nix
index c750d2b..1de96f5 100644
--- a/modules/home/de/hyprland/classic.nix
+++ b/modules/home/desktop/hyprland/classic.nix
@@ -5,9 +5,9 @@
   ...
 }:
 {
-  options.custom.de.hyprland.classic.enable = lib.mkEnableOption "";
+  options.custom.desktop.hyprland.classic.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.de.hyprland.classic.enable {
+  config = lib.mkIf config.custom.desktop.hyprland.classic.enable {
     custom = {
       programs = {
         hyprland.enable = true;
diff --git a/modules/home/de/hyprland/noctalia.nix b/modules/home/desktop/hyprland/noctalia.nix
similarity index 86%
rename from modules/home/de/hyprland/noctalia.nix
rename to modules/home/desktop/hyprland/noctalia.nix
index fbda85d..1d47a09 100644
--- a/modules/home/de/hyprland/noctalia.nix
+++ b/modules/home/desktop/hyprland/noctalia.nix
@@ -5,9 +5,9 @@
   ...
 }:
 {
-  options.custom.de.hyprland.noctalia.enable = lib.mkEnableOption "";
+  options.custom.desktop.hyprland.noctalia.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.de.hyprland.noctalia.enable {
+  config = lib.mkIf config.custom.desktop.hyprland.noctalia.enable {
     custom = {
       programs = {
         hyprland.enable = true;
diff --git a/modules/nixos/de/hyprland.nix b/modules/nixos/desktop/hyprland.nix
similarity index 65%
rename from modules/nixos/de/hyprland.nix
rename to modules/nixos/desktop/hyprland.nix
index 062a3e8..b73249f 100644
--- a/modules/nixos/de/hyprland.nix
+++ b/modules/nixos/desktop/hyprland.nix
@@ -5,9 +5,9 @@
   ...
 }:
 {
-  options.custom.de.hyprland.enable = lib.mkEnableOption "";
+  options.custom.desktop.hyprland.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.de.hyprland.enable {
+  config = lib.mkIf config.custom.desktop.hyprland.enable {
     programs.hyprland = {
       enable = true;
       package = pkgs-unstable.hyprland;
diff --git a/modules/nixos/dm/tuigreet.nix b/modules/nixos/login/tuigreet.nix
similarity index 89%
rename from modules/nixos/dm/tuigreet.nix
rename to modules/nixos/login/tuigreet.nix
index 1979915..b36a503 100644
--- a/modules/nixos/dm/tuigreet.nix
+++ b/modules/nixos/login/tuigreet.nix
@@ -5,10 +5,10 @@
   ...
 }:
 let
-  cfg = config.custom.dm.tuigreet;
+  cfg = config.custom.login.tuigreet;
 in
 {
-  options.custom.dm.tuigreet = {
+  options.custom.login.tuigreet = {
     enable = lib.mkEnableOption "";
     autoLogin = lib.mkEnableOption "";
   };
@@ -30,7 +30,7 @@ in
             "--remember-user-session"
             "--sessions '${sessionData}/share/wayland-sessions:${sessionData}/share/xsessions'"
           ];
-        initial_session = lib.mkIf (cfg.autoLogin && config.custom.de.hyprland.enable) {
+        initial_session = lib.mkIf (cfg.autoLogin && config.custom.desktop.hyprland.enable) {
           command = lib.getExe pkgs.hyprland;
           user = "seb";
         };
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index d338f13..f75ec43 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -17,11 +17,11 @@
   custom = {
     networking.overlay.role = "client";
     boot.silent = true;
-    dm.tuigreet = {
+    login.tuigreet = {
       enable = true;
       autoLogin = true;
     };
-    de.hyprland.enable = true;
+    desktop.hyprland.enable = true;
     services = {
       sound.enable = true;
       syncthing.enable = true;
diff --git a/users/seb/home.nix b/users/seb/home.nix
index dbfb930..b0ae7aa 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -19,7 +19,7 @@
   custom = {
     sops.enable = true;
 
-    de.hyprland.noctalia.enable = true;
+    desktop.hyprland.noctalia.enable = true;
 
     programs = {
       shell = {