more package fixes

tasks/config/go.yml

@@ -2,21 +2,20 @@
 ---
 - name: Set go configuration
   ansible.builtin.set_fact:
-    do_install_go: false # defaults to false to save on having to set facts needlessly
     go:
-      ver: "{{ pkgconfig.go.version }}"
       arch: "{{ pkgconfig_go.archmap[ansible_architecture] }}"
-      sys: "{{ ansible_system | lower }}"
       ext: "{{ pkgconfig.go.extmap[ansible_system] }}"
+      sys: "{{ ansible_system | lower }}"
+      vers: "{{ pkgconfig.go.version }}"
 
 - name: Set go composite facts
   ansible.builtin.set_fact:
     go:
-      ver: "{{ go.ver }}"
       arch: "{{ go.arch }}"
-      sys: "{{ go.sys }}"
-      ext: "{{ go.ext }}"
       archive: "go{{ go.ver }}.{{ go.sys }}-{{ go.arch }}.{{ pkgconfig_go.extmap[ansible_system] }}"
-      sum: "{{ pkgconfig.go.sums[go.ver][ansible_system][go.arch] }}"
+      ext: "{{ go.ext }}"
+      inst_path: "{{ path.install }}/go"
+      sum: "{{ pkgconfig.go.sums[go.vers][ansible_system][go.arch] }}"
+      sys: "{{ go.sys }}"
       url: "{{ pkgconfig.go.base_url }}/{{ go.archive }}"
-      inst_path: "{{ paths.install }}/go"
+      vers: "{{ go.vers }}"

tasks/config/neovim.yml

@@ -8,13 +8,16 @@
 - name: Set neovim config
   ansible.builtin.set_fact:
     neovim:
+      method: "{{ neovim.method }}"
       vers: "v{{ pkgconfig.neovim.version }}"
+      pkgs: "{{ pkgconfig.neovim.pkgs[ansible_distribution] | default(pkgconfig.neovim.pkgs.default) }}"
 
 - name: Set neovim config for appimage install
   when:
     - neovim.method == 'appimage'
   ansible.builtin.set_fact:
     neovim:
+      method: "{{ neovim.method }}"
       file: "nvim-linux-{{ ansible_architecture }}.appimage"
       link_name: nvim
       url: "{{ pkgconfig.neovim.appimage.base_url }}/{{ neovim.vers }}/nvim-linux-{{ ansible_architecture }}.appimage"

tasks/config/nerdfonts.yml

@@ -10,6 +10,6 @@
         - Lilex
         - Monoid
         - NerdFontsSymbolsOnly
-      install_path: "{{ path.prefix }}/{{ pkgconfig.nerdfonts.path }}"
+      path: "{{ pkgconfig.nerdfonts.path }}"
       base_url: "{{ pkgconfig.nerdfonts.base_url }}"
       force_install: "{{ pkgconfig.force_install_nerdfonts | default(false) }}"

tasks/config/nextcloud.yml

@@ -0,0 +1,13 @@
+- name: Set nextcloud install method
+  ansible.builtin.set_fact:
+    nextcloud:
+      method: "{{ pkgconfig.nextcloud.method | default('flatpak') }}"
+
+- name: Set nextcloud config
+  when:
+    - nextcloud.method == 'flatpak'
+  ansible.builtin.set_fact:
+    nextcloud:
+      method: "{{ nextcloud.method }}"
+      name: "{{ pkgconfig.nextcloud.flatpak.name }}"
+      remote: "{{ pkgconfig.nextcloud.flatpak.remote }}"