From e4d32cbac1c80628a5b7800ce72df5aadc85593f Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Fri, 28 Feb 2025 17:29:51 -0700 Subject: [PATCH] more hyprland packages --- tasks/config/hyprlang.yml | 9 ++ tasks/pkgs/hyprlang.yml | 13 +++ tasks/src/hyprlang.yml | 58 +++++++++++ tests/test_not_local.yml | 203 +++++++++++++++++++------------------- vars/pkgs/aquamarine.yml | 2 +- vars/pkgs/hyprcursor.yml | 7 ++ vars/pkgs/hyprland.yml | 6 ++ vars/pkgs/hyprlang.yml | 7 ++ 8 files changed, 203 insertions(+), 102 deletions(-) create mode 100644 tasks/config/hyprlang.yml create mode 100644 tasks/pkgs/hyprlang.yml create mode 100644 tasks/src/hyprlang.yml create mode 100644 vars/pkgs/hyprcursor.yml create mode 100644 vars/pkgs/hyprlang.yml diff --git a/tasks/config/hyprlang.yml b/tasks/config/hyprlang.yml new file mode 100644 index 0000000..396f28a --- /dev/null +++ b/tasks/config/hyprlang.yml @@ -0,0 +1,9 @@ +- name: Set hyprlang config + ansible.builtin.set_fact: + hyprlang: + vers: "{{ pkgconfig.hyprlang.version }}" + repo: "{{ pkgconfig.hyprlang.repo }}" + pkg_deps: "{{ pkgconfig.hyprlang.pkg_deps }}" + build_deps: "{{ pkgconfig.hyrplang.build_deps[ansible_os_family] }}" + git_path: "{{ d_tempdir.path }}/hyprlang" + installed_files: "{{ pkgconfig.hyprlang.build_installed_files }}" diff --git a/tasks/pkgs/hyprlang.yml b/tasks/pkgs/hyprlang.yml new file mode 100644 index 0000000..7ce2efe --- /dev/null +++ b/tasks/pkgs/hyprlang.yml @@ -0,0 +1,13 @@ +- name: Ensure pkg_deps are added + loop: hyprlang.pkg_deps + loop_control: + loop_var: pkg_dep + vars: + pkg: "{{ pkg_dep }}" + ansible.builtin.include_tasks: + file: addpkg.yml + +- name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprlang'] }}" diff --git a/tasks/src/hyprlang.yml b/tasks/src/hyprlang.yml new file mode 100644 index 0000000..763d234 --- /dev/null +++ b/tasks/src/hyprlang.yml @@ -0,0 +1,58 @@ +- name: Remove existing install + when: + - hyprland_clean + become: "{{ ext_become }}" + loop: hyprlang.installed_files + loop_control: + loop_var: file + ansible.builtin.file: + state: absent + path: "{{ path.prefix }}/{{ file }}" + +- name: Build and install hyprlang + block: + - name: Clone git repository + ansible.builtin.git: + depth: 1 + dest: "{{ hyprlang.git_path }}" + repo: "{{ hyprlang.repo }}" + version: "{{ hyprlang.vers }}" + + - name: Configure hyprlang + ansible.builtin.command: + creates: "{{ hyprlang.git_path }}/build" + chdir: "{{ hyprlang.git_path }}" + argv: + - cmake + - --no-warn-unused-cli + - DCMAKE_BUILD_TYPE=Release + - -DCMAKE_INSTALL_PREFIX={{ path.prefix }} + - -S + - . + - -B + - ./build + + - name: Build hyprlang + ansible.builtin.command: + creates: "{{ hyprlang.git_path }}/build/hyprlang.pc" + chdir: "{{ hyprlang.git_path }}" + argv: + - cmake + - --build + - ./build + - --config + - Release + - --target + - all + - -j + - "{{ ansible_processor_nproc|int }}" + + - name: Install hyprlang + become: "{{ ext_become }}" + ansible.builtin.command: + creates: "{{ path.bin }}/hyprlang" + chdir: "{{ hyprlang.git_path }}" + argv: + - cmake + - --install + - ./build diff --git a/tests/test_not_local.yml b/tests/test_not_local.yml index d9efe82..8623b8d 100644 --- a/tests/test_not_local.yml +++ b/tests/test_not_local.yml @@ -2,107 +2,108 @@ - hosts: localhost vars: testpkgs: - - air - - alacritty - - ansible-language-server - - ansible-lint - - ansible - - bashls - - bat - - bitwarden - - blender - - broot - - btop - - buf - - bufls - - carapace - - cheat - - checkmake - - choose - - clangd - - cmake - - cmakelang - - commitlint-cli - - commitlint-config-conventional - - consul - - cssls - - curlie - - dbeaver - - direnv - - dockerls - - dotenv-linter - - duf - - dust - - editorconfig - - eslint - - eza - - fd - - firefox - - flatpak - - fzf - - ghostty - - git - - glow - - go - - godot - - gopls - - gping - - heroic - - htmlls - - htmx-lsp - - httpie - - hugo - - hyperfine - - intelephense - - jinja-lsp - - jq - - jsonls - - kitty - - lazygit - - libreoffice - - lua-language-server - - markdownlint-cli - - mcfly - - neovide - - neovim - - nerdfonts - - nextcloud - - nginxls - - nodejs - - nomad - - packer - - pandoc - - pgadmin - - pipx - - podman - - pyright - - python3 - - quobix-vacuum - - revive - - ripgrep - - rust - - sd - - sqlfluff - - sqlls - - starship - - stow - - tailscale - - tailwindcss-languageserver - - templ - - terraform - - terraformls - - thunderbird - - tidy - - tldr - - tmux - - vault - - xh - - yamlls - - zfs - - zig - - zls - - zoxide - - zsh + - hyprland + # - air + # - alacritty + # - ansible-language-server + # - ansible-lint + # - ansible + # - bashls + # - bat + # - bitwarden + # - blender + # - broot + # - btop + # - buf + # - bufls + # - carapace + # - cheat + # - checkmake + # - choose + # - clangd + # - cmake + # - cmakelang + # - commitlint-cli + # - commitlint-config-conventional + # - consul + # - cssls + # - curlie + # - dbeaver + # - direnv + # - dockerls + # - dotenv-linter + # - duf + # - dust + # - editorconfig + # - eslint + # - eza + # - fd + # - firefox + # - flatpak + # - fzf + # - ghostty + # - git + # - glow + # - go + # - godot + # - gopls + # - gping + # - heroic + # - htmlls + # - htmx-lsp + # - httpie + # - hugo + # - hyperfine + # - intelephense + # - jinja-lsp + # - jq + # - jsonls + # - kitty + # - lazygit + # - libreoffice + # - lua-language-server + # - markdownlint-cli + # - mcfly + # - neovide + # - neovim + # - nerdfonts + # - nextcloud + # - nginxls + # - nodejs + # - nomad + # - packer + # - pandoc + # - pgadmin + # - pipx + # - podman + # - pyright + # - python3 + # - quobix-vacuum + # - revive + # - ripgrep + # - rust + # - sd + # - sqlfluff + # - sqlls + # - starship + # - stow + # - tailscale + # - tailwindcss-languageserver + # - templ + # - terraform + # - terraformls + # - thunderbird + # - tidy + # - tldr + # - tmux + # - vault + # - xh + # - yamlls + # - zfs + # - zig + # - zls + # - zoxide + # - zsh tasks: - name: Test all packages with use_local=false ansible.builtin.include_role: diff --git a/vars/pkgs/aquamarine.yml b/vars/pkgs/aquamarine.yml index da45b5a..b26755e 100644 --- a/vars/pkgs/aquamarine.yml +++ b/vars/pkgs/aquamarine.yml @@ -2,7 +2,7 @@ aquamarine: version: v0.7.2 repo: https://github.com/hyprwm/aquamarine pkg_deps: - - hyprwayland-scanner + - hyprwayland_scanner - hyprutils build_deps: RedHat: diff --git a/vars/pkgs/hyprcursor.yml b/vars/pkgs/hyprcursor.yml new file mode 100644 index 0000000..4e00e31 --- /dev/null +++ b/vars/pkgs/hyprcursor.yml @@ -0,0 +1,7 @@ +hyprcursor: + version: + repo: https://github.com/hyprwm/hyprcursor + pkg_deps: [] + build_deps: + RedHat: [] + build_installed_file: [] diff --git a/vars/pkgs/hyprland.yml b/vars/pkgs/hyprland.yml index f40012c..cc81e19 100644 --- a/vars/pkgs/hyprland.yml +++ b/vars/pkgs/hyprland.yml @@ -2,6 +2,11 @@ hyprland: version: v0.47.2 repo: https://github.com/hyprwm/Hyprland pkg_deps: + - hyprwayland_scanner + - hyprutils + - hyprlang + - hyprcursor + - hyprgraphics - aquamarine build_deps: RedHat: @@ -27,3 +32,4 @@ hyprland: - xcb-util-renderutil-devel - xcb-util-wm-devel - xorg-x11-server-Xwayland-devel + build_installed_files: [] diff --git a/vars/pkgs/hyprlang.yml b/vars/pkgs/hyprlang.yml new file mode 100644 index 0000000..4e2ab13 --- /dev/null +++ b/vars/pkgs/hyprlang.yml @@ -0,0 +1,7 @@ +hyprlang: + version: v0.6.0 + repo: https://github.com/hyprwm/hyprlang + pkg_deps: [] + build_deps: + RedHat: [] + build_installed_files: []