From 51d97dd18fc7a193f70079e7f07bc7008eb9712d Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Mon, 10 Mar 2025 14:53:36 -0600 Subject: [PATCH] adding Alpine specific installations --- tasks/archive/packer.yml | 13 ++++++++++ tasks/config/alacritty.yml | 2 +- tasks/config/fd.yml | 2 +- tasks/config/ghostty.yml | 1 + tasks/config/git.yml | 2 +- tasks/config/hyprpolkitagent.yml | 2 +- tasks/config/packer.yml | 3 +++ tasks/pkgs/alacritty.yml | 7 ++++-- tasks/pkgs/ghostty.yml | 8 +++--- tasks/pkgs/packer.yml | 7 ++++++ tasks/pkgs/uwsm.yml | 6 ++--- vars/pkgs/alacritty.yml | 23 +++++++++++------ vars/pkgs/aquamarine.yml | 23 ++++++++++++----- vars/pkgs/bitwarden.yml | 1 + vars/pkgs/broot.yml | 2 ++ vars/pkgs/carapace.yml | 3 +++ vars/pkgs/clangd.yml | 2 ++ vars/pkgs/fd.yml | 6 ++++- vars/pkgs/ghostty.yml | 6 +++++ vars/pkgs/git.yml | 11 ++++++++- vars/pkgs/hyprcursor.yml | 5 ++++ vars/pkgs/hyprgraphics.yml | 9 +++++++ vars/pkgs/hyprland.yml | 30 ++++++++++++++++++++++- vars/pkgs/hyprland_protocols.yml | 3 +++ vars/pkgs/hyprlang.yml | 1 + vars/pkgs/hyprpolkitagent.yml | 3 +++ vars/pkgs/hyprutils.yml | 2 ++ vars/pkgs/hyprwayland_scanner.yml | 2 ++ vars/pkgs/neovide.yml | 17 ++++++++----- vars/pkgs/packer.yml | 3 +++ vars/pkgs/sdbus_cpp_2.yml | 2 ++ vars/pkgs/xdg_desktop_portal_hyprland.yml | 9 +++++-- 32 files changed, 178 insertions(+), 38 deletions(-) create mode 100644 tasks/archive/packer.yml diff --git a/tasks/archive/packer.yml b/tasks/archive/packer.yml new file mode 100644 index 0000000..03576d9 --- /dev/null +++ b/tasks/archive/packer.yml @@ -0,0 +1,13 @@ +- name: Download packer archive + ansible.builtin.get_url: + dest: "{{ d_tempdir.path }}/{{ packer.archive.file }}" + url: "{{ packer.archive.url }}/{{ packer.archive.file }}" + decompress: false + mode: '0644' + +- name: Extract packer archive + become: "{{ ext_become }}" + ansible.builtin.unarchive: + dest: "{{ path.archive }}/packer" + src: "{{ d_tempdir.path }}/{{ packer.archive.file }}" + remote_src: true diff --git a/tasks/config/alacritty.yml b/tasks/config/alacritty.yml index 5a26957..c96dc69 100644 --- a/tasks/config/alacritty.yml +++ b/tasks/config/alacritty.yml @@ -3,7 +3,7 @@ - name: Set alacritty configuration ansible.builtin.set_fact: alacritty: - deps: "{{ pkgconfig.alacritty[ansible_os_family].build_deps }}" + deps: "{{ pkgconfig.alacritty.build_deps[ansible_os_family] }}" vers: "{{ pkgconfig.alacritty.version }}" cask: "{{ pkgconfig.alacritty.cask | default(omit) }}" locked: true diff --git a/tasks/config/fd.yml b/tasks/config/fd.yml index dca7e72..fb44003 100644 --- a/tasks/config/fd.yml +++ b/tasks/config/fd.yml @@ -1,4 +1,4 @@ - name: Set fd config ansible.builtin.set_fact: fd: - pkgs: "{{ pkgconfig.fd.pkgs[ansible_system] }}" + pkgs: "{{ pkgconfig.fd.pkgs[ansible_os_family] }}" diff --git a/tasks/config/ghostty.yml b/tasks/config/ghostty.yml index 6f4c4e1..2d83d5a 100644 --- a/tasks/config/ghostty.yml +++ b/tasks/config/ghostty.yml @@ -13,6 +13,7 @@ deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}" vers: "{{ pkgconfig.ghostty.version }}" pkg: "{{ pkgconfig.ghostty[ghostty.method] }}" + build_deps: "{{ pkgconfig.ghostty.build_deps[ansible_os_family] }}" - name: Set ghostty config for appimage install when: diff --git a/tasks/config/git.yml b/tasks/config/git.yml index 174d937..fdaba8e 100644 --- a/tasks/config/git.yml +++ b/tasks/config/git.yml @@ -3,4 +3,4 @@ - name: Set git config ansible.builtin.set_fact: git: - pkgs: "{{ pkgconfig.git.pkgs[ansible_system] }}" + pkgs: "{{ pkgconfig.git.pkgs[ansible_os_family] }}" diff --git a/tasks/config/hyprpolkitagent.yml b/tasks/config/hyprpolkitagent.yml index 9737658..114f37d 100644 --- a/tasks/config/hyprpolkitagent.yml +++ b/tasks/config/hyprpolkitagent.yml @@ -3,6 +3,6 @@ hyprpolkitagent: vers: "{{ pkgconfig.hyprpolkitagent.version }}" repo: "{{ pkgconfig.hyprpolkitagent.repo }}" - build_deps: "{{ pkgconfig.hyprpolkitagent.build_deps }}" + build_deps: "{{ pkgconfig.hyprpolkitagent.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprpolkitagent.build_installed_files }}" git_path: "{{ d_tempdir.path }}/hyprpolkitagent" diff --git a/tasks/config/packer.yml b/tasks/config/packer.yml index dba9f71..40d3dac 100644 --- a/tasks/config/packer.yml +++ b/tasks/config/packer.yml @@ -2,3 +2,6 @@ ansible.builtin.set_fact: packer: pkgs: "{{ pkgconfig.packer.pkgs[ansible_system] }}" + archive: + file: "packer_{{ pkgconfig.packer.version }}_linux_amd64.zip" + url: "{{ pkgconfig.packer.baseurl }}/packer/{{ pkgconfig.packer.version }}" diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index 2f799a2..83d477d 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -12,12 +12,15 @@ when: - ansible_system == 'Linux' block: - - name: Append alacritty to pkg_sys and pkg_cargo + - name: Append alacritty build_deps to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + alacritty.build_deps }}" + + - name: Append alacritty to pkg_cargo notify: - Depend cargo changed_when: true ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + alacritty.deps }}" pkg_cargo: "{{ pkg_cargo + [alacritty] }}" - name: Append alacritty to pkg_cask diff --git a/tasks/pkgs/ghostty.yml b/tasks/pkgs/ghostty.yml index f088039..3a1b3f9 100644 --- a/tasks/pkgs/ghostty.yml +++ b/tasks/pkgs/ghostty.yml @@ -15,14 +15,14 @@ block: - name: Append ghostty build deps to pkg_sys ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ghostty.deps }}" + pkg_sys: "{{ pkg_sys + ghostty.build_deps }}" - name: Append ghostty to pkg_src notify: - Depend zig changed_when: true ansible.builtin.set_fact: - pkg_src: "{{ pkg_src + ['ghostty'] }}" + pkg_src: "{{ pkg_src + [ghostty.pkg] }}" - name: Append ghostty to pkg_appimage when: @@ -42,13 +42,13 @@ - Depend terra repo changed_when: true ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['ghostty'] }}" + pkg_sys: "{{ pkg_sys + [ghostty.pkg] }}" - name: Append ghostty to pkg_cask when: - ghostty.method == 'brew' ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['ghostty'] }}" + pkg_cask: "{{ pkg_cask + [ghostty.pkg] }}" - name: Set ghostty_configured ansible.builtin.set_fact: diff --git a/tasks/pkgs/packer.yml b/tasks/pkgs/packer.yml index 4e0bdcc..92509da 100644 --- a/tasks/pkgs/packer.yml +++ b/tasks/pkgs/packer.yml @@ -17,12 +17,19 @@ - name: Append packer to pkg_sys when: - ansible_system == 'Linux' + - ansible_os_family != 'Alpine' notify: - Depend hashicorp repo changed_when: true ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + packer.pkgs }}" + - name: Append packer to pkg_archive + when: + - ansible_os_family == 'Alpine' + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['packer'] }}" + - name: Set packer_configured ansible.builtin.set_fact: packer_configured: true diff --git a/tasks/pkgs/uwsm.yml b/tasks/pkgs/uwsm.yml index b669fa0..685ce46 100644 --- a/tasks/pkgs/uwsm.yml +++ b/tasks/pkgs/uwsm.yml @@ -3,16 +3,16 @@ - name: Add uwsm when: - uwsm_configured is undefined + - ansible_os_family != 'Alpine' + - ansible_os_family != 'Darwin' block: - name: Load uwsm config - when: - - uwsm is undefined ansible.builtin.include_tasks: file: config/uwsm.yml - name: Append uwsm build_deps to pkg_sys ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + uwsm.build_deps + uswm.deps }}" + pkg_sys: "{{ pkg_sys + uwsm.build_deps + uwsm.deps }}" - name: Append uwsm to pkg_src ansible.builtin.set_fact: diff --git a/vars/pkgs/alacritty.yml b/vars/pkgs/alacritty.yml index 61866bd..85e4101 100644 --- a/vars/pkgs/alacritty.yml +++ b/vars/pkgs/alacritty.yml @@ -1,21 +1,28 @@ alacritty: version: 0.15.1 - RedHat: - build_deps: + build_deps: + RedHat: - cmake - - freetype-devel - fontconfig-devel + - freetype-devel + - g++ - libxcb-devel - libxkbcommon-devel - - g++ - Debian: - build_deps: + Debian: - cmake - - pkg-config - - libfreetype6-dev - libfontconfig1-dev + - libfreetype6-dev - libxcb-xfixes0-dev - libxkbcommon-dev + - pkg-config - python3 + Alpine: + - cmake + - fontconfig-dev + - freetype-dev + - g++ + - libxcb-dev + - libxkbcommon-dev + - pkgconf cask: - alacritty diff --git a/vars/pkgs/aquamarine.yml b/vars/pkgs/aquamarine.yml index b0cd496..ece0fbf 100644 --- a/vars/pkgs/aquamarine.yml +++ b/vars/pkgs/aquamarine.yml @@ -6,15 +6,26 @@ aquamarine: - hyprutils build_deps: RedHat: - - libseat-devel + - hwdata-devel + - libdisplay-info-devel + - libdrm-devel - libinput-devel + - libseat-devel + - mesa-libgbm-devel + - systemd-devel - wayland-devel - wayland-protocols-devel - - libdrm-devel - - mesa-libgbm-devel - - libdisplay-info-devel - - systemd-devel - - hwdata-devel + Alpine: + - build-base + - elogind-dev + - hwdata-dev + - libdisplay-info-dev + - libdrm-dev + - libinput-dev + - libseat-dev + - mesa-gbm + - wayland-dev + - wayland-protocols build_installed_files: - lib64/libaquamarine.so.0.7.2 - lib64/libaquamarine.so.6 diff --git a/vars/pkgs/bitwarden.yml b/vars/pkgs/bitwarden.yml index 3b7ff4b..2533419 100644 --- a/vars/pkgs/bitwarden.yml +++ b/vars/pkgs/bitwarden.yml @@ -10,5 +10,6 @@ bitwarden: brew: bitwarden method: Fedora: flatpak + Alpine: flatpak Ubuntu: snap MacOSX: brew diff --git a/vars/pkgs/broot.yml b/vars/pkgs/broot.yml index b196d23..c2b9361 100644 --- a/vars/pkgs/broot.yml +++ b/vars/pkgs/broot.yml @@ -9,4 +9,6 @@ broot: - libxcb-xfixes0-dev RedHat: - libxcb + Alpine: + - libxcb-dev Darwin: [] diff --git a/vars/pkgs/carapace.yml b/vars/pkgs/carapace.yml index b9a604f..acd1372 100644 --- a/vars/pkgs/carapace.yml +++ b/vars/pkgs/carapace.yml @@ -5,6 +5,8 @@ carapace: - carapace-bin Darwin: - carapace + Alpine: + - carapace repo: RedHat: name: carapace-yum @@ -14,3 +16,4 @@ carapace: repo: "deb [trusted=yes] https://apt.fury.io/rsteube/ /" name: carapace Darwin: {} + Alpine: {} diff --git a/vars/pkgs/clangd.yml b/vars/pkgs/clangd.yml index 3bf41c5..70e4201 100644 --- a/vars/pkgs/clangd.yml +++ b/vars/pkgs/clangd.yml @@ -6,3 +6,5 @@ clangd: - clangd-12 Darwin: - llvm + Alpine: + - clang19 diff --git a/vars/pkgs/fd.yml b/vars/pkgs/fd.yml index a2a2380..15aa4c1 100644 --- a/vars/pkgs/fd.yml +++ b/vars/pkgs/fd.yml @@ -2,5 +2,9 @@ fd: pkgs: Darwin: - fd - Linux: + RedHat: - fd-find + Debian: + - fd-find + Alpine: + - fd diff --git a/vars/pkgs/ghostty.yml b/vars/pkgs/ghostty.yml index 682691c..8b331c5 100644 --- a/vars/pkgs/ghostty.yml +++ b/vars/pkgs/ghostty.yml @@ -8,6 +8,9 @@ ghostty: RedHat: - gtk4-devel - libadwaita-devel + Alpine: + - gtk4.0-dev + - libadwaita-dev Darwin: [] archmap: arm64: aarch64 @@ -19,7 +22,10 @@ ghostty: - ghostty sys: - ghostty + src: + - ghostty methods: default: appimage + Alpine: src Fedora: sys MacOSX: cask diff --git a/vars/pkgs/git.yml b/vars/pkgs/git.yml index 8f4cce8..c53b86a 100644 --- a/vars/pkgs/git.yml +++ b/vars/pkgs/git.yml @@ -5,8 +5,17 @@ git: - git-delta - git-extras - git-lfs - Linux: + RedHat: - git - git-delta - git-email - git-lfs + Debian: + - git + - git-delta + - git-email + - git-lfs + Alpine: + - git + - git-email + - git-lfs diff --git a/vars/pkgs/hyprcursor.yml b/vars/pkgs/hyprcursor.yml index 31609d5..1dac4f7 100644 --- a/vars/pkgs/hyprcursor.yml +++ b/vars/pkgs/hyprcursor.yml @@ -9,6 +9,11 @@ hyprcursor: - libzip-devel - librsvg2-devel - tomlplusplus-devel + Alpine: + - cairo-dev + - libzip-dev + - librsvg-dev + - tomlpluplus-dev build_installed_files: - lib64/libhyprcursor.so.0.1.11 - lib64/libhyprcursor.so.0 diff --git a/vars/pkgs/hyprgraphics.yml b/vars/pkgs/hyprgraphics.yml index 6306d39..1d30a27 100644 --- a/vars/pkgs/hyprgraphics.yml +++ b/vars/pkgs/hyprgraphics.yml @@ -15,6 +15,15 @@ hyprgraphics: - file-devel - file-libs - libspng-devel + Alpine: + - pixman-dev + - cairo-dev + - libjpeg-turbo-dev + - libwebp-dev + - libjxl-dev + - file-dev + - file + - libspng-dev build_installed_files: - lib64/libhyprgraphics.so.0.1.2 - lib64/libhyprgraphics.so.0 diff --git a/vars/pkgs/hyprland.yml b/vars/pkgs/hyprland.yml index 6fd6700..6ea3cdf 100644 --- a/vars/pkgs/hyprland.yml +++ b/vars/pkgs/hyprland.yml @@ -42,8 +42,36 @@ hyprland: - xcb-util-errors-devel - xcb-util-renderutil-devel - xcb-util-wm-devel - - xcb-util-wm-devel - xorg-x11-server-Xwayland-devel + Alpine: + - build-base + - cairo-dev + - cmake + - dunst + - elogind-dev + - glslang-dev + - libdrm-dev + - libinput-dev + - libseat-dev + - libuuid + - libxcb-dev + - libxcursor-dev + - libxkbcommon-dev + - mesa-gbm + - meson + - pango-dev + - pixman-dev + - qt5-qtwayland-dev + - qt6-qtwayland-dev + - re2-dev + - tomlplusplus-dev + - vulkan-loader-dev + - wayland-dev + - wayland-protocols + - xcb-util-errors-dev + - xcb-util-renderutil-dev + - xcb-util-wm-dev + - xwayland-dev build_installed_files: - share/wayland-sessions/hyprland-uwsm.desktop - bin/hyprctl diff --git a/vars/pkgs/hyprland_protocols.yml b/vars/pkgs/hyprland_protocols.yml index 6f11d22..da2e3e1 100644 --- a/vars/pkgs/hyprland_protocols.yml +++ b/vars/pkgs/hyprland_protocols.yml @@ -5,6 +5,9 @@ hyprland_protocols: RedHat: - meson - ninja-build + Alpine: + - meson + - ninja-build build_installed_files: - share/hyprland-protocols/protocols - share/hyprland-protocols/protocols/hyprland-ctm-control-v1.xml diff --git a/vars/pkgs/hyprlang.yml b/vars/pkgs/hyprlang.yml index 0065816..5e88b29 100644 --- a/vars/pkgs/hyprlang.yml +++ b/vars/pkgs/hyprlang.yml @@ -4,6 +4,7 @@ hyprlang: pkg_deps: [] build_deps: RedHat: [] + Alpine: [] build_installed_files: - lib64/libhyprlang.so.0.6.0 - lib64/libhyprlang.so.2 diff --git a/vars/pkgs/hyprpolkitagent.yml b/vars/pkgs/hyprpolkitagent.yml index 83885da..8d66cdd 100644 --- a/vars/pkgs/hyprpolkitagent.yml +++ b/vars/pkgs/hyprpolkitagent.yml @@ -5,6 +5,9 @@ hyprpolkitagent: RedHat: - polkit-devel - polkit-qt6-1-devel + Alpine: + - polkit-dev + - polkit-qt6 build_installed_files: - libexec/hyprpolkitagent - lib/systemd/user/hyprpolkitagent.service diff --git a/vars/pkgs/hyprutils.yml b/vars/pkgs/hyprutils.yml index 1dfd72f..8b2e08a 100644 --- a/vars/pkgs/hyprutils.yml +++ b/vars/pkgs/hyprutils.yml @@ -4,6 +4,8 @@ hyprutils: build_deps: RedHat: - pixman-devel + Alpine: + - pixman-dev build_installed_files: - lib64/libhyprutils.so.0.5.1 - lib64/libhyprutils.so.4 diff --git a/vars/pkgs/hyprwayland_scanner.yml b/vars/pkgs/hyprwayland_scanner.yml index 7f1366b..6260827 100644 --- a/vars/pkgs/hyprwayland_scanner.yml +++ b/vars/pkgs/hyprwayland_scanner.yml @@ -4,6 +4,8 @@ hyprwayland_scanner: build_deps: RedHat: - pugixml-devel + Alpine: + - pugixml-dev build_installed_files: - bin/hyprwayland-scanner - lib64/pkgconfig/hyprwayland-scanner.pc diff --git a/vars/pkgs/neovide.yml b/vars/pkgs/neovide.yml index 9a2ea79..a33a99d 100644 --- a/vars/pkgs/neovide.yml +++ b/vars/pkgs/neovide.yml @@ -12,12 +12,17 @@ neovide: - "@Development Tools" - "@Development Libraries" Debian: - - fontconfig-devel - - freetype-devel + - fontconfig-dev + - freetype-dev - libX11-xcb - - libX11-devel + - libX11-dev - libstdc++-static - - libstdc++-devel - - "@Development Tools" - - "@Development Libraries" + - libstdc++-dev + Alpine: + - fontconfig-dev + - freetype-dev + - xcb-dev + - libx11-dev + - gcompat + - libstdc++-dev Darwin: [] diff --git a/vars/pkgs/packer.yml b/vars/pkgs/packer.yml index 49a6196..5402824 100644 --- a/vars/pkgs/packer.yml +++ b/vars/pkgs/packer.yml @@ -4,3 +4,6 @@ packer: - packer Darwin: - packer + version: 1.12.0 + archive: + baseurl: https://releases.hashicorp.com diff --git a/vars/pkgs/sdbus_cpp_2.yml b/vars/pkgs/sdbus_cpp_2.yml index 121bd34..13a0043 100644 --- a/vars/pkgs/sdbus_cpp_2.yml +++ b/vars/pkgs/sdbus_cpp_2.yml @@ -5,6 +5,8 @@ sdbus_cpp_2: build_deps: RedHat: - systemd-devel + Alpine: + - elogind-dev build_installed_files: - share/doc/sdbus-c++/sdbus-c++-class-diagram.png - share/doc/sdbus-c++/sdbus-c++-class-diagram.uml diff --git a/vars/pkgs/xdg_desktop_portal_hyprland.yml b/vars/pkgs/xdg_desktop_portal_hyprland.yml index 003e10b..0b82d6a 100644 --- a/vars/pkgs/xdg_desktop_portal_hyprland.yml +++ b/vars/pkgs/xdg_desktop_portal_hyprland.yml @@ -7,16 +7,21 @@ xdg_desktop_portal_hyprland: - hyprlang - hyprutils - hyprwayland_scanner - - hyprland build_deps: RedHat: - libdrm-devel - mesa-libgbm-devel - pipewire-devel - pipewire-libs - - sdbus-cpp-devel - wayland-devel - wayland-protocols-devel + Alpine: + - libdrm-dev + - mesa-gbm + - pipewire-dev + - pipewire-libs + - wayland-dev + - wayland-protocols build_installed_files: - bin/hyprland-share-picker - lib/xdg-desktop-portal-hyprland