From 5645cc7dd6b1d158e00ebb02552995d6a4782dc9 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Sat, 29 Mar 2025 15:02:28 -0600 Subject: [PATCH] configure cleaning on src pkgs --- tasks/config/aquamarine.yml | 1 + tasks/config/ghostty.yml | 2 +- tasks/config/hyprcursor.yml | 1 + tasks/config/hyprgraphics.yml | 1 + tasks/config/hypridle.yml | 1 + tasks/config/hyprland.yml | 1 + tasks/config/hyprland_protocols.yml | 1 + tasks/config/hyprland_qt_support.yml | 1 + tasks/config/hyprland_qtutils.yml | 1 + tasks/config/hyprlang.yml | 1 + tasks/config/hyprlock.yml | 1 + tasks/config/hyprpaper.yml | 1 + tasks/config/hyprpicker.yml | 1 + tasks/config/hyprpolkitagent.yml | 1 + tasks/config/hyprutils.yml | 1 + tasks/config/hyprwayland_scanner.yml | 1 + tasks/config/xdg_desktop_portal_hyprland.yml | 1 + tasks/src/aquamarine.yml | 2 ++ tasks/src/hyprcursor.yml | 2 ++ tasks/src/hyprgraphics.yml | 2 ++ tasks/src/hypridle.yml | 2 ++ tasks/src/hyprland.yml | 2 ++ tasks/src/hyprland_protocols.yml | 2 ++ tasks/src/hyprland_qt_support.yml | 2 ++ tasks/src/hyprland_qtutils.yml | 2 +- tasks/src/hyprlang.yml | 2 +- tasks/src/hyprlock.yml | 2 +- tasks/src/hyprpaper.yml | 2 +- tasks/src/hyprpicker.yml | 2 +- tasks/src/hyprpolkitagent.yml | 2 +- tasks/src/hyprutils.yml | 2 +- tasks/src/hyprwayland_scanner.yml | 2 +- tasks/src/xdg_desktop_portal_hyprland.yml | 2 ++ vars/main.yml | 3 ++- 34 files changed, 43 insertions(+), 10 deletions(-) diff --git a/tasks/config/aquamarine.yml b/tasks/config/aquamarine.yml index a576cf1..628b230 100644 --- a/tasks/config/aquamarine.yml +++ b/tasks/config/aquamarine.yml @@ -8,3 +8,4 @@ installed_files: "{{ pkgconfig.aquamarine.build_installed_files }}" bin: aquamarine build_deps: "{{ pkgconfig.aquamarine.build_deps[ansible_os_family] }}" + clean: "{{ package_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/ghostty.yml b/tasks/config/ghostty.yml index c59dd12..9103056 100644 --- a/tasks/config/ghostty.yml +++ b/tasks/config/ghostty.yml @@ -12,7 +12,7 @@ ghostty: method: "{{ ghostty.method }}" arch: "{{ pkgconfig.ghostty.archmap[ansible_architecture] }}" - clean: "{{ pkgconfig.ghostty.clean_install }}" + clean: "{{ pkgconfig_ghostty_clean | default(default.clean_src) }}" deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}" vers: "{{ pkgconfig.ghostty.version }}" pkg: "{{ pkgconfig.ghostty[ghostty.method] }}" diff --git a/tasks/config/hyprcursor.yml b/tasks/config/hyprcursor.yml index 5968c4a..47997bd 100644 --- a/tasks/config/hyprcursor.yml +++ b/tasks/config/hyprcursor.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprcursor.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprcursor.build_installed_files }}" git_path: "{{ d_tempdir.path }}/hyprcursor" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprgraphics.yml b/tasks/config/hyprgraphics.yml index af40b45..8b5eff7 100644 --- a/tasks/config/hyprgraphics.yml +++ b/tasks/config/hyprgraphics.yml @@ -6,3 +6,4 @@ build_deps: "{{ pkgconfig.hyprgraphics.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprgraphics.build_installed_files }}" git_path: "{{ d_tempdir.path }}/hyprgraphics" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hypridle.yml b/tasks/config/hypridle.yml index b59a84c..f658b51 100644 --- a/tasks/config/hypridle.yml +++ b/tasks/config/hypridle.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hypridle.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hypridle.build_installed_files}}" git_path: "{{ d_tempdir.path }}/hypridle" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprland.yml b/tasks/config/hyprland.yml index 016d215..3bf55ec 100644 --- a/tasks/config/hyprland.yml +++ b/tasks/config/hyprland.yml @@ -8,3 +8,4 @@ installed_files: "{{ pkgconfig.hyprland.build_installed_files }}" git_path: "{{ d_tempdir.path }}/Hyprland" prefix: "/usr/local" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprland_protocols.yml b/tasks/config/hyprland_protocols.yml index f18dfc0..25bf33c 100644 --- a/tasks/config/hyprland_protocols.yml +++ b/tasks/config/hyprland_protocols.yml @@ -6,3 +6,4 @@ build_deps: "{{ pkgconfig.hyprland_protocols.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprland_protocols.build_installed_files }}" git_path: "{{ d_tempdir.path }}/hyprland-protocols" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprland_qt_support.yml b/tasks/config/hyprland_qt_support.yml index 1cf7397..25703e0 100644 --- a/tasks/config/hyprland_qt_support.yml +++ b/tasks/config/hyprland_qt_support.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprland_qt_support.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprland_qt_support.build_installed_files}}" git_path: "{{ d_tempdir.path }}/hyprland_qt_support" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprland_qtutils.yml b/tasks/config/hyprland_qtutils.yml index 0ed1ec4..9e02874 100644 --- a/tasks/config/hyprland_qtutils.yml +++ b/tasks/config/hyprland_qtutils.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprland_qtutils.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprland_qtutils.build_installed_files}}" git_path: "{{ d_tempdir.path }}/hyprland_qtutils" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprlang.yml b/tasks/config/hyprlang.yml index 1fbb79d..da94d1d 100644 --- a/tasks/config/hyprlang.yml +++ b/tasks/config/hyprlang.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprlang.build_deps[ansible_os_family] }}" git_path: "{{ d_tempdir.path }}/hyprlang" installed_files: "{{ pkgconfig.hyprlang.build_installed_files }}" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprlock.yml b/tasks/config/hyprlock.yml index 1eadc3a..f79eb30 100644 --- a/tasks/config/hyprlock.yml +++ b/tasks/config/hyprlock.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprlock.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprlock.build_installed_files}}" git_path: "{{ d_tempdir.path }}/hyprlock" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprpaper.yml b/tasks/config/hyprpaper.yml index d18b6ad..54f467d 100644 --- a/tasks/config/hyprpaper.yml +++ b/tasks/config/hyprpaper.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprpaper.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprpaper.build_installed_files}}" git_path: "{{ d_tempdir.path }}/hyprpaper" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprpicker.yml b/tasks/config/hyprpicker.yml index acd358a..b1c08a4 100644 --- a/tasks/config/hyprpicker.yml +++ b/tasks/config/hyprpicker.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.hyprpicker.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprpicker.build_installed_files}}" git_path: "{{ d_tempdir.path }}/hyprpicker" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprpolkitagent.yml b/tasks/config/hyprpolkitagent.yml index 114f37d..da92763 100644 --- a/tasks/config/hyprpolkitagent.yml +++ b/tasks/config/hyprpolkitagent.yml @@ -6,3 +6,4 @@ build_deps: "{{ pkgconfig.hyprpolkitagent.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprpolkitagent.build_installed_files }}" git_path: "{{ d_tempdir.path }}/hyprpolkitagent" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprutils.yml b/tasks/config/hyprutils.yml index df29b0d..799ed49 100644 --- a/tasks/config/hyprutils.yml +++ b/tasks/config/hyprutils.yml @@ -6,3 +6,4 @@ git_path: "{{ d_tempdir.path }}/hyprutils" installed_files: "{{ pkgconfig.hyprutils.build_installed_files }}" build_deps: "{{ pkgconfig.hyprutils.build_deps[ansible_os_family] }}" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/hyprwayland_scanner.yml b/tasks/config/hyprwayland_scanner.yml index 5b96dc5..32ebead 100644 --- a/tasks/config/hyprwayland_scanner.yml +++ b/tasks/config/hyprwayland_scanner.yml @@ -6,3 +6,4 @@ build_deps: "{{ pkgconfig.hyprwayland_scanner.build_deps[ansible_os_family] }}" git_path: "{{ d_tempdir.path }}/hyprwayland-scanner" installed_files: "{{ pkgconfig.hyprwayland_scanner.build_installed_files }}" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/config/xdg_desktop_portal_hyprland.yml b/tasks/config/xdg_desktop_portal_hyprland.yml index b638a2e..f9e4da8 100644 --- a/tasks/config/xdg_desktop_portal_hyprland.yml +++ b/tasks/config/xdg_desktop_portal_hyprland.yml @@ -7,3 +7,4 @@ build_deps: "{{ pkgconfig.xdg_desktop_portal_hyprland.build_deps[ansible_os_family] }}" git_path: "{{ d_tempdir.path }}/xdg-desktop-portal-hyprland" installed_files: "{{ pkgconfig.xdg_desktop_portal_hyprland.build_installed_files }}" + clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" diff --git a/tasks/src/aquamarine.yml b/tasks/src/aquamarine.yml index 650c32f..d6cb9c4 100644 --- a/tasks/src/aquamarine.yml +++ b/tasks/src/aquamarine.yml @@ -1,4 +1,6 @@ - name: Remove existing install {{ pkg }} + when: + - aquamarine.clean become: true loop: "{{ aquamarine.installed_files }}" loop_control: diff --git a/tasks/src/hyprcursor.yml b/tasks/src/hyprcursor.yml index 3130722..9b4da0c 100644 --- a/tasks/src/hyprcursor.yml +++ b/tasks/src/hyprcursor.yml @@ -1,4 +1,6 @@ - name: Remove existing install of {{ pkg }} + when: + - hyprcursor.clean become: true loop: "{{ hyprcursor.installed_files }}" loop_control: diff --git a/tasks/src/hyprgraphics.yml b/tasks/src/hyprgraphics.yml index 8522203..926c4dc 100644 --- a/tasks/src/hyprgraphics.yml +++ b/tasks/src/hyprgraphics.yml @@ -1,4 +1,6 @@ - name: Remove existing install of {{ pkg }} + when: + - hyprgraphics.clean become: true loop: "{{ hyprgraphics.installed_files }}" loop_control: diff --git a/tasks/src/hypridle.yml b/tasks/src/hypridle.yml index 0910c7e..2d51325 100644 --- a/tasks/src/hypridle.yml +++ b/tasks/src/hypridle.yml @@ -1,4 +1,6 @@ - name: Remove existing install of {{ pkg }} + when: + - hypridle.clean become: true loop: "{{ hypridle.installed_files }}" loop_control: diff --git a/tasks/src/hyprland.yml b/tasks/src/hyprland.yml index 8402073..a3ea9de 100644 --- a/tasks/src/hyprland.yml +++ b/tasks/src/hyprland.yml @@ -1,4 +1,6 @@ - name: Remove existing install of {{ pkg }} + when: + - hyprland.clean become: true loop: "{{ hyprland.installed_files }}" loop_control: diff --git a/tasks/src/hyprland_protocols.yml b/tasks/src/hyprland_protocols.yml index 96cd81a..90f739c 100644 --- a/tasks/src/hyprland_protocols.yml +++ b/tasks/src/hyprland_protocols.yml @@ -1,6 +1,8 @@ # vim: set filetype=yaml.ansible : --- - name: Remove existing install of {{ pkg }} + when: + - hyprland_protocols.clean become: true loop: "{{ hyprland_protocols.installed_files }}" loop_control: diff --git a/tasks/src/hyprland_qt_support.yml b/tasks/src/hyprland_qt_support.yml index aea3868..11a2292 100644 --- a/tasks/src/hyprland_qt_support.yml +++ b/tasks/src/hyprland_qt_support.yml @@ -1,4 +1,6 @@ - name: Remove existing install of {{ pkg }} + when: + - hyprland_qt_support.clean become: true loop: "{{ hyprland_qt_support.installed_files }}" loop_control: diff --git a/tasks/src/hyprland_qtutils.yml b/tasks/src/hyprland_qtutils.yml index 5082f89..c483b4c 100644 --- a/tasks/src/hyprland_qtutils.yml +++ b/tasks/src/hyprland_qtutils.yml @@ -1,6 +1,6 @@ - name: Remove existing install of {{ pkg }} when: - - hyprland_clean + - hyprland_qtutils.clean become: true loop: "{{ hyprland_qtutils.installed_files }}" loop_control: diff --git a/tasks/src/hyprlang.yml b/tasks/src/hyprlang.yml index 2ee4077..57a3f54 100644 --- a/tasks/src/hyprlang.yml +++ b/tasks/src/hyprlang.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprlang.clean become: true loop: "{{ hyprlang.installed_files }}" loop_control: diff --git a/tasks/src/hyprlock.yml b/tasks/src/hyprlock.yml index 8147ba1..b45088e 100644 --- a/tasks/src/hyprlock.yml +++ b/tasks/src/hyprlock.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprlock.clean become: true loop: "{{ hyprlock.installed_files }}" loop_control: diff --git a/tasks/src/hyprpaper.yml b/tasks/src/hyprpaper.yml index 466582b..8bcfa6d 100644 --- a/tasks/src/hyprpaper.yml +++ b/tasks/src/hyprpaper.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprpaper.clean become: true loop: "{{ hyprpaper.installed_files }}" loop_control: diff --git a/tasks/src/hyprpicker.yml b/tasks/src/hyprpicker.yml index 88cb571..b101ad7 100644 --- a/tasks/src/hyprpicker.yml +++ b/tasks/src/hyprpicker.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprpicker.clean become: true loop: "{{ hyprpicker.installed_files }}" loop_control: diff --git a/tasks/src/hyprpolkitagent.yml b/tasks/src/hyprpolkitagent.yml index 2b183bc..1a0f4eb 100644 --- a/tasks/src/hyprpolkitagent.yml +++ b/tasks/src/hyprpolkitagent.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprpolkitagent.clean become: true loop: "{{ hyprpolkitagent.installed_files }}" loop_control: diff --git a/tasks/src/hyprutils.yml b/tasks/src/hyprutils.yml index a20e872..e871735 100644 --- a/tasks/src/hyprutils.yml +++ b/tasks/src/hyprutils.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprutils.clean become: true loop: "{{ hyprutils.installed_files }}" loop_control: diff --git a/tasks/src/hyprwayland_scanner.yml b/tasks/src/hyprwayland_scanner.yml index d04a5ca..a08deb7 100644 --- a/tasks/src/hyprwayland_scanner.yml +++ b/tasks/src/hyprwayland_scanner.yml @@ -1,6 +1,6 @@ - name: Remove existing install {{ pkg }} when: - - hyprland_clean + - hyprwayland_scanner.clean become: true loop: "{{ hyprwayland_scanner.installed_files }}" loop_control: diff --git a/tasks/src/xdg_desktop_portal_hyprland.yml b/tasks/src/xdg_desktop_portal_hyprland.yml index da588ea..cbbfa12 100644 --- a/tasks/src/xdg_desktop_portal_hyprland.yml +++ b/tasks/src/xdg_desktop_portal_hyprland.yml @@ -1,4 +1,6 @@ - name: Remove existing install {{ pkg }} + when: + - xdg_desktop_portal_hyprland.clean become: true loop: "{{ xdg_desktop_portal_hyprland.installed_files }}" loop_control: diff --git a/vars/main.yml b/vars/main.yml index b4b4340..5f4aee4 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -26,6 +26,7 @@ defaults: # - paths.go: $PREFIX/go # - paths.pipx: $PREFIX/pipx -always_clean_src: false +default: + clean_src: false ## Extra config that usually will not need to be changed hyprgitbase: https://github.com/hyprwm