diff --git a/modules/programs/gnome.nix b/modules/programs/gnome.nix index a4f0921..2446a42 100644 --- a/modules/programs/gnome.nix +++ b/modules/programs/gnome.nix @@ -63,6 +63,11 @@ disable-user-extensions = false; enabled-extensions = map (extension: extension.extensionUuid) defaultExtensions; }; + "org/gnome/desktop/interface" = { + cursor-theme = "${config.mods.stylix.cursor.name}"; + cursor-size = config.mods.stylix.cursor.size; + color-scheme = "prefer-dark"; + }; }; }; } diff --git a/modules/programs/gnomeServices.nix b/modules/programs/gnomeServices.nix index 886b9e7..0915e3a 100644 --- a/modules/programs/gnomeServices.nix +++ b/modules/programs/gnomeServices.nix @@ -45,6 +45,13 @@ } // lib.optionalAttrs (options ? home.packages) { services.gnome-keyring.enable = true; + dconf.settings = { + "org/gnome/desktop/interface" = { + cursor-theme = "${config.mods.stylix.cursor.name}"; + cursor-size = config.mods.stylix.cursor.size; + color-scheme = "prefer-dark"; + }; + }; home = { packages = let diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index 5756100..a88e700 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -106,8 +106,6 @@ # should technically be the same, but this is configured instead in order to provide a decent out of the box login experience. environment.etc."greetd/hyprgreet.conf".text = '' - exec-once=gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' - monitor=${config.mods.greetd.monitor},${config.mods.greetd.resolution},0x0,${config.mods.greetd.scale} monitor=,disable @@ -117,15 +115,13 @@ force_no_accel = true } - cursor { - enable_hyprcursor = false - } - misc { disable_splash_rendering = false disable_hyprland_logo = false } + "HYPRCURSOR_THEME,${config.mods.stylix.cursor.name}" + "HYPRCURSOR_SIZE,${toString config.mods.stylix.cursor.size}" env=XCURSOR_THEME,${config.mods.stylix.cursor.name} env=XCURSOR_SIZE,${toString config.mods.stylix.cursor.size} env=QT_QPA_PLATFORMTHEME,qt5ct diff --git a/modules/programs/hyprland/hyprland.nix b/modules/programs/hyprland/hyprland.nix index ab23b34..238dd0e 100644 --- a/modules/programs/hyprland/hyprland.nix +++ b/modules/programs/hyprland/hyprland.nix @@ -298,8 +298,7 @@ in }; cursor = { - # conversion seems to be borked right now, i want a smooth bibata :( - enable_hyprcursor = false; + enable_hyprcursor = true; no_hardware_cursors = lib.mkIf config.mods.gpu.nvidia.enable true; # no_break_fs_vrr = true; }; diff --git a/modules/programs/stylix.nix b/modules/programs/stylix.nix index 6f3ea07..d63f4f8 100644 --- a/modules/programs/stylix.nix +++ b/modules/programs/stylix.nix @@ -50,8 +50,11 @@ }; cursor = lib.mkOption { default = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; + # broken + #package = pkgs.bibata-cursors; + #name = "Bibata-Modern-Classic"; + package = pkgs.catppuccin-cursors.mochaLavender; + name = "catppuccin-mocha-lavender-cursors"; size = 24; }; example = { };