CYT-015 convert variable names to best-practice specification

roles/chromium/tasks/install.yml

@@ -6,7 +6,7 @@
   vars:
     apt_packages:
       - "{{ chromium_package_name }}"
-      - "{{ chromium_packages }}"
+      - "{{ chromium_shared_packages }}"
 
 - name: ensure chromium extension directory exists
   file:

roles/chromium/vars/main.yml

@@ -2,7 +2,7 @@
 
 chromium_package_name: chromium
 
-chromium_packages:
+chromium_shared_packages:
   - upower
   - opus-tools
   - speex

roles/clipmenu/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ clipmenu_packages }}"
+      - "{{ clipmenu_shared_packages }}"
 
 - name: ensure clipmenu is downloaded
   get_url:

roles/clipmenu/vars/main.yml

@@ -2,6 +2,8 @@
 
 clipmenu_bin_path: /usr/local/bin
 
-clipmenu_packages:
+clipmenu_shared_packages:
+  - rofi
+  # dmenu
   - suckless-tools
   - xsel

roles/dbeaver/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ dbeaver_required_packages }}"
+      - "{{ dbeaver_shared_packages }}"
 
 - name: ensure dbeaver deb path exists
   file:

roles/dbeaver/vars/main.yml

@@ -2,7 +2,7 @@
 
 dbeaver_package_name: dbeaver-ce
 
-dbeaver_required_packages:
+dbeaver_shared_packages:
   - openjdk-8-jre-headless
 
 dbeaver_deb: dbeaver-ce_latest_amd64.deb

roles/gimp/tasks/install.yml

@@ -13,7 +13,7 @@
   vars:
     apt_packages:
       - "{{ gimp_package_name }}"
-      - "{{ gimp_additional_packages }}"
+      - "{{ gimp_required_packages }}"
 
 - name: ensure gimp configuration directories exist
   file:

roles/gimp/tasks/uninstall.yml

@@ -7,7 +7,7 @@
     apt_state: absent
     apt_packages:
       - "{{ gimp_package_name }}"
-      - "{{ gimp_additional_packages }}"
+      - "{{ gimp_required_packages }}"
 
 - name: ensure gimp configuration directory is removed
   file:

roles/gimp/vars/main.yml

@@ -2,7 +2,7 @@
 
 gimp_package_name: gimp
 
-gimp_additional_packages:
+gimp_required_packages:
   #- gimp-dcraw (either dcraw or ufraw)
   - gimp-ufraw
 

roles/i3-utils-bin/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ i3_utils_bin_packages }}"
+      - "{{ i3_utils_bin_shared_packages }}"
 
 - name: ensure i3-utils-bin tools are downloaded
   get_url:
@@ -15,17 +15,7 @@
     force: yes
   become: yes
   with_items:
-    - system-hibernate
-    - system-reboot
-    - system-shutdown
-    - system-suspend
-    - xcolorpick
-    - ximage
-    - xkiller
-    - xlock
-    - xscreenshot
-    - xf86-audio
-    - xf86-backlight
+    - "{{ i3_utils_bin_tools }}"
 
 - name: ensure applications folder exist
   file:

roles/i3-utils-bin/tasks/uninstall.yml

@@ -6,17 +6,7 @@
     path: "/usr/local/bin/{{ item }}"
   become: yes
   with_items:
-    - system-hibernate
-    - system-reboot
-    - system-shutdown
-    - system-suspend
-    - xcolorpick
-    - ximage
-    - xkiller
-    - xlock
-    - xscreenshot
-    - xf86-audio
-    - xf86-backlight
+    - "{{ i3_utils_bin_tools }}"
 
 - name: ensure ximage desktop file is removed
   file:

roles/i3-utils-bin/vars/main.yml

@@ -1,6 +1,6 @@
 ---
 
-i3_utils_bin_packages:
+i3_utils_bin_shared_packages:
   - alsa-utils
   - dbus
   - exiv2
@@ -17,3 +17,17 @@ i3_utils_bin_packages:
   - x11-utils
   - xdotool
   - zenity
+
+# These tools will be downloaded to /usr/local/bin
+i3_utils_bin_tools:
+  - system-hibernate
+  - system-reboot
+  - system-shutdown
+  - system-suspend
+  - xcolorpick
+  - ximage
+  - xkiller
+  - xlock
+  - xscreenshot
+  - xf86-audio
+  - xf86-backlight

roles/i3-utils-systemd/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ i3_utils_systemd_packages }}"
+      - "{{ i3_utils_systemd_shared_packages }}"
 
 - name: ensure xlock is downloaded
   get_url:

roles/i3-utils-systemd/vars/main.yml

@@ -1,6 +1,6 @@
 ---
 
-i3_utils_systemd_packages:
+i3_utils_systemd_shared_packages:
   - alsa-utils
   - i3lock
   - imagemagick

roles/i3blocks-modules/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ i3blocks_modules_packages }}"
+      - "{{ i3blocks_modules_shared_packages }}"
 
 - name: ensure ./local/share directory exists
   file:

roles/i3blocks-modules/vars/main.yml

@@ -2,7 +2,7 @@
 
 i3blocks_modules_path: "{{ lookup('env','HOME') }}/.local/share/i3blocks-modules"
 
-i3blocks_modules_packages:
+i3blocks_modules_shared_packages:
   - acpi
   - bash
   - cpufrequtils

roles/libreoffice/tasks/install.yml

@@ -125,7 +125,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ libreoffice_required_packages }}"
+      - "{{ libreoffice_shared_packages }}"
 
 - name: ensure libreoffice wrapper is present
   template:

roles/libreoffice/vars/main.yml

@@ -3,7 +3,7 @@
 libreoffice_package_name: libreoffice6.0
 
 # Required for DPI wrapper
-libreoffice_required_packages:
+libreoffice_shared_packages:
   - x11-xserver-utils
 
 libreoffice_download_url: https://www.libreoffice.org/download/download/?type=deb-x86_64&version=6.0.0&lang=en-US

roles/lxdm/tasks/install.yml

@@ -5,8 +5,8 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ lxdm_packages }}"
       - lxdm
+      - "{{ lxdm_shared_packages }}"
 
 - name: ensure lxdm.conf is present
   template:

roles/lxdm/vars/main.yml

@@ -1,6 +1,4 @@
 ---
 
-lxdm_packages:
+lxdm_shared_packages:
   - librsvg2-2
-
-

roles/neovim/tasks/install.yml

@@ -6,7 +6,8 @@
   vars:
     apt_packages:
       - "{{ neovim_package_name }}"
-      - "{{ neovim_packages }}"
+      - "{{ neovim_shared_packages }}"
+      - "{{ neovim_exclusive_packages }}"
 
 - name: ensure neovim python packages are installed
   include_role:

roles/neovim/tasks/uninstall.yml

@@ -7,3 +7,4 @@
     apt_state: absent
     apt_packages:
       - "{{ neovim_package_name }}"
+      - "{{ neovim_exclusive_packages }}"

roles/neovim/vars/main.yml

@@ -5,9 +5,12 @@ neovim_package_name: neovim
 # Required packages:
 # https://neovim.io/doc/user/provider.html
 
-neovim_packages:
+neovim_shared_packages:
   - xsel
 
+neovim_exclusive_packages:
+  - lua-nvim
+
 neovim_pip2_packages:
   - neovim
 

roles/network-manager/tasks/install.yml

@@ -9,7 +9,7 @@
   vars:
     apt_packages:
       - "{{ network_manager_package_name }}"
-      - "{{ network_manager_additional_packages }}"
+      - "{{ network_manager_shared_packages }}"
 
 
 ###

roles/network-manager/tasks/uninstall.yml

@@ -7,7 +7,6 @@
     apt_state: absent
     apt_packages:
       - "{{ network_manager_package_name }}"
-      - "{{ network_manager_additional_packages }}"
       - "{{ network_manager_gnome_package }}"
       # Plugin packages
       - "{{ network_manager_plugin_package_openvpn }}"

roles/network-manager/vars/main.yml

@@ -2,11 +2,10 @@
 
 network_manager_package_name: network-manager
 
-network_manager_additional_packages:
+network_manager_shared_packages:
   - iputils-arping
   - isc-dhcp-client
   - wpasupplicant
-#  - network-manager-config-connectivity-debian
 
 # Required for nm-applet for passwords to be stored in gnome keyring
 network_manager_shared_gnome_packages:

roles/packer/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - unzip
+      - "{{ packer_shared_packages }}"
 
 - name: fetch packer info
   uri:

roles/packer/tasks/main.yml

@@ -1,12 +1,5 @@
 ---
 
-- name: ensure requirements are installed
-  include_role:
-    name: apt-meta
-  vars:
-    apt_packages:
-      - unzip
-
 - include_tasks: install.yml
   when: packer == 'install'
 

roles/packer/vars/main.yml

@@ -1,3 +1,6 @@
 ---
 
 packer_path: /usr/local/bin
+
+packer_shared_packages:
+  - unzip

roles/ranger/vars/main.yml

@@ -10,12 +10,12 @@ ranger_shared_packages:
   # provides pdftotext
   - poppler-utils
   - w3m
+  - w3m-img
 
 ranger_exclusive_packages:
   # provides img2txt
   - caca-utils
   - odt2txt
-  - w3m-img
 
 ranger_python2_packages:
   - python-chardet

roles/sxiv/tasks/install.yml

@@ -5,8 +5,8 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ sxiv_package }}"
-      - "{{ sxiv_packages }}"
+      - "{{ sxiv_package_name }}"
+      - "{{ sxiv_shared_packages }}"
 
 - name: ensure sxiv wrapper is downloaded
   get_url:

roles/sxiv/tasks/uninstall.yml

@@ -6,7 +6,7 @@
   vars:
     apt_state: absent
     apt_packages:
-      - "{{ sxiv_package }}"
+      - "{{ sxiv_package_name }}"
 
 - name: ensure sxiv wrapper is removed
   file:

roles/sxiv/vars/main.yml

@@ -1,7 +1,7 @@
 ---
 
-sxiv_package: sxiv
-sxiv_packages:
+sxiv_package_name: sxiv
+sxiv_shared_packages:
   - exiv2
 
 sxiv_wrapper_name: sxiv-wrapper.sh

roles/telegram/tasks/install.yml

@@ -6,7 +6,7 @@
   vars:
     apt_packages:
       - xz-utils
-      - "{{ telegram_required_packages }}"
+      - "{{ telegram_shared_packages }}"
 
 - name: ensure opt directory exists
   file:

roles/telegram/vars/main.yml

@@ -4,5 +4,5 @@ telegram_download_url: https://telegram.org/dl/desktop/linux
 telegram_opt_path: /opt
 telegram_bin_path: /usr/local/bin
 
-telegram_required_packages:
+telegram_shared_packages:
   - pulseaudio

roles/thunar-custom-actions/tasks/install.yml

@@ -5,7 +5,7 @@
     name: apt-meta
   vars:
     apt_packages:
-      - "{{ thunar_custom_actions_packages }}"
+      - "{{ thunar_custom_actions_shared_packages }}"
 
 - name: ensure thunar custom actions are downloaded
   get_url:

roles/thunar-custom-actions/vars/main.yml

@@ -2,7 +2,7 @@
 
 thunar_custom_actions_bin_path: /usr/local/bin/
 
-thunar_custom_actions_packages:
+thunar_custom_actions_shared_packages:
   - curl
   - ffmpeg
   - gawk