2 files changed, 30 insertions, 6 deletions
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index 560a242..8571621 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -32,6 +32,31 @@
 
   config = {
     fonts.fontconfig.enable = true;
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
+      cursorTheme = {
+        package = pkgs.catppuccin-cursors.mochaDark;
+        name = "catppuccin-mocha-dark-cursors";
+        size = 24;
+      };
+
+      theme = {
+        package = (
+          pkgs.catppuccin-gtk.override {
+            accents = [
+              "blue"
+              "pink"
+            ];
+
+            variant = "mocha";
+          }
+        );
+
+        name = "catppuccin-mocha-${config.desktop.accent}-standard";
+      };
+    };
+
     home = {
       file."Pictures/wallpaper.jpg" = {
         enable = (config.desktop.windowManager != null);
diff --git a/modules/user/desktop/window-managers/sway.nix b/modules/user/desktop/window-managers/sway.nix
index 5b82ff2..14e81cb 100644
--- a/modules/user/desktop/window-managers/sway.nix
+++ b/modules/user/desktop/window-managers/sway.nix
@@ -11,7 +11,6 @@
     desktop.components.waybar.enable = lib.mkDefault (config.desktop.windowManager == "sway");
     home.packages = with pkgs; [
       grim
-      rose-pine-cursor
       slurp
     ];
 
@@ -52,7 +51,6 @@
                 blue = "#89b4fa";
                 flamingo = "#f2cdcd";
                 indicator = if (config.desktop.accent == "pink") then flamingo else teal;
-                nothing = "#00000000";
                 pink = "#f5c2e7";
                 red = "#f38ba8";
                 surface1 = "#45475a";
@@ -71,16 +69,16 @@
                 focusedInactive = {
                   background = "${surface1}";
                   border = "${surface1}";
-                  childBorder = "${nothing}";
-                  indicator = "${nothing}";
+                  childBorder = "${surface1}";
+                  indicator = "${surface1}";
                   text = "${text}";
                 };
 
                 unfocused = {
                   background = "${base}";
                   border = "${base}";
-                  childBorder = "${nothing}";
-                  indicator = "${nothing}";
+                  childBorder = "${base}";
+                  indicator = "${base}";
                   text = "${text}";
                 };
 
@@ -195,6 +193,7 @@
               };
             };
 
+            seat.seat0.xcursor_theme = "catppuccin-mocha-dark-cursors";
             window.titlebar = false;
             workspaceOutputAssign = [
               {