feat(elcafe): add new server configuration

users/modules/desktop/default.nix

@@ -13,7 +13,6 @@ in {
     ./kdeconnect.nix
     ./kitty.nix
     ./obs.nix
-    ./qt.nix
     ./rofi
     ./spotify.nix
     ./swaync.nix
@@ -30,10 +29,10 @@ in {
     kdeconnect.enable = mkDefault cfg.fullDesktop;
     kitty.enable = mkDefault cfg.fullDesktop;
     obs.enable = mkDefault cfg.fullDesktop;
-    qt.enable = mkDefault cfg.fullDesktop;
     rofi.enable = mkDefault cfg.fullDesktop;
     spotify.enable = mkDefault cfg.fullDesktop;
     spotify.spicetify.enable = mkDefault cfg.fullDesktop;
+    theme.enable = mkDefault cfg.fullDesktop;
     wlr-which-key.enable = mkDefault cfg.fullDesktop;
   };
 }

users/modules/desktop/qt.nix

@@ -1,11 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.home.desktop.qt;
-in {
-  options.home.desktop.qt.enable = mkEnableOption "Enable Qt support";
-  config.qt.enable = cfg.enable;
-}

users/modules/desktop/spotify.nix

@@ -6,8 +6,8 @@
   ...
 }:
 with lib; let
+  inherit (pkgs.stdenv.hostPlatform) system;
   cfg = config.home.desktop.spotify;
-  system = pkgs.stdenv.hostPlatform.system;
   spicePkgs = inputs.spicetify.legacyPackages.${system};
 in {
   options.home.desktop.spotify = {

users/modules/desktop/theme.nix

@@ -1,26 +1,33 @@
 {
   pkgs,
   config,
+  lib,
   ...
-}: {
-  gtk = {
-    enable = true;
-    colorScheme = "dark";
-    iconTheme = {
-      name = "Nordzy-icons";
-      package = pkgs.nordzy-icon-theme;
+}:
+with lib; let
+  cfg = config.home.desktop.theme;
+in {
+  options.home.desktop.theme.enable = mkEnableOption "Enable theme options";
+  config = mkIf cfg.enable {
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
+      iconTheme = {
+        name = "Nordzy-icons";
+        package = pkgs.nordzy-icon-theme;
+      };
+      theme = {
+        package = pkgs.nordic;
+        name = "Nordic";
+      };
     };
-    theme = {
-      package = pkgs.nordic;
-      name = "Nordic";
+    home.pointerCursor = {
+      enable = true;
+      gtk.enable = true;
+      hyprcursor.enable = config.home.desktop.hyprland.enable;
+      name = "Nordzy-cursors";
+      package = pkgs.nordzy-cursor-theme;
     };
+    qt.enable = true;
   };
-  home.pointerCursor = {
-    enable = true;
-    gtk.enable = true;
-    hyprcursor.enable = config.home.desktop.hyprland.enable;
-    name = "Nordzy-cursors";
-    package = pkgs.nordzy-cursor-theme;
-  };
-  qt.enable = true;
 }

users/modules/desktop/wlr-which-key.nix

@@ -21,7 +21,7 @@
   # Recursively filter out null values and convert kebab-case keys to snake_case
   filterNulls = value:
     if lib.isAttrs value
-    then lib.mapAttrs' (n: v: lib.nameValuePair (toSnakeCase n) (filterNulls v)) (lib.filterAttrs (n: v: v != null) value)
+    then lib.mapAttrs' (n: v: lib.nameValuePair (toSnakeCase n) (filterNulls v)) (lib.filterAttrs (_: v: v != null) value)
     else if lib.isList value
     then map filterNulls value
     else value;