punkfairie/rose-pine-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(home-manager/hyprland): inherit cursor size, unset hyprcursor env vars (#299)

Browse source 
* fix(home-manager): make hyprcursor inherit size

* fix(home-manager): unset hyprcursor env vars in hyprland config

They're already set in `home.sessionVariables`.
Note that you need to launch hyprland from a login
shell in order for the variables to be set, but
I doubt that hyprcursor was being used prior to
this commit since `MyCursor` is invalid

* refactor(home-manager): set `accent(Alpha)` through hyprland nix config

Why not use nix config when it exists
This commit is contained in:
Weathercold 2024-08-07 09:02:01 +08:00 committed by GitHub
parent 19a0f144f0
commit 512306ae58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/home-manager/hyprland.nix
View file

@ -1,9 +1,8 @@
{ config, lib, ... }: { config, lib, ... }:
let let
inherit (config.catppuccin) sources; inherit (config.catppuccin) sources pointerCursor;
cfg = config.wayland.windowManager.hyprland.catppuccin; cfg = config.wayland.windowManager.hyprland.catppuccin;
enable = cfg.enable && config.wayland.windowManager.hyprland.enable; enable = cfg.enable && config.wayland.windowManager.hyprland.enable;
inherit (config.catppuccin) pointerCursor;
in in
{ {
options.wayland.windowManager.hyprland.catppuccin = options.wayland.windowManager.hyprland.catppuccin =
@ -14,25 +13,14 @@ in
config = lib.mkIf enable { config = lib.mkIf enable {
home.sessionVariables = lib.mkIf pointerCursor.enable { home.sessionVariables = lib.mkIf pointerCursor.enable {
HYPRCURSOR_SIZE = "24"; HYPRCURSOR_SIZE = config.home.pointerCursor.size;
HYPRCURSOR_THEME = "catppuccin-${pointerCursor.flavor}-${pointerCursor.accent}-cursors"; HYPRCURSOR_THEME = "catppuccin-${pointerCursor.flavor}-${pointerCursor.accent}-cursors";
}; };
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
source = source = "${sources.hyprland}/themes/${cfg.flavor}.conf";
[ "$accent" = "\$${cfg.accent}";
"${sources.hyprland}/themes/${cfg.flavor}.conf" "$accentAlpha" = "\$${cfg.accent}Alpha";
(builtins.toFile "hyprland-${cfg.accent}-accent.conf" ''
$accent=''$${cfg.accent}
$accentAlpha=''$${cfg.accent}Alpha
'')
]
++ lib.optionals pointerCursor.enable [
(builtins.toFile "hyprland-cursors.conf" ''
env = HYPRCURSOR_THEME,MyCursor
env = HYPRCURSOR_SIZE,24
'')
];
}; };
}; };
} }