cleanup

tasks/pkgs/aquamarine.yml

@@ -1,65 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Add aquamarine
-  when:
-    - __aquamarine_configured is undefined
-  block:
-    - name: Set aquamarine install method
-      when:
-        - aquamarine_install_method is undefined
-      ansible.builtin.set_fact:
-        aquamarine_install_method: "{% if install_method in aquamarine_install_methods %}{{ install_method }}{% else %}{{ aquamarine_install_methods[0] }}{% endif %}"
-
-    - name: Configure aquamarine source install
-      when:
-        - aquamarine_install_method == 'source'
-      ansible.builtin.set_fact:
-        aquamarine_git_repo: 
-        aquamarine_build_steps:
-          configure:
-            - cmake
-            - --no-warn-unused-cli
-            - -DCMAKE_BUILD_TYPE=Release
-            - -DCMAKE_INSTALL_PREFIX={{ install_prefix }}
-            - -S
-            - .
-            - -B
-            - ./build
-          build:
-            - cmake
-            - --build
-            - ./build
-            - --config
-            - Release
-            - --target
-            - all
-            - j
-            - "{{ build_jobs | int }}"
-          install:
-            - cmake
-            - --install
-            - ./build
-
-    - name: Finish aquamarine configuration
-      when:
-        - __aquamarine_configured is undefined
-      ansible.builtin.set_fact:
-        __aquamarine_configured: true
-
-    - name: Append aquamarine pkg_deps
-      loop: "{{ aquamarine.pkg_deps }}"
-      loop_control:
-        loop_var: aquamarine_pkg_dep
-      vars:
-        pkg: "{{ aquamarine_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ aquamarine_pkg_dep }}.yml"
-
-    - name: Append aquamarine to pkg_sys and pkg_src
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + aquamarine.build_deps }}"
-        pkg_src: "{{ pkg_src + ['aquamarine'] }}"
-
-    - name: Set aquamarine_configured
-      ansible.builtin.set_fact:
-        aquamarine_configured: true

tasks/pkgs/bashls.yml

@@ -8,7 +8,7 @@
       when:
         - bashls_install_method is undefined
       ansible.builtin.set_fact:
-        bashls_install_method: "{% if install_method in bashls_install_methods %}{{ install_method }}{% else %}{{ bashls_install_methods[0] }}{% endif %}"
+        bashls_install_method: "{{ install_method if install_method in bashls_install_methods else bashls_install_methods[0] }}"
 
     - name: Append bash-language-server to pkg_npm
       when:

tasks/pkgs/carapace.yml

@@ -1,31 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load carapace config
-  ansible.builtin.include_tasks:
-    file: config/carapace.yml
-
-- name: Enable carapace yum repository
-  when:
-    - ansible_os_family == 'RedHat'
-  become: true
-  ansible.builtin.yum_repository:
-    name: "{{ carapace.repo.name }}"
-    description: "{{ carapace.repo.description }}"
-    baseurl: "{{ carapace.repo.baseurl }}"
-    enabled: true
-    gpgcheck: false
-    state: present
-
-- name: Enable carapace apt repository
-  when:
-    - ansible_os_family == 'Debian'
-  become: true
-  ansible.builtin.apt_repository:
-    repo: "{{ carapace.repo.repo }}"
-    filename: "{{ carapace.repo.name }}"
-    state: present
-    update_cache: false
-
-- name: Append carapace to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + carapace.pkgs }}"

tasks/pkgs/greetd.yml

@@ -1,9 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load greetd config
-  ansible.builtin.include_tasks:
-    file: config/greetd.yml
-
-- name: Append greetd to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + greetd.pkgs }}"

tasks/pkgs/heroic.yml

@@ -1,21 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Add heroic
-  when:
-    - heroic_configured is undefined
-  block:
-    - name: Append heroic to pkg_flatpak
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_flatpak: "{{ pkg_flatpak + ['com.heroicgameslauncher.hgl'] }}"
-
-    - name: Append heroic to pkg_cask
-      when:
-        - ansible_os_family == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + ['heroic'] }}"
-
-    - name: Set heroic_configured
-      ansible.builtin.set_fact:
-        heroic_configured: true

tasks/pkgs/hyperfine.yml

@@ -1,5 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Append hyperfine to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + ['hyperfine'] }}"

tasks/pkgs/hyprcursor.yml

@@ -1,13 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprcursor config
-  ansible.builtin.include_tasks:
-    file: config/hyprcursor.yml
-
-- name: Append hyprcursor build deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprcursor.build_deps }}"
-
-- name: Append hyprcursor to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprcursor'] }}"

tasks/pkgs/hyprgraphics.yml

@@ -1,13 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprgraphics config
-  ansible.builtin.include_tasks:
-    file: config/hyprgraphics.yml
-
-- name: Append hyprgraphics build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprgraphics.build_deps }}"
-
-- name: Append hyprcursor to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprgraphics'] }}"

tasks/pkgs/hypridle.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hypridle config
-  ansible.builtin.include_tasks:
-    file: config/hypridle.yml
-
-- name: Append hypridle pkg_deps
-  loop: "{{ hypridle.pkg_deps }}"
-  loop_control:
-    loop_var: hypridle_pkg_dep
-  vars:
-    pkg: "{{ hypridle_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hypridle_pkg_dep }}.yml"
-
-- name: Append hypridle build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hypridle.build_deps }}"
-
-- name: Append hypridle to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hypridle'] }}"

tasks/pkgs/hyprland.yml

@@ -1,69 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Configure Hyprland
-  when:
-    - __hyprland_configured is undefined
-  block:
-    - name: Set Hyprland install method
-      when:
-        - hyprland_install_method is undefined
-      ansible.builtin.set_fact:
-        hyprland_install_method: "{% if install_method in hyprland_install_methods %}{{ install_method }}{% else %}{{ hyprland_install_methods[0] }}{% endif %}"
-
-    - name: Set Hyprland source install configuration
-      when:
-        - hyprland_install_method == 'source'
-      ansible.builtin.set_fact:
-        hyprland_version: "{{ hyprland_version | default('v0.53.3') }}"
-        hyprland_git_repo: "{{ hyprland_git_repo | default('https://github.com/hyprwm/Hyprland') }}"
-        hyprland_build_deps:
-          RedHat:
-            - cmake
-        hyprland_pkg_deps:
-          - aquamarine
-          - hyprlang
-          - hyprcursor
-          - hyprutils
-          - hyprgraphics
-          - hyprwayland-scanner
-        hyprland_build_steps:
-          configure:
-            - cmake
-            - --no-warn-unused-cli
-            - -DCMAKE_BUILD_TYPE=Release
-            - -DCMAKE_INSTALL_PREFIX={{ install_prefix }}
-            - -S
-            - .
-            - -B
-            - ./build
-          build:
-            - cmake
-            - --bulid
-            - ./build
-            - --config
-            - Release
-            - --target
-            - all
-            - j
-            - "{{ build_jobs | int }}"
-          install:
-            - cmake
-            - --install
-            - ./build
-
-- name: Append hyprland pkg_deps
-  loop: "{{ hyprland.pkg_deps }}"
-  loop_control:
-    loop_var: hyprland_pkg_dep
-  vars:
-    pkg: "{{ hyprland_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprland_pkg_dep }}.yml"
-
-- name: Append hyprland build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprland.build_deps }}"
-
-- name: Append hyprland to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprland'] }}"

tasks/pkgs/hyprland_protocols.yml

@@ -1,13 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprland-protocols config
-  ansible.builtin.include_tasks:
-    file: config/hyprland_protocols.yml
-
-- name: Append hyprland-protocols build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprland_protocols.build_deps }}"
-
-- name: Append hyprland-protocols to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprland_protocols'] }}"

tasks/pkgs/hyprland_qt_support.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprland_qt_support config
-  ansible.builtin.include_tasks:
-    file: config/hyprland_qt_support.yml
-
-- name: Append hyprland_qt_support pkg_deps
-  loop: "{{ hyprland_qt_support.pkg_deps }}"
-  loop_control:
-    loop_var: hyprland_qt_support_pkg_dep
-  vars:
-    pkg: "{{ hyprland_qt_support_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprland_qt_support_pkg_dep }}.yml"
-
-- name: Append hyprland_qt_support build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprland_qt_support.build_deps }}"
-
-- name: Append hyprland_qt_support to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprland_qt_support'] }}"

tasks/pkgs/hyprland_qtutils.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprland_qtutils config
-  ansible.builtin.include_tasks:
-    file: config/hyprland_qtutils.yml
-
-- name: Append hyprland_qtutils pkg_deps
-  loop: "{{ hyprland_qtutils.pkg_deps }}"
-  loop_control:
-    loop_var: hyprland_qtutils_pkg_dep
-  vars:
-    pkg: "{{ hyprland_qtutils_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprland_qtutils_pkg_dep }}.yml"
-
-- name: Append hyprland_qtutils build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprland_qtutils.build_deps }}"
-
-- name: Append hyprland_qtutils to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprland_qtutils'] }}"

tasks/pkgs/hyprlang.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprlang config
-  ansible.builtin.include_tasks:
-    file: config/hyprlang.yml
-
-- name: Append hyprland pkg_deps
-  loop: "{{ hyprlang.pkg_deps }}"
-  loop_control:
-    loop_var: hyprlang_pkg_dep
-  vars:
-    pkg: "{{ hyprlang_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprlang_pkg_dep }}.yml"
-
-- name: Append hyprlang build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}"
-
-- name: Append hyprlang to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprlang'] }}"

tasks/pkgs/hyprlock.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprlock config
-  ansible.builtin.include_tasks:
-    file: config/hyprlock.yml
-
-- name: Append hyprlock pkg_deps
-  loop: "{{ hyprlock.pkg_deps }}"
-  loop_control:
-    loop_var: hyprlock_pkg_dep
-  vars:
-    pkg: "{{ hyprlock_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprlock_pkg_dep }}.yml"
-
-- name: Append hyprlock build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprlock.build_deps }}"
-
-- name: Append hyprlock to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprlock'] }}"

tasks/pkgs/hyprpaper.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprpaper config
-  ansible.builtin.include_tasks:
-    file: config/hyprpaper.yml
-
-- name: Append hyprpaper pkg_deps
-  loop: "{{ hyprpaper.pkg_deps }}"
-  loop_control:
-    loop_var: hyprpaper_pkg_dep
-  vars:
-    pkg: "{{ hyprpaper_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprpaper_pkg_dep }}.yml"
-
-- name: Append hyprpaper build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprpaper.build_deps }}"
-
-- name: Append hyprpaper to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprpaper'] }}"

tasks/pkgs/hyprpicker.yml

@@ -1,22 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprpicker config
-  ansible.builtin.include_tasks:
-    file: config/hyprpicker.yml
-
-- name: Append hyprpicker pkg_deps
-  loop: "{{ hyprpicker.pkg_deps }}"
-  loop_control:
-    loop_var: hyprpicker_pkg_dep
-  vars:
-    pkg: "{{ hyprpicker_pkg_dep }}"
-  ansible.builtin.include_tasks:
-    file: "pkgs/{{ hyprpicker_pkg_dep }}.yml"
-
-- name: Append hyprpicker build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprpicker.build_deps }}"
-
-- name: Append hyprpicker to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprpicker'] }}"

tasks/pkgs/hyprpolkitagent.yml

@@ -1,13 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprpolkitagent config
-  ansible.builtin.include_tasks:
-    file: config/hyprpolkitagent.yml
-
-- name: Append hyprpolkitagent build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprpolkitagent.build_deps }}"
-
-- name: Append hyprpolkitagent to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprpolkitagent'] }}"

tasks/pkgs/hyprutils.yml

@@ -1,13 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load hyprutils config
-  ansible.builtin.include_tasks:
-    file: config/hyprutils.yml
-
-- name: Append hyprutils build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprutils.build_deps }}"
-
-- name: Append hyprutils to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprutils'] }}"

tasks/pkgs/hyprwayland_scanner.yml

@@ -1,14 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-# build deps: pugixml
-- name: Load hyprwayland-scanner config
-  ansible.builtin.include_tasks:
-    file: config/hyprwayland_scanner.yml
-
-- name: Append hyprwayland-scanner build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + hyprwayland_scanner.build_deps }}"
-
-- name: Append hyprwayland-scanner to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['hyprwayland_scanner'] }}"

tasks/pkgs/nwg-drawer.yml

@@ -1,5 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Add nwg-drawer to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + ['nwg-drawer'] }}"

tasks/pkgs/nwg-panel.yml

@@ -1,5 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Add nwg-panel to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + ['nwg-panel'] }}"

tasks/pkgs/nwg_hello.yml

@@ -1,9 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load nwg-hello config
-  ansible.builtin.include_tasks:
-    file: config/nwg_hello.yml
-
-- name: Append nwg-hello build_deps to sys_pkg
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + nwg_hello.build_deps }}"

tasks/pkgs/sdbus_cpp_2.yml

@@ -1,13 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Load sdbus-cpp-2 config
-  ansible.builtin.include_tasks:
-    file: config/sdbus_cpp_2.yml
-
-- name: Append sdbus-cpp-2 build_deps to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + sdbus_cpp_2.build_deps }}"
-
-- name: Append sdbus-cpp-2 to pkg_src
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['sdbus_cpp_2'] }}"

tasks/pkgs/usr_local_bin_profile_path.yml

@@ -1,7 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Add /usr/local/bin to PATH
-  when:
-    - ansible_os_family == 'RedHat'
-  ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['usr_local_bin_profile_path'] }}"

tasks/pkgs/xdg_desktop_portal_hyprland.yml

@@ -1,31 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Add xdg-desktop-portal-hyprland
-  block:
-    - name: Load xdg-desktop-portal-hyprland config
-      when:
-        - xdg_desktop_portal_hyprland is undefined
-      ansible.builtin.include_tasks:
-        file: config/xdg_desktop_portal_hyprland.yml
-
-    - name: Ensure xdg-desktop-portal-hyprland pkg_deps are added
-      loop: "{{ xdg_desktop_portal_hyprland.pkg_deps }}"
-      loop_control:
-        loop_var: xdg_pkg_dep
-      vars:
-        pkg: "{{ xdg_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ xdg_pkg_dep }}.yml"
-
-    - name: Append xdg-desktop-portal-hyprland build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + xdg_desktop_portal_hyprland.build_deps }}"
-
-    - name: Append xdg-desktop-portal-hyprland to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['xdg_desktop_portal_hyprland'] }}"
-
-
-    - name: Set xdg_desktop_portal_hyprland_configured
-      ansible.builtin.set_fact:
-        xdg_desktop_portal_hyprland_configured: true

tasks/pkgs/zsh.yml

@@ -1,11 +1,33 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add zsh
+  when:
+    - "'zsh' not in __configured"
   block:
+    - name: Set zsh install method
+      when:
+        - zsh_install_method is undefined
+      ansible.bulitin.set_fact:
+        zsh_install_method: "{{ install_method if install_method in zsh_install_methods else zsh_install_methods[0] }}"
+
     - name: Append zsh to pkg_sys
+      when:
+        - zsh_install_method == 'system'
       ansible.builtin.set_fact:
         pkg_sys: "{{ pkg_sys + ['zsh'] }}"
 
+    - name: Configure zsh source install
+      when:
+        - zsh_install_method == 'source'
+      ansible.builtin.set_fact:
+        zsh_source_install:
+          build_deps:
+          build_flags:
+          source_dir:
+          repo: "{{ zsh_base_url }}"
+          version: "{{ zsh_version }}"
+          files:
+
     - name: Set zsh_configured
       ansible.builtin.set_fact:
         zsh_configured: true

vars/main.yml

@@ -135,3 +135,7 @@ nerdfonts_install_list:
 nerdfonts_base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download
 nerdfonts_install_path: share/fonts
 # }}}
+# {{{ zsh
+zsh_base_url: git://git.code.sf.net/p/zsh/code
+zsh_version: zsh-5.9
+# }}}

vars/pkglist.yml

@@ -104,9 +104,12 @@ nerdfonts_install_methods:
 yazi_install_methods:
   - source
   - cargo
+zsh_install_methods:
+  - system
+  - source
 
 ## Package specific configuration that never need to be set by the installer
-__nerdfonts:
+__nerdfonts: # {{{
   0xProto:
     brew: font-0xproto-nerd-font
   "3270":
@@ -270,3 +273,4 @@ __nerdfonts:
   ZedMono:
     brew: font-zed-mono-nerd-font
   base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download
+# }}}