fix: cursor size inconsistent

This commit is contained in:
DACHXY 2025-01-03 16:47:35 +08:00
parent 1307aa78fa
commit 5951b04024
11 changed files with 81 additions and 41 deletions

View file

@ -6,6 +6,7 @@
"exclusive": true,
"passthrough": false,
"position": "top",
"height": 40,
"spacing": 3,
"fixed-center": true,
"ipc": true,

View file

@ -1,8 +1,8 @@
{ pkgs, cursor-size, ... }:
{ pkgs, xcursor-size, ... }:
let
cursorName = "catppuccin-macchiato-lavender-cursors";
themeName = "catppuccin-macchiato-lavender-compact";
cursorSize = pkgs.lib.strings.toInt cursor-size;
cursorSize = pkgs.lib.strings.toInt xcursor-size;
in
{
gtk = {

View file

@ -1,4 +1,9 @@
{ pkgs, lib, inputs, system, terminal }:
{
pkgs,
terminal,
xcursor-size,
...
}:
let
swayncScript = pkgs.pkgs.writeShellScriptBin "swaync-start" ''
XDG_CONFIG_HOME="$HOME/.dummy" # Prevent swaync use default gtk theme
@ -10,6 +15,8 @@ let
dconf write /org/cinnamon/desktop/applications/terminal/exec "''\'${terminal}''\'" &
dconf write /org/cinnamon/desktop/applications/terminal/exec-arg "''\'''\'" &
dconf write /org/gnome/desktop/interface/cursor-size ${xcursor-size} &
uwsm app -- ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
uwsm app -- ${swayncScript}/bin/swaync-start &
dbus-update-activation-environment --systemd --all &
@ -24,4 +31,3 @@ let
'';
in
''${startupScript}/bin/start''

View file

@ -1,14 +1,30 @@
{ pkgs, lib, inputs, system, cursor-size, ... }:
{
pkgs,
lib,
inputs,
system,
hyprcursor-size,
xcursor-size,
...
}:
let
terminal = "ghostty";
startScript = import ./hypr/exec.nix { inherit pkgs lib inputs system terminal; };
startScript = import ./hypr/exec.nix {
inherit
pkgs
lib
inputs
system
terminal
xcursor-size
;
};
mainMod = "SUPER";
window = import ./hypr/window.nix;
windowrule = import ./hypr/windowrule.nix;
input = import ./hypr/input.nix;
plugins = import ./hypr/plugin.nix;
cursorSize = cursor-size;
cursorName = "catppuccin-macchiato-lavender-cursors";
in
{
@ -27,27 +43,33 @@ in
systemd.enable = false;
package = inputs.hyprland.packages.${system}.hyprland;
plugins = (with inputs.hyprland-plugins.packages.${system}; [
xtra-dispatchers
hyprexpo
hyprwinwrap
]) ++ ([
inputs.hyprgrass.packages.${system}.default
]);
plugins =
(with inputs.hyprland-plugins.packages.${system}; [
xtra-dispatchers
hyprexpo
hyprwinwrap
])
++ ([
inputs.hyprgrass.packages.${system}.default
]);
settings = {
bind = import ./hypr/bind.nix { inherit mainMod; };
bindm = import ./hypr/bindm.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix;
plugin = plugins;
exec-once = ''${startScript}'';
env = [
''HYPRCURSOR_THEME, ${cursorName}''
''HYPRCURSOR_SIZE, ${cursorSize}''
''XCURSOR_THEME, ${cursorName}''
''XCURSOR_SIZE, ${cursorSize}''
];
} // window // windowrule // input;
settings =
{
bind = import ./hypr/bind.nix { inherit mainMod; };
bindm = import ./hypr/bindm.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix;
plugin = plugins;
exec-once = ''${startScript}'';
env = [
''HYPRCURSOR_THEME, ${cursorName}''
''HYPRCURSOR_SIZE, ${hyprcursor-size}''
''XCURSOR_THEME, ${cursorName}''
''XCURSOR_SIZE, ${xcursor-size}''
];
}
// window
// windowrule
// input;
};
services.hyprpaper = {