diff options
4 files changed, 12 insertions, 18 deletions
diff --git a/roles/hyprland/templates/hyprland/autostart.conf.j2 b/roles/hyprland/templates/hyprland/autostart.conf.j2 index 12a7e4db..c8339166 100644 --- a/roles/hyprland/templates/hyprland/autostart.conf.j2 +++ b/roles/hyprland/templates/hyprland/autostart.conf.j2 @@ -1,4 +1,4 @@ exec-once = uwsm-app -- hypridle exec-once = uwsm-app -- mako exec-once = uwsm-app -- waybar -exec-once = uwsm-app -- swaybg -i ~/.config/themes/current/background -m fill +exec-once = uwsm-app -- swaybg -i ~/.config/hyprthemes/current/background -m fill diff --git a/roles/hyprland/templates/hyprland/hyprlock.conf.j2 b/roles/hyprland/templates/hyprland/hyprlock.conf.j2 index 6fe33471..4f893ea8 100644 --- a/roles/hyprland/templates/hyprland/hyprlock.conf.j2 +++ b/roles/hyprland/templates/hyprland/hyprlock.conf.j2 @@ -1,10 +1,6 @@ +source = ~/.config/hyprthemes/current/hyprlock.conf + # Variables -$font = JetBrainsMono Nerd Font -$inner_color = rgba(17, 17, 17, 7.0) -$outer_color = rgba(33ccffee) rgba(00ff99ee) 45deg -$check_color = rgba(00ff99ee) rgba(ff6633ee) 120deg -$fail_color = rgba(ff6633ee) rgba(ff0066ee) 40deg -$font_color = rgb(143, 143, 143) general { hide_cursor = false @@ -22,7 +18,8 @@ animations { background { monitor = - path = /home/$USER/.config/themes/current/background + # path = ~/.config/hyprthemes/current/background + color = $color blur_passes = 3 } @@ -42,7 +39,6 @@ input-field { inner_color = $inner_color outer_color = $outer_color check_color = $check_color - fail_color = $fail_color halign = center valign = center diff --git a/roles/hyprland/templates/hyprland/looknfeel.conf.j2 b/roles/hyprland/templates/hyprland/looknfeel.conf.j2 index bedcb21c..219b4d2f 100644 --- a/roles/hyprland/templates/hyprland/looknfeel.conf.j2 +++ b/roles/hyprland/templates/hyprland/looknfeel.conf.j2 @@ -3,12 +3,13 @@ # Source: https://github.com/basecamp/omarchy/tree/8a37f3dce71b0764e3758cb86478c503a4a8746e/config/hypr/looknfeel.conf # Defaults: https://github.com/basecamp/omarchy/blob/8a37f3dce71b0764e3758cb86478c503a4a8746e/default/hypr/looknfeel.conf +# Load current theme variables +source = ~/.config/hyprthemes/current/hyprland.conf + # Refer to https://wiki.hyprland.org/Configuring/Variables/ # Variables -$activeBorderColor = rgba(33ccffee) rgba(00ff99ee) 45deg -# $activeBorderColor = rgb(64, 208, 255) -$inactiveBorderColor = rgba(595959aa) -# $inactiveBorderColor = rgb(124, 124, 124) +$activeBorderColor = $active +$inactiveBorderColor = $inactive # https://wiki.hyprland.org/Configuring/Variables/#general general { diff --git a/roles/waybar/templates/waybar/style.css.j2 b/roles/waybar/templates/waybar/style.css.j2 index ae633e91..48774e6f 100644 --- a/roles/waybar/templates/waybar/style.css.j2 +++ b/roles/waybar/templates/waybar/style.css.j2 @@ -1,8 +1,5 @@ /* vim: set filetype=css : */ -@define-color activeColor rgb(64, 208, 255); -@define-color inactiveColor rgb(124, 124, 124); -@define-color background rgb(0, 0, 0); -@define-color foreground rgb(124, 124, 124); +@import "{{ ansible_user_dir }}/.config/hyprthemes/current/waybar.css"; * { font-family: 'JetBrainsMono Nerd Font'; @@ -94,7 +91,7 @@ tooltip { #backlight:hover, #pulseaudio:hover, #wireplumber:hover { - color: #FFFFFF; + color: @activeColor; } #battery.charging, #battery.plugged, #battery.full { |