summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/hyprtheme/tasks/template-theme.yml2
-rw-r--r--roles/hyprtheme/templates/theme/mako.ini.j23
-rw-r--r--roles/hyprtheme/templates/theme/syshud.css.j23
-rw-r--r--roles/mako/handlers/main.yml5
-rw-r--r--roles/mako/tasks/main.yml4
-rw-r--r--roles/mako/templates/mako/config.j29
6 files changed, 14 insertions, 12 deletions
diff --git a/roles/hyprtheme/tasks/template-theme.yml b/roles/hyprtheme/tasks/template-theme.yml
index 270b63e7..5d04266b 100644
--- a/roles/hyprtheme/tasks/template-theme.yml
+++ b/roles/hyprtheme/tasks/template-theme.yml
@@ -13,7 +13,7 @@
- "waybar.css"
- "clipse.json"
- "tofi.config"
- - "syshud.css"
+ - "mako.ini"
- name: "Template theme files for: {{ hyprtheme_name }}"
ansible.builtin.template:
diff --git a/roles/hyprtheme/templates/theme/mako.ini.j2 b/roles/hyprtheme/templates/theme/mako.ini.j2
new file mode 100644
index 00000000..9c2ea573
--- /dev/null
+++ b/roles/hyprtheme/templates/theme/mako.ini.j2
@@ -0,0 +1,3 @@
+text-color={{ foreground }}
+border-color={{ accent }}
+background-color={{ background }}
diff --git a/roles/hyprtheme/templates/theme/syshud.css.j2 b/roles/hyprtheme/templates/theme/syshud.css.j2
deleted file mode 100644
index 4354efa5..00000000
--- a/roles/hyprtheme/templates/theme/syshud.css.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-@define-color borders {{ accent }};
-@define-color theme_bg_color {{ background }};
-@define-color theme_fg_color {{ foreground }};
diff --git a/roles/mako/handlers/main.yml b/roles/mako/handlers/main.yml
new file mode 100644
index 00000000..aba42db0
--- /dev/null
+++ b/roles/mako/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: "Reload mako"
+ ansible.builtin.command:
+ cmd: "makoctl reload"
+ changed_when: false
diff --git a/roles/mako/tasks/main.yml b/roles/mako/tasks/main.yml
index 97b4447a..08c91cf0 100644
--- a/roles/mako/tasks/main.yml
+++ b/roles/mako/tasks/main.yml
@@ -32,5 +32,9 @@
append_newline: true
marker: "# ==== {mark} ANSIBLE MAKO CONFIG"
block: |
+ # Include Theme colors (must come first)
+ include={{ ansible_facts['env']['HOME'] }}/.config/hyprtheme/current/mako.ini
# System defaults
include=/etc/xdg/mako/config
+ notify:
+ - "Reload mako"
diff --git a/roles/mako/templates/mako/config.j2 b/roles/mako/templates/mako/config.j2
index 62c21654..0e73e81d 100644
--- a/roles/mako/templates/mako/config.j2
+++ b/roles/mako/templates/mako/config.j2
@@ -1,11 +1,10 @@
sort=-time
layer=overlay
-background-color=#2E3440
width=300
height=110
border-size=2
-border-color=#F1C40F
border-radius=5
+padding=10,15
icons=1
max-icon-size=32
default-timeout=5000
@@ -20,12 +19,6 @@ invisible=true
[mode=do-not-disturb app-name=notify-send]
invisible=false
-# [urgency=low]
-# border-color=#41CFFF
-
-# [urgency=normal]
-# border-color=#41CFFF
-
[urgency=critical]
border-color=#E74C3C
default-timeout=0