diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index 3b8e5fb..4c0ac1c 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -83,8 +83,8 @@ in GTK_CSD = "0"; GTK_THEME = config.gtk.theme.name; GTK_USE_PORTAL = "1"; - HYPRCURSOR_THEME = config.home.pointerCursor.name; - HYPRCURSOR_SIZE = config.home.pointerCursor.size; + HYPRCURSOR_THEME = config.stylix.cursor.name; + HYPRCURSOR_SIZE = config.stylix.cursor.size; MOZ_ENABLE_WAYLAND = "1"; NIXOS_OZONE_WL = "1"; NIXOS_XDG_OPEN_USE_PORTAL = "1"; @@ -95,8 +95,8 @@ in QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; SDL_VIDEODRIVER = "wayland"; TERMINAL = "${cfg.defaultApps.terminal.pname}"; - XCURSOR_THEME = config.home.pointerCursor.name; - XCURSOR_SIZE = config.home.pointerCursor.size; + XCURSOR_THEME = config.stylix.cursor.name; + XCURSOR_SIZE = config.stylix.cursor.size; XDG_CACHE_HOME = "\${HOME}/.cache"; XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_CURRENT_DESKTOP = "Hyprland"; diff --git a/modules/home/programs/hyprland/theme.nix b/modules/home/programs/hyprland/theme.nix index 9856790..539cff7 100644 --- a/modules/home/programs/hyprland/theme.nix +++ b/modules/home/programs/hyprland/theme.nix @@ -44,14 +44,6 @@ let in { config = mkIf cfg.enable { - home = { - pointerCursor = { - gtk.enable = true; - package = cursorThemePkg; - name = cursorTheme; - size = cursorSize; - }; - }; dconf = { enable = true; diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index 81eac74..92fb737 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -1,11 +1,17 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { stylix = { enable = true; enableReleaseChecks = false; base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; - fonts = lib.mkForce { + cursor = { + name = "macOS"; + size = 24; + package = pkgs.apple-cursor; + }; + + fonts ={ serif = { package = pkgs.dejavu_fonts; name = "DejaVu Serif";