hyprland: use theme module for colors and cursors

hyprpaper: use default wallpaper from theme module
This commit is contained in:
Aly Raffauf 2024-05-04 21:42:33 -04:00
parent 418daa7173
commit edcde5ae14
3 changed files with 12 additions and 17 deletions

View file

@ -101,7 +101,7 @@
media_prev = "${media} previous"; media_prev = "${media} previous";
# Hyprland desktop utilities # Hyprland desktop utilities
bar = pkgs.waybar + "/bin/waybar -s ${config.xdg.configHome}/waybar/hyprland-style.css"; bar = pkgs.waybar + "/bin/waybar";
launcher = pkgs.fuzzel + "/bin/fuzzel"; launcher = pkgs.fuzzel + "/bin/fuzzel";
notifyd = pkgs.mako + "/bin/mako"; notifyd = pkgs.mako + "/bin/mako";
wallpaperd = pkgs.hyprpaper + "/bin/hyprpaper"; wallpaperd = pkgs.hyprpaper + "/bin/hyprpaper";
@ -129,12 +129,6 @@
screenshot_screen = "${screenshot} -m output -o ${screenshot_folder}"; screenshot_screen = "${screenshot} -m output -o ${screenshot_folder}";
screenshot_region = "${screenshot} -m region -o ${screenshot_folder}"; screenshot_region = "${screenshot} -m region -o ${screenshot_folder}";
# Color, themes, scaling
border_primary = "ca9ee6ee";
border_secondary = "99d1dbee";
border_inactive = "303446aa";
drop_shadow = "1a1a1aee";
cursor_size = "24";
qt_platform_theme = "gtk2"; qt_platform_theme = "gtk2";
gdk_scale = "1.5"; gdk_scale = "1.5";
in '' in ''
@ -162,7 +156,7 @@
env = GDK_SCALE,${gdk_scale} env = GDK_SCALE,${gdk_scale}
# Some default env vars. # Some default env vars.
env = XCURSOR_SIZE,${cursor_size} env = XCURSOR_SIZE,${toString config.alyraffauf.desktop.theme.cursorTheme.size}
env = QT_QPA_PLATFORMTHEME,${qt_platform_theme} env = QT_QPA_PLATFORMTHEME,${qt_platform_theme}
# Execute necessary apps # Execute necessary apps
@ -202,8 +196,8 @@
gaps_in = 5 gaps_in = 5
gaps_out = 10 gaps_out = 10
border_size = 2 border_size = 2
col.active_border = rgba(${border_secondary}) rgba(${border_primary}) 45deg col.active_border = rgba(${lib.strings.removePrefix "#" config.alyraffauf.desktop.theme.colors.secondary}EE) rgba(${lib.strings.removePrefix "#" config.alyraffauf.desktop.theme.colors.primary}EE) 45deg
col.inactive_border = rgba(${border_inactive}) col.inactive_border = rgba(${lib.strings.removePrefix "#" config.alyraffauf.desktop.theme.colors.inactive}AA)
layout = dwindle layout = dwindle
@ -220,7 +214,7 @@
drop_shadow = yes drop_shadow = yes
shadow_range = 4 shadow_range = 4
shadow_render_power = 3 shadow_render_power = 3
col.shadow = rgba(${drop_shadow}) col.shadow = rgba(${lib.strings.removePrefix "#" config.alyraffauf.desktop.theme.colors.shadow}EE)
dim_special = 0.5 dim_special = 0.5

View file

@ -15,6 +15,12 @@
# Packages that should be installed to the user profile. # Packages that should be installed to the user profile.
home.packages = with pkgs; [hyprpaper]; home.packages = with pkgs; [hyprpaper];
xdg.configFile."hypr/hyprpaper.conf".source = ./hyprpaper.conf; xdg.configFile."hypr/hyprpaper.conf".text = ''
preload = ${config.alyraffauf.desktop.theme.wallpaper}
wallpaper = ,${config.alyraffauf.desktop.theme.wallpaper}
splash = false
'';
}; };
} }

View file

@ -1,5 +0,0 @@
preload = ~/.local/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg
wallpaper = ,~/.local/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg
splash = false