From dd95f5897c5f8f6aa7bc872573225fb01ddf7583 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Mon, 31 Mar 2025 18:20:47 -0600 Subject: [PATCH] refactor variables, make use_local default to false --- tasks/config/aquamarine.yml | 2 +- tasks/config/ghostty.yml | 2 +- tasks/config/hyprcursor.yml | 2 +- tasks/config/hyprgraphics.yml | 2 +- tasks/config/hypridle.yml | 4 ++-- tasks/config/hyprland.yml | 2 +- tasks/config/hyprland_protocols.yml | 2 +- tasks/config/hyprland_qt_support.yml | 2 +- tasks/config/hyprland_qtutils.yml | 2 +- tasks/config/hyprlang.yml | 2 +- tasks/config/hyprlock.yml | 2 +- tasks/config/hyprpaper.yml | 2 +- tasks/config/hyprpicker.yml | 2 +- tasks/config/hyprpolkitagent.yml | 2 +- tasks/config/hyprutils.yml | 2 +- tasks/config/hyprwayland_scanner.yml | 2 +- tasks/config/neovim.yml | 2 +- tasks/config/nwg_hello.yml | 2 +- tasks/config/sdbus_cpp_2.yml | 2 +- tasks/config/uwsm.yml | 2 +- tasks/config/xdg_desktop_portal_hyprland.yml | 2 +- vars/main.yml | 8 ++++---- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tasks/config/aquamarine.yml b/tasks/config/aquamarine.yml index 3f9c662..5ce6955 100644 --- a/tasks/config/aquamarine.yml +++ b/tasks/config/aquamarine.yml @@ -10,4 +10,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) }}" + clean: "{{ package_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/ghostty.yml b/tasks/config/ghostty.yml index 9103056..c3d654b 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 | default(default.clean_src) }}" + clean: "{{ pkgconfig_ghostty_clean | default(package_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 8e7ae83..e807c63 100644 --- a/tasks/config/hyprcursor.yml +++ b/tasks/config/hyprcursor.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprgraphics.yml b/tasks/config/hyprgraphics.yml index f5d8c25..bedf3b9 100644 --- a/tasks/config/hyprgraphics.yml +++ b/tasks/config/hyprgraphics.yml @@ -8,4 +8,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hypridle.yml b/tasks/config/hypridle.yml index f300532..9fe907f 100644 --- a/tasks/config/hypridle.yml +++ b/tasks/config/hypridle.yml @@ -7,6 +7,6 @@ repo: "{{ pkgconfig.hypridle.repo }}" pkg_deps: "{{ pkgconfig.hypridle.pkg_deps }}" build_deps: "{{ pkgconfig.hypridle.build_deps[ansible_os_family] }}" - installed_files: "{{ pkgconfig.hypridle.build_installed_files}}" + installed_files: "{{ pkgconfig.hypridle.build_installed_files }}" git_path: "{{ d_tempdir.path }}/hypridle" - clean: "{{ pkgconfig_hyprland_clean | default(default.clean_src) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprland.yml b/tasks/config/hyprland.yml index c1f925b..1400ebb 100644 --- a/tasks/config/hyprland.yml +++ b/tasks/config/hyprland.yml @@ -10,4 +10,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprland_protocols.yml b/tasks/config/hyprland_protocols.yml index 972b91c..adc7585 100644 --- a/tasks/config/hyprland_protocols.yml +++ b/tasks/config/hyprland_protocols.yml @@ -8,4 +8,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprland_qt_support.yml b/tasks/config/hyprland_qt_support.yml index caf149e..f499068 100644 --- a/tasks/config/hyprland_qt_support.yml +++ b/tasks/config/hyprland_qt_support.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprland_qtutils.yml b/tasks/config/hyprland_qtutils.yml index 91cfaf8..0a30330 100644 --- a/tasks/config/hyprland_qtutils.yml +++ b/tasks/config/hyprland_qtutils.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprlang.yml b/tasks/config/hyprlang.yml index 5e27877..5935227 100644 --- a/tasks/config/hyprlang.yml +++ b/tasks/config/hyprlang.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprlock.yml b/tasks/config/hyprlock.yml index 2c95794..7aede14 100644 --- a/tasks/config/hyprlock.yml +++ b/tasks/config/hyprlock.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprpaper.yml b/tasks/config/hyprpaper.yml index 0ff822d..575a56c 100644 --- a/tasks/config/hyprpaper.yml +++ b/tasks/config/hyprpaper.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprpicker.yml b/tasks/config/hyprpicker.yml index dcd56ab..306702f 100644 --- a/tasks/config/hyprpicker.yml +++ b/tasks/config/hyprpicker.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprpolkitagent.yml b/tasks/config/hyprpolkitagent.yml index a768875..a9db2bf 100644 --- a/tasks/config/hyprpolkitagent.yml +++ b/tasks/config/hyprpolkitagent.yml @@ -8,4 +8,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprutils.yml b/tasks/config/hyprutils.yml index b8c43be..d1ac26d 100644 --- a/tasks/config/hyprutils.yml +++ b/tasks/config/hyprutils.yml @@ -8,4 +8,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/hyprwayland_scanner.yml b/tasks/config/hyprwayland_scanner.yml index f294fba..8daf50f 100644 --- a/tasks/config/hyprwayland_scanner.yml +++ b/tasks/config/hyprwayland_scanner.yml @@ -8,4 +8,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/neovim.yml b/tasks/config/neovim.yml index 2ed4aac..40f75ad 100644 --- a/tasks/config/neovim.yml +++ b/tasks/config/neovim.yml @@ -24,7 +24,7 @@ git_repo: "{{ pkgconfig.neovim.git_repo }}" git_path: "{{ d_tempdir.path }}/neovim" build_type: "{{ pkgconfig.neovim.build_type }}" - clean: "{{ pkgconfig_neovim.clean | default(default.clean_src) }}" + clean: "{{ pkgconfig_neovim.clean | default(package_default_clean_src) }}" installed_files: "{{ pkgconfig.neovim.build_installed_files }}" - name: Set neovim config for appimage install diff --git a/tasks/config/nwg_hello.yml b/tasks/config/nwg_hello.yml index 91c6899..eec01df 100644 --- a/tasks/config/nwg_hello.yml +++ b/tasks/config/nwg_hello.yml @@ -8,4 +8,4 @@ installed_files: "{{ pkgconfig.nwg_hello.build_installed_files }}" git_path: "{{ d_tempdir.path }}/nwg-hello" build_deps: "{{ pkgconfig.nwg_hello.bulid_deps[ansible_os_family] }}" - clean: "{{ pkgconfig_nwg_hello_clean | default(default.clean_src) }}" + clean: "{{ pkgconfig_nwg_hello_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/sdbus_cpp_2.yml b/tasks/config/sdbus_cpp_2.yml index 3bb6b3d..651630f 100644 --- a/tasks/config/sdbus_cpp_2.yml +++ b/tasks/config/sdbus_cpp_2.yml @@ -8,4 +8,4 @@ build_deps: "{{ pkgconfig.sdbus_cpp_2.build_deps[ansible_os_family] }}" git_path: "{{ d_tempdir.path }}/sdbus-cpp" prefix: "/usr/local" - clean: "{{ pkgconfig_sdbus_cpp_2_clean | default(default.clean_src) }}" + clean: "{{ pkgconfig_sdbus_cpp_2_clean | default(package_default_clean_src) }}" diff --git a/tasks/config/uwsm.yml b/tasks/config/uwsm.yml index 193a503..106d6df 100644 --- a/tasks/config/uwsm.yml +++ b/tasks/config/uwsm.yml @@ -7,6 +7,6 @@ repo: "{{ pkgconfig.uwsm.repo }}" build_deps: "{{ pkgconfig.uwsm.build_deps[ansible_os_family] }}" deps: "{{ pkgconfig.uwsm.deps[ansible_os_family] }}" - clean: "{{ pkgconfig_uwsm_clean | default(default.clean_src) }}" + clean: "{{ pkgconfig_uwsm_clean | default(package_default_clean_src) }}" installed_files: "{{ pkgconfig.uwsm.build_installed_files }}" prefix: "/usr/local" diff --git a/tasks/config/xdg_desktop_portal_hyprland.yml b/tasks/config/xdg_desktop_portal_hyprland.yml index e6e7722..1d30151 100644 --- a/tasks/config/xdg_desktop_portal_hyprland.yml +++ b/tasks/config/xdg_desktop_portal_hyprland.yml @@ -9,4 +9,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) }}" + clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}" diff --git a/vars/main.yml b/vars/main.yml index 5f4aee4..f4ded7b 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -2,8 +2,8 @@ # variables used in ansible_role_package --- debug: false -use_local: true -prefer_method: system +use_local: false +prefer_method: src packages: [] # list of packages to install defaults: @@ -26,7 +26,7 @@ defaults: # - paths.go: $PREFIX/go # - paths.pipx: $PREFIX/pipx -default: - clean_src: false +package_default_clean_src: false + ## Extra config that usually will not need to be changed hyprgitbase: https://github.com/hyprwm