desktop: removed darkman and using gtk with hyprland for dark mode

- darkman was adding additional complexity to the theming
- most graphical applications already relied on gtk anyways
- using the gtk the theme to set the colorscheme makes it more consistent

4 files changed, 8 insertions, 60 deletions

diff --git a/modules/desktop/darkman/default.nix b/modules/desktop/darkman/default.nix
deleted file mode 100644
index a7bf598..0000000
--- a/modules/desktop/darkman/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-# Automatic dark and light mode switching based on time of day
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.desktop.darkman = {
-    package = lib.mkOption {
-      type = lib.types.package;
-      readOnly = true;
-      default = config.services.darkman.package;
-      description = "The darkman package to use.";
-    };
-  };
-
-  config = lib.mkIf config.desktop.enable {
-    services.darkman = {
-      enable = true;
-      settings = {
-        portal = true;
-        lat = 0;
-        lng = 0;
-      };
-    };
-
-    xdg.portal = {
-      enable = true;
-      extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
-      config.common = {
-        default = [ "hyprland" ];
-        "org.freedesktop.impl.portal.Settings" = "darkman";
-      };
-    };
-
-    # Always dark by default
-    systemd.user.services.darkman-set-theme = {
-      Unit = {
-        Description = "Set Darkman to dark on graphical session startup";
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-      };
-
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${lib.getExe config.desktop.darkman.package} set dark";
-      };
-
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 5bd454b..ef39e29 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -6,7 +6,6 @@
 }:
 {
   imports = [
-    ./darkman
     ./rofi
     ./wl-clipboard
     ./xdg
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
index aebdbb9..a57d1e5 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -41,6 +41,7 @@ in
         CLUTTER_BACKEND = "wayland";
         GDK_SCALE = "1";
         QT_SCALE_FACTOR = "1";
+        GTK_THEME = "Adwaita:dark";
 
         AQ_DRM_DEVICES =
           if config.desktop.hardware.gpu.secondaryCard != null then
@@ -179,5 +180,12 @@ in
       gtk.enable = false;
       x11.enable = false;
     };
+
+    home.dconf.settings = lib.mkIf config.desktop.enable {
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        gtk-theme = "Adwaita-dark";
+      };
+    };
   };
 }
diff --git a/modules/desktop/xdg/default.nix b/modules/desktop/xdg/default.nix
index d0a8358..c6ea71f 100644
--- a/modules/desktop/xdg/default.nix
+++ b/modules/desktop/xdg/default.nix
@@ -19,9 +19,5 @@
       };
       xdgOpenUsePortal = true;
     };
-
-    home.sessionVariables = {
-      TERMCMD = lib.mkIf config.terminal.kitty.enable "${lib.getExe config.terminal.kitty.package} --class file-explorer --title 'Yazi'";
-    };
   };
 }