From 4e65d36b6465f01d5f5516306f17dc019e683095 Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Wed, 4 Feb 2026 15:05:05 -0700
Subject: [PATCH] more work being done

---
 tasks/config/alacritty.yml  | 18 --------------
 tasks/config/aquamarine.yml | 10 --------
 tasks/pkgs/ansible_ls.yml   | 12 ++++++++--
 tasks/src/aquamarine.yml    | 48 -------------------------------------
 vars/main.yml               |  5 ++++
 vars/pkglist.yml            |  3 +++
 6 files changed, 18 insertions(+), 78 deletions(-)
 delete mode 100644 tasks/config/alacritty.yml
 delete mode 100644 tasks/config/aquamarine.yml
 delete mode 100644 tasks/src/aquamarine.yml

diff --git a/tasks/config/alacritty.yml b/tasks/config/alacritty.yml
deleted file mode 100644
index 6aba863..0000000
--- a/tasks/config/alacritty.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Set alacritty install method
-  ansible.builtin.set_fact:
-    alacritty:
-      method: "{{ pkgconfig.alacritty.method[ansible_os_family] | default(pkgconfig.alacritty.method.default) }}"
-
-- name: Set alacritty configuration
-  when:
-    - alacritty.method == 'cargo'
-  ansible.builtin.set_fact:
-    alacritty:
-      method: "{{ alacritty.method }}"
-      build_deps: "{{ srcconfig.alacritty.deps[ansible_os_family] }}"
-      cargo:
-        vers: "{{ pkgconfig.alacritty.version }}"
-        locked: true
-        name: alacritty
diff --git a/tasks/config/aquamarine.yml b/tasks/config/aquamarine.yml
deleted file mode 100644
index 4b47447..0000000
--- a/tasks/config/aquamarine.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Set aquamarine config
-  ansible.builtin.set_fact:
-    aquamarine:
-      bin: aquamarine
-      build_deps: "{{ srcconfig.aquamarine.deps[ansible_os_family] }}"
-      clean: "{{ pkgconfig_hyprland_clean | default(package_default_clean_src) }}"
-      pkg_deps: "{{ pkgconfig.aquamarine.pkg_deps }}"
-      vers: "{{ pkgconfig.aquamarine.version }}"
diff --git a/tasks/pkgs/ansible_ls.yml b/tasks/pkgs/ansible_ls.yml
index 159eda3..165d51e 100644
--- a/tasks/pkgs/ansible_ls.yml
+++ b/tasks/pkgs/ansible_ls.yml
@@ -2,12 +2,20 @@
 ---
 - name: Add ansible_ls
   when:
-    - ansible_ls_configured is undefined
+    - __ansible_ls_configured is undefined
   block:
+    - name: Set ansible_ls install method
+      when:
+        - ansible_ls_install_method is undefined
+      ansible.builtin.set_fact:
+        ansible_ls_install_method: "{% if install_method in ansible_ls_install_methods %}{{ install_method }}{% else %}{{ ansible_ls_install_methods[0] }}{% endif %}"
+
     - name: Append ansible-language-server to pkg_npm
       ansible.builtin.set_fact:
         pkg_npm: "{{ pkg_npm + ['@ansible/ansible-language-server'] }}"
 
     - name: Set ansible_ls_configured
+      when:
+        - __ansible_ls_configured is undefined
       ansible.builtin.set_fact:
-        ansible_ls_configured: true
+        __ansible_ls_configured: true
diff --git a/tasks/src/aquamarine.yml b/tasks/src/aquamarine.yml
deleted file mode 100644
index 8a07f9b..0000000
--- a/tasks/src/aquamarine.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- name: Remove existing install {{ pkg }}
-  when:
-    - aquamarine.clean
-  vars:
-    file_list: "{{ srcconfig.aquamarine.build_installed_files }}"
-  ansible.builtin.include_tasks:
-    file: helpers/clean_install.yml
-
-- name: Check for installed {{ pkg }}
-  register: stat_aquamarine_inst
-  ansible.builtin.stat:
-    path: "{{ hyprland.prefix }}/{{ lib_path }}/libaquamarine.so"
-
-- name: Build and install {{ pkg }}
-  when:
-    - not stat_aquamarine_inst.stat.exists
-  block:
-    - name: Do repo clone {{ pkg }}
-      vars:
-        src_pkg: aquamarine
-        src_path: "{{ srcconfig.aquamarine.src_path }}"
-        src_gitrepo: "{{ srcconfig.aquamarine.gitrepo }}"
-        src_version: "{{ aquamarine.vers }}"
-      ansible.builtin.include_tasks:
-        file: helpers/git.yml
-
-    - name: Apply patch for alpine linux {{ pkg }}
-      when:
-        - ansible_os_family == 'Alpine'
-      ansible.posix.patch:
-        basedir: "{{ aquamarine.git_path }}"
-        src: aquamarine/Alpine.patch
-        state: present
-        strip: 1
-
-    - name: Do build and install {{ pkg }}
-      vars:
-        do_become: true
-        src_path: "{{ srcconfig.aquamarine.src_path }}"
-        configure: "{{ srcconfig.aquamarine.configure }}"
-        build_creates: "{{ srcconfig.aquamarine.build_creates }}"
-        build: "{{ srcconfig.aquamarine.build }}"
-        install_creates: "{{ srcconfig.aquamarine.install_creates }}"
-        install: "{{ srcconfig.aquamarine.install }}"
-      ansible.builtin.include_tasks:
-        file: helpers/cmake_build.yml
diff --git a/vars/main.yml b/vars/main.yml
index ff22eee..cf76903 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -121,6 +121,11 @@ alacritty_build_deps:
     - python3
     - desktop-file-utils
 # }}}
+# {{{ ansible_ls
+ansible_ls_version: latest
+ansible_ls_pkg_deps:
+  - pkgs/npm.yml
+# }}}
 # go {{{
 go_archive_version: 1.25.6
 go_archive_archmap:
diff --git a/vars/pkglist.yml b/vars/pkglist.yml
index 67b3714..19efa4a 100644
--- a/vars/pkglist.yml
+++ b/vars/pkglist.yml
@@ -15,6 +15,9 @@ ansible_lint_install_methods:
   - system
 ansible_install_methods:
   - system
+ansible_ls_install_methods:
+  - source
+  - system
 aquamarine_install_methods:
   - source
 git_install_methods: