Fix and ignore linting issues on hyprtheme role

8 files changed, 27 insertions, 27 deletions

diff --git a/roles/hyprland/templates/hyprland/autostart.conf.j2 b/roles/hyprland/templates/hyprland/autostart.conf.j2
index c8339166..b0818541 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/hyprthemes/current/background -m fill
+exec-once = uwsm-app -- swaybg -i ~/.config/hyprtheme/current/background -m fill
diff --git a/roles/hyprland/templates/hyprland/hyprlock.conf.j2 b/roles/hyprland/templates/hyprland/hyprlock.conf.j2
index 4f893ea8..551c3b14 100644
--- a/roles/hyprland/templates/hyprland/hyprlock.conf.j2
+++ b/roles/hyprland/templates/hyprland/hyprlock.conf.j2
@@ -1,4 +1,4 @@
-source = ~/.config/hyprthemes/current/hyprlock.conf
+source = ~/.config/hyprtheme/current/hyprlock.conf
 
 # Variables
 
@@ -18,7 +18,7 @@ animations {
 
 background {
     monitor =
-    # path = ~/.config/hyprthemes/current/background
+    # path = ~/.config/hyprtheme/current/background
     color = $color
     blur_passes = 3
 }
diff --git a/roles/hyprland/templates/hyprland/looknfeel.conf.j2 b/roles/hyprland/templates/hyprland/looknfeel.conf.j2
index 219b4d2f..d6e429f0 100644
--- a/roles/hyprland/templates/hyprland/looknfeel.conf.j2
+++ b/roles/hyprland/templates/hyprland/looknfeel.conf.j2
@@ -4,7 +4,7 @@
 # Defaults: https://github.com/basecamp/omarchy/blob/8a37f3dce71b0764e3758cb86478c503a4a8746e/default/hypr/looknfeel.conf
 
 # Load current theme variables
-source = ~/.config/hyprthemes/current/hyprland.conf
+source = ~/.config/hyprtheme/current/hyprland.conf
 
 # Refer to https://wiki.hyprland.org/Configuring/Variables/
 # Variables
diff --git a/roles/hyprtheme/files/scripts/theme-bg-next b/roles/hyprtheme/files/scripts/theme-bg-next
index c3259a45..e0edb2a3 100644
--- a/roles/hyprtheme/files/scripts/theme-bg-next
+++ b/roles/hyprtheme/files/scripts/theme-bg-next
@@ -2,7 +2,7 @@
 
 # Cycles through the background images available
 
-THEMES_PATH="$HOME/.config/hyprthemes/"
+THEMES_PATH="$HOME/.config/hyprtheme/"
 THEME_BACKGROUNDS_PATH="$THEMES_PATH/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$THEMES_PATH/current/background"
 
diff --git a/roles/hyprtheme/files/scripts/theme-set b/roles/hyprtheme/files/scripts/theme-set
index 905ce932..31a9bc73 100644
--- a/roles/hyprtheme/files/scripts/theme-set
+++ b/roles/hyprtheme/files/scripts/theme-set
@@ -6,8 +6,8 @@ if [[ -z $1 ]]; then
   exit 1
 fi
 
-THEMES_PATH="$HOME/.config/hyprthemes/themes"
-CURRENT_THEME_PATH="$HOME/.config/hyprthemes/current"
+THEMES_PATH="$HOME/.config/hyprtheme/themes"
+CURRENT_THEME_PATH="$HOME/.config/hyprtheme/current"
 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
 
 if [[ ! -d "$THEMES_PATH/$THEME_NAME" ]]; then
@@ -19,7 +19,7 @@ fi
 ln -sfn "$THEMES_PATH/$THEME_NAME" "$CURRENT_THEME_PATH.new"
 rm -rf "$CURRENT_THEME_PATH"
 mv "$CURRENT_THEME_PATH.new" "$CURRENT_THEME_PATH"
-./.config/hyprthemes/scripts/theme-bg-next
+./.config/hyprtheme/scripts/theme-bg-next
 
 pkill -x waybar || true
 setsid uwsm-app -- waybar >/dev/null 2>&1 &
@@ -39,7 +39,7 @@ fi
 killall -SIGUSR1 kitty >/dev/null 2>&1 || true
 killall -SIGUSR2 ghostty >/dev/null 2>&1 || true
 
-# if [[ -f ~/.config/hyprthemes/current/light.mode ]]; then
+# if [[ -f ~/.config/hyprtheme/current/light.mode ]]; then
   # gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
   # gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
 # else
@@ -48,7 +48,7 @@ killall -SIGUSR2 ghostty >/dev/null 2>&1 || true
 # fi
 
 # # Change gnome icon theme color
-# GNOME_ICONS_THEME=~/.config/hyprthemes/current/icons.theme
+# GNOME_ICONS_THEME=~/.config/hyprtheme/current/icons.theme
 # if [[ -f $GNOME_ICONS_THEME ]]; then
   # gsettings set org.gnome.desktop.interface icon-theme "$(<$GNOME_ICONS_THEME)"
 # else
diff --git a/roles/hyprtheme/tasks/main.yml b/roles/hyprtheme/tasks/main.yml
index a3762b98..5aa41bc7 100644
--- a/roles/hyprtheme/tasks/main.yml
+++ b/roles/hyprtheme/tasks/main.yml
@@ -1,39 +1,39 @@
 ---
 - name: "Set themes fact"
   ansible.builtin.set_fact:
-    hyprthemes:
+    hyprtheme_themes:
       - "catppuccin"
       - "everforest"
 
 - name: "Create current theme directory"
   ansible.builtin.file:
-    path: "{{ ansible_env.HOME }}/.config/hyprthemes/current"
+    path: "{{ ansible_env.HOME }}/.config/hyprtheme/current"
     state: "directory"
     mode: "0755"
 
 - name: "Create themes directory"
   ansible.builtin.file:
-    path: "{{ ansible_env.HOME }}/.config/hyprthemes/themes/{{ item }}"
+    path: "{{ ansible_env.HOME }}/.config/hyprtheme/themes/{{ item }}"
     state: "directory"
     mode: "0755"
-  loop: "{{ hyprthemes }}"
+  loop: "{{ hyprtheme_themes }}"
 
 - name: "Create scripts directory"
   ansible.builtin.file:
-    path: "{{ ansible_env.HOME }}/.config/hyprthemes/scripts"
+    path: "{{ ansible_env.HOME }}/.config/hyprtheme/scripts"
     state: "directory"
     mode: "0755"
 
 - name: "Template themes"
   ansible.builtin.include_tasks: "template-theme.yml"
   vars:
-    theme_name: "{{ item }}"
-  loop: "{{ hyprthemes }}"
+    hyprtheme_name: "{{ item }}"
+  loop: "{{ hyprtheme_themes }}"
 
 - name: "Copy theme scripts"
   ansible.builtin.copy:
     src: "{{ item }}"
-    dest: "{{ ansible_env.HOME }}/.config/hyprthemes/{{ item }}"
+    dest: "{{ ansible_env.HOME }}/.config/hyprtheme/{{ item }}"
     mode: "0755"
   loop:
     - "scripts/theme-set"
diff --git a/roles/hyprtheme/tasks/template-theme.yml b/roles/hyprtheme/tasks/template-theme.yml
index bd94ce17..e86b4752 100644
--- a/roles/hyprtheme/tasks/template-theme.yml
+++ b/roles/hyprtheme/tasks/template-theme.yml
@@ -1,10 +1,10 @@
 ---
 - name: "Load theme variables"
-  ansible.builtin.include_vars: "vars/{{ theme_name }}.yml"
+  ansible.builtin.include_vars: "vars/{{ hyprtheme_name }}.yml"
 
 - name: "Set theme files fact"
   ansible.builtin.set_fact:
-    theme_files:
+    hyprtheme_theme_files:
       - "alacritty.toml"
       - "btop.theme"
       - "ghostty.conf"
@@ -16,17 +16,17 @@
       - "walker.css"
       - "waybar.css"
 
-- name: "Template theme files for: {{ theme_name }}"
+- name: "Template theme files for: {{ hyprtheme_name }}"
   ansible.builtin.template:
     src: "theme/{{ file }}.j2"
-    dest: "{{ ansible_env.HOME }}/.config/hyprthemes/themes/{{ theme_name }}/{{ file }}"
+    dest: "{{ ansible_env.HOME }}/.config/hyprtheme/themes/{{ hyprtheme_name }}/{{ file }}"
     mode: "0644"
-  loop: "{{ theme_files }}"
+  loop: "{{ hyprtheme_theme_files }}"
   loop_control:
     loop_var: file
 
-- name: "Copy static theme files for: {{ theme_name }}"
+- name: "Copy static theme files for: {{ hyprtheme_name }}"
   ansible.builtin.copy:
-    src: "themes/{{ theme_name }}/"
-    dest: "{{ ansible_env.HOME }}/.config/hyprthemes/themes/{{ theme_name }}/"
+    src: "themes/{{ hyprtheme_name }}/"
+    dest: "{{ ansible_env.HOME }}/.config/hyprtheme/themes/{{ hyprtheme_name }}/"
     mode: "0644"
diff --git a/roles/waybar/templates/waybar/style.css.j2 b/roles/waybar/templates/waybar/style.css.j2
index 48774e6f..cde074f2 100644
--- a/roles/waybar/templates/waybar/style.css.j2
+++ b/roles/waybar/templates/waybar/style.css.j2
@@ -1,5 +1,5 @@
 /* vim: set filetype=css : */
-@import "{{ ansible_user_dir }}/.config/hyprthemes/current/waybar.css";
+@import "{{ ansible_user_dir }}/.config/hyprtheme/current/waybar.css";
 
 * {
     font-family: 'JetBrainsMono Nerd Font';