From 30313d28580c7ae405a34da9e9e5d8cef8f6788c Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Wed, 25 Feb 2026 17:10:20 -0700 Subject: [PATCH] cleanup --- tasks/pkgs/aquamarine.yml | 65 -------------------- tasks/pkgs/bashls.yml | 2 +- tasks/pkgs/carapace.yml | 31 ---------- tasks/pkgs/greetd.yml | 9 --- tasks/pkgs/heroic.yml | 21 ------- tasks/pkgs/hyperfine.yml | 5 -- tasks/pkgs/hyprcursor.yml | 13 ---- tasks/pkgs/hyprgraphics.yml | 13 ---- tasks/pkgs/hypridle.yml | 22 ------- tasks/pkgs/hyprland.yml | 69 ---------------------- tasks/pkgs/hyprland_protocols.yml | 13 ---- tasks/pkgs/hyprland_qt_support.yml | 22 ------- tasks/pkgs/hyprland_qtutils.yml | 22 ------- tasks/pkgs/hyprlang.yml | 22 ------- tasks/pkgs/hyprlock.yml | 22 ------- tasks/pkgs/hyprpaper.yml | 22 ------- tasks/pkgs/hyprpicker.yml | 22 ------- tasks/pkgs/hyprpolkitagent.yml | 13 ---- tasks/pkgs/hyprutils.yml | 13 ---- tasks/pkgs/hyprwayland_scanner.yml | 14 ----- tasks/pkgs/nwg-drawer.yml | 5 -- tasks/pkgs/nwg-panel.yml | 5 -- tasks/pkgs/nwg_hello.yml | 9 --- tasks/pkgs/sdbus_cpp_2.yml | 13 ---- tasks/pkgs/usr_local_bin_profile_path.yml | 7 --- tasks/pkgs/xdg_desktop_portal_hyprland.yml | 31 ---------- tasks/pkgs/zsh.yml | 22 +++++++ vars/main.yml | 4 ++ vars/pkglist.yml | 6 +- 29 files changed, 32 insertions(+), 505 deletions(-) delete mode 100644 tasks/pkgs/aquamarine.yml delete mode 100644 tasks/pkgs/carapace.yml delete mode 100644 tasks/pkgs/greetd.yml delete mode 100644 tasks/pkgs/heroic.yml delete mode 100644 tasks/pkgs/hyperfine.yml delete mode 100644 tasks/pkgs/hyprcursor.yml delete mode 100644 tasks/pkgs/hyprgraphics.yml delete mode 100644 tasks/pkgs/hypridle.yml delete mode 100644 tasks/pkgs/hyprland.yml delete mode 100644 tasks/pkgs/hyprland_protocols.yml delete mode 100644 tasks/pkgs/hyprland_qt_support.yml delete mode 100644 tasks/pkgs/hyprland_qtutils.yml delete mode 100644 tasks/pkgs/hyprlang.yml delete mode 100644 tasks/pkgs/hyprlock.yml delete mode 100644 tasks/pkgs/hyprpaper.yml delete mode 100644 tasks/pkgs/hyprpicker.yml delete mode 100644 tasks/pkgs/hyprpolkitagent.yml delete mode 100644 tasks/pkgs/hyprutils.yml delete mode 100644 tasks/pkgs/hyprwayland_scanner.yml delete mode 100644 tasks/pkgs/nwg-drawer.yml delete mode 100644 tasks/pkgs/nwg-panel.yml delete mode 100644 tasks/pkgs/nwg_hello.yml delete mode 100644 tasks/pkgs/sdbus_cpp_2.yml delete mode 100644 tasks/pkgs/usr_local_bin_profile_path.yml delete mode 100644 tasks/pkgs/xdg_desktop_portal_hyprland.yml diff --git a/tasks/pkgs/aquamarine.yml b/tasks/pkgs/aquamarine.yml deleted file mode 100644 index 0eeb4c0..0000000 --- a/tasks/pkgs/aquamarine.yml +++ /dev/null @@ -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 diff --git a/tasks/pkgs/bashls.yml b/tasks/pkgs/bashls.yml index 5b0ce76..135ba18 100644 --- a/tasks/pkgs/bashls.yml +++ b/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: diff --git a/tasks/pkgs/carapace.yml b/tasks/pkgs/carapace.yml deleted file mode 100644 index 689d610..0000000 --- a/tasks/pkgs/carapace.yml +++ /dev/null @@ -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 }}" diff --git a/tasks/pkgs/greetd.yml b/tasks/pkgs/greetd.yml deleted file mode 100644 index 758dbd3..0000000 --- a/tasks/pkgs/greetd.yml +++ /dev/null @@ -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 }}" diff --git a/tasks/pkgs/heroic.yml b/tasks/pkgs/heroic.yml deleted file mode 100644 index 5430d5a..0000000 --- a/tasks/pkgs/heroic.yml +++ /dev/null @@ -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 diff --git a/tasks/pkgs/hyperfine.yml b/tasks/pkgs/hyperfine.yml deleted file mode 100644 index 631f565..0000000 --- a/tasks/pkgs/hyperfine.yml +++ /dev/null @@ -1,5 +0,0 @@ -# vim: set filetype=yaml.ansible : ---- -- name: Append hyperfine to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['hyperfine'] }}" diff --git a/tasks/pkgs/hyprcursor.yml b/tasks/pkgs/hyprcursor.yml deleted file mode 100644 index 4e18655..0000000 --- a/tasks/pkgs/hyprcursor.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprgraphics.yml b/tasks/pkgs/hyprgraphics.yml deleted file mode 100644 index 72b33b6..0000000 --- a/tasks/pkgs/hyprgraphics.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hypridle.yml b/tasks/pkgs/hypridle.yml deleted file mode 100644 index 2a174f1..0000000 --- a/tasks/pkgs/hypridle.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprland.yml b/tasks/pkgs/hyprland.yml deleted file mode 100644 index 0abb1ee..0000000 --- a/tasks/pkgs/hyprland.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprland_protocols.yml b/tasks/pkgs/hyprland_protocols.yml deleted file mode 100644 index 55b109c..0000000 --- a/tasks/pkgs/hyprland_protocols.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprland_qt_support.yml b/tasks/pkgs/hyprland_qt_support.yml deleted file mode 100644 index e173007..0000000 --- a/tasks/pkgs/hyprland_qt_support.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprland_qtutils.yml b/tasks/pkgs/hyprland_qtutils.yml deleted file mode 100644 index 9eb64bb..0000000 --- a/tasks/pkgs/hyprland_qtutils.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprlang.yml b/tasks/pkgs/hyprlang.yml deleted file mode 100644 index e9a9539..0000000 --- a/tasks/pkgs/hyprlang.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprlock.yml b/tasks/pkgs/hyprlock.yml deleted file mode 100644 index eb2cd8f..0000000 --- a/tasks/pkgs/hyprlock.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprpaper.yml b/tasks/pkgs/hyprpaper.yml deleted file mode 100644 index b612ed8..0000000 --- a/tasks/pkgs/hyprpaper.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprpicker.yml b/tasks/pkgs/hyprpicker.yml deleted file mode 100644 index db4dafd..0000000 --- a/tasks/pkgs/hyprpicker.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprpolkitagent.yml b/tasks/pkgs/hyprpolkitagent.yml deleted file mode 100644 index a0220b3..0000000 --- a/tasks/pkgs/hyprpolkitagent.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprutils.yml b/tasks/pkgs/hyprutils.yml deleted file mode 100644 index c077f88..0000000 --- a/tasks/pkgs/hyprutils.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/hyprwayland_scanner.yml b/tasks/pkgs/hyprwayland_scanner.yml deleted file mode 100644 index 14a22fc..0000000 --- a/tasks/pkgs/hyprwayland_scanner.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/nwg-drawer.yml b/tasks/pkgs/nwg-drawer.yml deleted file mode 100644 index 0d26e7f..0000000 --- a/tasks/pkgs/nwg-drawer.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/nwg-panel.yml b/tasks/pkgs/nwg-panel.yml deleted file mode 100644 index 5898f16..0000000 --- a/tasks/pkgs/nwg-panel.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/nwg_hello.yml b/tasks/pkgs/nwg_hello.yml deleted file mode 100644 index 46d7734..0000000 --- a/tasks/pkgs/nwg_hello.yml +++ /dev/null @@ -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 }}" diff --git a/tasks/pkgs/sdbus_cpp_2.yml b/tasks/pkgs/sdbus_cpp_2.yml deleted file mode 100644 index b0dbb8a..0000000 --- a/tasks/pkgs/sdbus_cpp_2.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/usr_local_bin_profile_path.yml b/tasks/pkgs/usr_local_bin_profile_path.yml deleted file mode 100644 index 5078526..0000000 --- a/tasks/pkgs/usr_local_bin_profile_path.yml +++ /dev/null @@ -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'] }}" diff --git a/tasks/pkgs/xdg_desktop_portal_hyprland.yml b/tasks/pkgs/xdg_desktop_portal_hyprland.yml deleted file mode 100644 index e3685a6..0000000 --- a/tasks/pkgs/xdg_desktop_portal_hyprland.yml +++ /dev/null @@ -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 diff --git a/tasks/pkgs/zsh.yml b/tasks/pkgs/zsh.yml index b3dabb9..0a7a0a3 100644 --- a/tasks/pkgs/zsh.yml +++ b/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 diff --git a/vars/main.yml b/vars/main.yml index 766265b..72b18c7 100644 --- a/vars/main.yml +++ b/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 +# }}} diff --git a/vars/pkglist.yml b/vars/pkglist.yml index 00c7da6..8b55ccc 100644 --- a/vars/pkglist.yml +++ b/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 +# }}}