clean up, refactor, documentation

- reducing amount of splitting in configs
- documenting configuration

vars/alacritty.yml

@@ -1,15 +1,16 @@
 ---
 version: 0.15.0
-RedHat:
-  build_deps:
+
+# variables that aren't really configuration
+build_deps:
+  RedHat:
     - cmake
     - freetype-devel
     - fontconfig-devel
     - libxcb-devel
     - libxkbcommon-devel
     - g++
-Debian:
-  build_deps:
+  Debian:
     - cmake
     - pkg-config
     - libfreetype6-dev

vars/carapace.yml

@@ -1,8 +1,8 @@
 ---
 version: 1.1.1
-Linux:
-  pkgs:
+
+pkgs:
+  Linux:
     - carapace-bin
-Darwin:
-  pkgs:
+  Darwin:
     - carapace

vars/consul.yml

@@ -1,5 +0,0 @@
----
-Linux:
-  pkg: consul
-Darwin:
-  pkg: hashicorp/tap/consul

vars/git.yml

@@ -1,11 +1,10 @@
-Darwin:
-  pkgs:
+pkgs:
+  Darwin:
     - git
     - git-delta
     - git-extras
     - git-lfs
-Linux:
-  pkgs:
+  Linux:
     - git
     - git-delta
     - git-email

vars/go.yml

@@ -1,13 +1,8 @@
 ---
 version: 1.23.5
 install_path: /usr/local
-archmap:
-  arm64: arm64
-  aarch64: arm64
-  x86_64: amd64
-extmap:
-  Darwin: pkg
-  Linux: tar.gz
+
+# checksums by version and ansible_system
 1.23.5:
   Darwin:
     arm64: sha256:f819ed94939e08a5016b9a607ec84ebbde6cb3fe59750c59d97aa300c3fd02df
@@ -15,3 +10,12 @@ extmap:
   Linux:
     amd64: sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
     arm64: sha256:47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0
+
+# maps used in variables
+archmap:
+  arm64: arm64
+  aarch64: arm64
+  x86_64: amd64
+extmap:
+  Darwin: pkg
+  Linux: tar.gz

vars/hashicorp_repo.yml

@@ -1,10 +1,10 @@
 ---
 Linux:
-  RedHat:
+  RedHat: &redhat
     repo: https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
-  Fedora:
+  Fedora: &fedora
     repo: https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
-  Debian:
+  Debian: &debian
     repo: "deb [arch={{ ansible_architecture }} signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main"
 consul:
   Linux: consul

vars/kitty.yml

@@ -1,7 +1,6 @@
-Darwin:
-  pkgs:
+pkgs:
+  Darwin:
     - kitty
-Linux:
-  pkgs:
+  Linux:
     - kitty
     - kitty-shell-integration

vars/main.yml

@@ -1,8 +1,13 @@
 # variables used in ansible_role_package
 ---
-assume_missing_is_syspkg: false
+assume_missing_is_syspkg: true
 full_upgrade: false
 install_state: present
+default_confg:
+  install_prefix: /usr/local
+  become: true
+  owner: root
+  group: root
 
 # install lists
 brewtaps: []
@@ -16,14 +21,17 @@ srcpkgs: []
 syspkgs: []
 tappkgs: []
 
-# namespaced package variables
+# pkgconfig, loaded from .yml files in vars
+# and combined. Configuration can be changed
+# when running the role by specifying
+# pkgconfig.<pkgname> as a dict
 pkgconfig:
   alacritty: {}
   carapace: {}
   consul: {}
   git: {}
   go: {}
-  hashicorp_repo: {}
+  hashicorp: {}
   kitty: {}
   neovide: {}
   neovim: {}

vars/neovide.yml

@@ -1,9 +1,13 @@
 ---
 version: 0.14.0
 install_prefix: /usr/local
-RedHat:
-  pkgdeps:
-    - cargo
+
+#required variables
+git_repo: https://github.com/neovide/neovide.git
+local_deps:
+  - rust
+pkgdeps:
+  RedHat:
     - fontconfig-devel
     - freetype-devel
     - libX11-xcb
@@ -12,9 +16,7 @@ RedHat:
     - libstdc++-devel
     - "@Development Tools"
     - "@Development Libraries"
-Debian:
-  pkgdeps:
-    - cargo
+  Debian:
     - fontconfig-devel
     - freetype-devel
     - libX11-xcb

vars/neovim.yml

@@ -1,8 +1,12 @@
 ---
-version: latest
+version: v0.10.3
 install_prefix: /usr/local
 install_dir: /opt/nvim
-Linux:
-  appimage:
-    dl: https://github.com/neovim/neovim/releases/latest/download/nvim.appimage
-    checksum: https://github.com/neovim/neovim/releases/download/latest/nvim.appimage.sha256sum
+use_appimage: true
+use_syspkg: true
+build_type: Release
+become: true
+git_repo: https://github.com/neovim/neovim
+appimage_url_pfx: https://github.com/neovim/neovim/releases/download
+owner: root
+group: root

vars/nerdfonts.yml

@@ -1,15 +1,148 @@
 ---
+install:
+  - CascadiaCode
+  - FiraCode
+  - Hasklig
+  - Lilex
+  - Monoid
+  - NerdFontsSymbolsOnly
+system_install: false
+
+#mapping of fonts
 fonts:
-  - name: CascadiaCode
-    brew: caskaydia-cove
-  - name: FiraCode
-    brew: fira-code
-  - name: Hasklig
+  0xProto:
+    brew: font-0xproto-nerd-font
+  "3270":
+    brew: font-3270-nerd-font
+  Agave:
+    brew: font-agave-nerd-font
+  AnonymousPro:
+    brew: font-anonymice-nerd-font
+  Arimo:
+    brew: font-arimo-nerd-font
+  AurulentSansMono:
+    brew: font-aurulent-sans-mono-nerd-font
+  BigBlueTerminal:
+    brew: font-bigblue-terminal-nerd-font
+  BitstreamVeraSansMono:
+    brew: font-bitstream-vera-sans-mono-nerd-font
+  IBMPlexMono:
+    brew: font-blex-mono-nerd-font
+  CascadiaCode:
+    brew: font-caskaydia-cove-nerd-font
+  CascadiaMono:
+    brew: font-caskaydia-mono-nerd-font
+  CodeNewRoman:
+    brew: font-code-new-roman-nerd-font
+  ComicShannsMono:
+    brew: font-comic-shanns-mono-nerd-font
+  CommitMono:
+    brew: font-commit-mono-nerd-font
+  Cousine:
+    brew: font-cousine-nerd-font
+  D2Coding:
+    brew: font-d2coding-nerd-font
+  DaddyTimeMono:
+    brew: font-daddy-time-mono-nerd-font
+  DejaVuSansMono:
+    brew: font-dejavu-sans-mono-nerd-font
+  DepartureMono:
+    brew: font-departure-mono-nerd-font
+  DroidSansMono:
+    brew: font-droid-sans-mono-nerd-font
+  EnvyCodeR:
+    brew: font-envy-code-r-nerd-font
+  FantasqueSansMono:
+    brew: font-fantasque-sans-mono-nerd-font
+  FiraCode:
+    brew: font-fira-code-nerd-font
+  FiraMono:
+    brew: font-fira-mono-nerd-font
+  GeistMono:
+    brew: font-geist-mono-nerd-font
+  Go-Mono:
+    brew: font-go-mono-nerd-font
+  Gohu:
+    brew: font-gohufont-nerd-font
+  Hack:
+    brew: font-hack-nerd-font
+  Hasklig:
     brew: hasklug
-  - name: Lilex
-    brew: lilex
-  - name: Monoid
-    brew: monoid
-  - name: NerdFontsSymbolsOnly
+  HeavyData:
+    brew: font-heavy-data-nerd-font
+  Hermit:
+    brew: font-hurmit-nerd-font
+  IA-Writer:
+    brew: font-im-writing-nerd-font
+  InconsolataGo:
+    brew: font-inconsolata-go-nerd-font
+  InconsolataLGC:
+    brew: font-inconsolata-lgc-nerd-font
+  Inconsolata:
+    brew: font-inconsolata-nerd-font
+  IntelOneMono:
+    brew: font-intone-mono-nerd-font
+  Iosevka:
+    brew: font-iosevka-nerd-font
+  IosevkaTerm:
+    brew: font-iosevka-term-nerd-font
+  IosevkaTermSlab:
+    brew: font-iosevka-term-slab-nerd-font
+  JetBrainsMono:
+    brew: font-jetbrains-mono-nerd-font
+  Lekton:
+    brew: font-lekton-nerd-font
+  LiberationMono:
+    brew: font-liberation-nerd-font
+  Lilex:
+    brew: font-lilex-nerd-font
+  MPlus:
+    brew: font-m+-nerd-font
+  MartianMono:
+    brew: font-martian-mono-nerd-font
+  Meslo:
+    brew: font-meslo-lg-nerd-font
+  Monaspace:
+    brew: font-monaspace-nerd-font
+  Monofur:
+    brew: font-monofur-nerd-font
+  Mononoki:
+    brew: font-mononoki-nerd-font
+  Monoid:
+    brew: font-monoid-nerd-font
+  NerdFontsSymbolsOnly:
     brew: symbols-only
-nerdfonts_system_install: false
+  Noto:
+    brew: font-noto-nerd-font
+  OpenDyslexic:
+    brew: font-open-dyslexic-nerd-font
+  Overpass:
+    brew: font-overpass-nerd-font
+  ProFont:
+    brew: font-profont-nerd-font
+  ProggyClean:
+    brew: font-proggy-clean-tt-nerd-font
+  Recursive:
+    brew: font-recursive-mono-nerd-font
+  RobotoMono:
+    brew: font-roboto-mono-nerd-font
+  SourceCodePro:
+    brew: font-sauce-code-pro-nerd-font
+  ShareTechMono:
+    brew: font-shure-tech-mono-nerd-font
+  SpaceMono:
+    brew: font-space-mono-nerd-font
+  Terminus:
+    brew: font-terminess-ttf-nerd-font
+  Tinos:
+    brew: font-tinos-nerd-font
+  UbuntuMono:
+    brew: font-ubuntu-mono-nerd-font
+  Ubuntu:
+    brew: font-ubuntu-nerd-font
+  UbuntuSans:
+    brew: font-ubuntu-sans-nerd-font
+  VictorMono:
+    brew: font-victor-mono-nerd-font
+  ZedMono:
+    brew: font-zed-mono-nerd-font

vars/rust.yml

@@ -1,7 +1,7 @@
-Darwin:
-  pkgs:
+rustup_managed: false
+pkgs:
+  Darwin:
     - rust
-Linux:
-  pkgs:
+  Linux:
     - rustc
     - cargo