From 2ff87c84041abd82f5f0aa106f11319ac84884b8 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 28 May 2025 10:30:35 +0200
Subject: [PATCH] Remove the deUtils namespace

---
 modules/home/brightnessctl.nix                    | 13 +++++++++++++
 modules/home/{de-utils => }/cliphist.nix          |  6 +++---
 modules/home/de-utils/brightnessctl.nix           | 13 -------------
 modules/home/de/hyprland/default.nix              |  2 +-
 modules/home/de/hyprland/keybinds.nix             |  2 +-
 modules/home/{de-utils => }/gammastep.nix         |  4 ++--
 modules/home/{de-utils => }/hypridle.nix          |  8 ++++----
 modules/home/{de-utils => }/hyprlock.nix          |  4 ++--
 modules/home/{de-utils => }/hyprpaper.nix         |  4 ++--
 modules/home/{de-utils => }/rofi/config.rasi      |  0
 modules/home/{de-utils => }/rofi/dark-theme.rasi  |  0
 modules/home/{de-utils => }/rofi/default.nix      |  4 ++--
 modules/home/{de-utils => }/rofi/light-theme.rasi |  0
 modules/home/{de-utils => }/waybar.nix            |  4 ++--
 users/seb/@fern/home.nix                          |  2 +-
 15 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 modules/home/brightnessctl.nix
 rename modules/home/{de-utils => }/cliphist.nix (71%)
 delete mode 100644 modules/home/de-utils/brightnessctl.nix
 rename modules/home/{de-utils => }/gammastep.nix (77%)
 rename modules/home/{de-utils => }/hypridle.nix (71%)
 rename modules/home/{de-utils => }/hyprlock.nix (87%)
 rename modules/home/{de-utils => }/hyprpaper.nix (59%)
 rename modules/home/{de-utils => }/rofi/config.rasi (100%)
 rename modules/home/{de-utils => }/rofi/dark-theme.rasi (100%)
 rename modules/home/{de-utils => }/rofi/default.nix (74%)
 rename modules/home/{de-utils => }/rofi/light-theme.rasi (100%)
 rename modules/home/{de-utils => }/waybar.nix (94%)

diff --git a/modules/home/brightnessctl.nix b/modules/home/brightnessctl.nix
new file mode 100644
index 0000000..d1b6ac4
--- /dev/null
+++ b/modules/home/brightnessctl.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  options.custom.programs.brightnessctl.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.custom.programs.brightnessctl.enable {
+    home.packages = [ pkgs.brightnessctl ];
+  };
+}
diff --git a/modules/home/de-utils/cliphist.nix b/modules/home/cliphist.nix
similarity index 71%
rename from modules/home/de-utils/cliphist.nix
rename to modules/home/cliphist.nix
index 0cf0e44..b609b83 100644
--- a/modules/home/de-utils/cliphist.nix
+++ b/modules/home/cliphist.nix
@@ -5,12 +5,12 @@
   ...
 }:
 {
-  options.custom.deUtils.services.cliphist.enable = lib.mkEnableOption "";
+  options.custom.services.cliphist.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.deUtils.services.cliphist.enable {
+  config = lib.mkIf config.custom.services.cliphist.enable {
     assertions = [
       {
-        assertion = config.custom.deUtils.programs.rofi.enable;
+        assertion = config.custom.programs.rofi.enable;
         message = "cliphist requires rofi";
       }
     ];
diff --git a/modules/home/de-utils/brightnessctl.nix b/modules/home/de-utils/brightnessctl.nix
deleted file mode 100644
index d4421b3..0000000
--- a/modules/home/de-utils/brightnessctl.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  options.custom.deUtils.programs.brightnessctl.enable = lib.mkEnableOption "";
-
-  config = lib.mkIf config.custom.deUtils.programs.brightnessctl.enable {
-    home.packages = [ pkgs.brightnessctl ];
-  };
-}
diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix
index 3053c15..242b163 100644
--- a/modules/home/de/hyprland/default.nix
+++ b/modules/home/de/hyprland/default.nix
@@ -21,7 +21,7 @@
       pkgs.grimblast
     ];
 
-    custom.deUtils = {
+    custom = {
       services = {
         hyprpaper.enable = true;
         hypridle.enable = true;
diff --git a/modules/home/de/hyprland/keybinds.nix b/modules/home/de/hyprland/keybinds.nix
index 9d98ef5..79758c2 100644
--- a/modules/home/de/hyprland/keybinds.nix
+++ b/modules/home/de/hyprland/keybinds.nix
@@ -83,7 +83,7 @@
       bindel = SUPER ALT, down, exec, $volume-down
       bindl = SUPER ALT, M, exec, $mute-mic
 
-      ${lib.optionalString config.custom.deUtils.programs.brightnessctl.enable ''
+      ${lib.optionalString config.custom.programs.brightnessctl.enable ''
         # Adjust brightness
         bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2%
         bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%-
diff --git a/modules/home/de-utils/gammastep.nix b/modules/home/gammastep.nix
similarity index 77%
rename from modules/home/de-utils/gammastep.nix
rename to modules/home/gammastep.nix
index 12728d5..e8c1a09 100644
--- a/modules/home/de-utils/gammastep.nix
+++ b/modules/home/gammastep.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }@moduleArgs:
 {
-  options.custom.deUtils.services.gammastep.enable = lib.mkEnableOption "";
+  options.custom.services.gammastep.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.deUtils.services.gammastep.enable {
+  config = lib.mkIf config.custom.services.gammastep.enable {
     assertions = [
       {
         assertion =
diff --git a/modules/home/de-utils/hypridle.nix b/modules/home/hypridle.nix
similarity index 71%
rename from modules/home/de-utils/hypridle.nix
rename to modules/home/hypridle.nix
index b267886..73f0386 100644
--- a/modules/home/de-utils/hypridle.nix
+++ b/modules/home/hypridle.nix
@@ -4,21 +4,21 @@
   ...
 }:
 {
-  options.custom.deUtils.services.hypridle.enable = lib.mkEnableOption "";
+  options.custom.services.hypridle.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.deUtils.services.hypridle.enable {
+  config = lib.mkIf config.custom.services.hypridle.enable {
     services.hypridle = {
       enable = true;
 
       settings = {
         general = {
-          lock_cmd = lib.mkIf config.custom.deUtils.programs.hyprlock.enable "pidof hyprlock || hyprlock";
+          lock_cmd = lib.mkIf config.custom.programs.hyprlock.enable "pidof hyprlock || hyprlock";
           before_sleep_cmd = "loginctl lock-session";
           after_sleep_cmd = "hyprctl dispatch dpms on";
         };
 
         listener = [
-          (lib.mkIf config.custom.deUtils.programs.brightnessctl.enable {
+          (lib.mkIf config.custom.programs.brightnessctl.enable {
             timeout = 5 * 60;
             on-timeout = "brightnessctl --save --exponent set 10%";
             on-resume = "brightnessctl --restore";
diff --git a/modules/home/de-utils/hyprlock.nix b/modules/home/hyprlock.nix
similarity index 87%
rename from modules/home/de-utils/hyprlock.nix
rename to modules/home/hyprlock.nix
index 2fcee96..b17a849 100644
--- a/modules/home/de-utils/hyprlock.nix
+++ b/modules/home/hyprlock.nix
@@ -4,10 +4,10 @@
   ...
 }@moduleArgs:
 let
-  cfg = config.custom.deUtils.programs.hyprlock;
+  cfg = config.custom.programs.hyprlock;
 in
 {
-  options.custom.deUtils.programs.hyprlock = {
+  options.custom.programs.hyprlock = {
     enable = lib.mkEnableOption "";
     fprintAuth = lib.mkEnableOption "" // {
       default = moduleArgs.osConfig.services.fprintd.enable or false;
diff --git a/modules/home/de-utils/hyprpaper.nix b/modules/home/hyprpaper.nix
similarity index 59%
rename from modules/home/de-utils/hyprpaper.nix
rename to modules/home/hyprpaper.nix
index 2e79035..400f4ae 100644
--- a/modules/home/de-utils/hyprpaper.nix
+++ b/modules/home/hyprpaper.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.deUtils.services.hyprpaper.enable = lib.mkEnableOption "";
+  options.custom.services.hyprpaper.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.deUtils.services.hyprpaper.enable {
+  config = lib.mkIf config.custom.services.hyprpaper.enable {
     services.hyprpaper = {
       enable = true;
       settings = {
diff --git a/modules/home/de-utils/rofi/config.rasi b/modules/home/rofi/config.rasi
similarity index 100%
rename from modules/home/de-utils/rofi/config.rasi
rename to modules/home/rofi/config.rasi
diff --git a/modules/home/de-utils/rofi/dark-theme.rasi b/modules/home/rofi/dark-theme.rasi
similarity index 100%
rename from modules/home/de-utils/rofi/dark-theme.rasi
rename to modules/home/rofi/dark-theme.rasi
diff --git a/modules/home/de-utils/rofi/default.nix b/modules/home/rofi/default.nix
similarity index 74%
rename from modules/home/de-utils/rofi/default.nix
rename to modules/home/rofi/default.nix
index 8ad9759..50966b2 100644
--- a/modules/home/de-utils/rofi/default.nix
+++ b/modules/home/rofi/default.nix
@@ -5,9 +5,9 @@
   ...
 }:
 {
-  options.custom.deUtils.programs.rofi.enable = lib.mkEnableOption "";
+  options.custom.programs.rofi.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.deUtils.programs.rofi.enable {
+  config = lib.mkIf config.custom.programs.rofi.enable {
     home.packages = [ pkgs.rofi-wayland ];
 
     xdg.configFile."rofi/config.rasi".source =
diff --git a/modules/home/de-utils/rofi/light-theme.rasi b/modules/home/rofi/light-theme.rasi
similarity index 100%
rename from modules/home/de-utils/rofi/light-theme.rasi
rename to modules/home/rofi/light-theme.rasi
diff --git a/modules/home/de-utils/waybar.nix b/modules/home/waybar.nix
similarity index 94%
rename from modules/home/de-utils/waybar.nix
rename to modules/home/waybar.nix
index 65b5a50..c0f83f4 100644
--- a/modules/home/de-utils/waybar.nix
+++ b/modules/home/waybar.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.deUtils.services.waybar.enable = lib.mkEnableOption "";
+  options.custom.services.waybar.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.deUtils.services.waybar.enable {
+  config = lib.mkIf config.custom.services.waybar.enable {
     programs.waybar = {
       enable = true;
       systemd.enable = true;
diff --git a/users/seb/@fern/home.nix b/users/seb/@fern/home.nix
index fefc7ad..03f55ae 100644
--- a/users/seb/@fern/home.nix
+++ b/users/seb/@fern/home.nix
@@ -5,7 +5,7 @@ _: {
 
   custom = {
     theme = "light";
-    deUtils.programs.brightnessctl.enable = true;
+    programs.brightnessctl.enable = true;
   };
 
   wayland.windowManager.hyprland.settings.monitor = [