From 3df63f1451de1c478f0fa9504c95d192d5fa4dd4 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Wed, 11 Feb 2026 10:50:48 -0700 Subject: [PATCH] go_install helper now being used --- tasks/helpers/go_install.yml | 10 +-- tasks/main.yml | 9 +- tasks/pkgs/air.yml | 9 +- tasks/pkgs/alacritty.yml | 11 ++- tasks/pkgs/nerdfonts.yml | 5 -- vars/nerdfonts.yml | 163 --------------------------------- vars/pkglist.yml | 169 +++++++++++++++++++++++++++++++++++ 7 files changed, 190 insertions(+), 186 deletions(-) delete mode 100644 vars/nerdfonts.yml diff --git a/tasks/helpers/go_install.yml b/tasks/helpers/go_install.yml index 38b99c6..b380732 100644 --- a/tasks/helpers/go_install.yml +++ b/tasks/helpers/go_install.yml @@ -1,17 +1,15 @@ # vim: set filetype=yaml.ansible : --- -- name: Install go packages +- name: Install go package "{{ pkg.url }}" become: "{{ install_become }}" + become_user: "{{ install_become_user }}" environment: GOBIN: "{{ path_bin }}" GOROOT: "{{ path_go }}" PATH: "{{ path_go }}/bin:$PATH" - loop: pkg_go - loop_control: - loop_var: current ansible.builtin.command: - creates: "{{ current.bin }}" + creates: "{{ pkg.bin }}" argv: - go - install - - "{{ current.url }}" + - "{{ pkg.url }}" diff --git a/tasks/main.yml b/tasks/main.yml index 751f35a..c2937d6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -41,11 +41,6 @@ ansible.builtin.include_vars: file: pkglist.yml -- name: Load nerdfonts list - ansible.builtin.include_vars: - file: nerdfonts.yml - name: __nerdfonts - - name: Add needed packages for Fedora when: - ansible_facts["distribution"] == 'Fedora' @@ -209,11 +204,11 @@ - pkg_go|length > 0 block: - name: Install go pkgs - loop: "{{ pkg_go | unique }}" + loop: "{{ pkg_go }}" loop_control: loop_var: pkg ansible.builtin.include_tasks: - file: go.yml + file: helpers/go_install.yml - name: Install local npm packages when: diff --git a/tasks/pkgs/air.yml b/tasks/pkgs/air.yml index 11ebce5..3897380 100644 --- a/tasks/pkgs/air.yml +++ b/tasks/pkgs/air.yml @@ -2,7 +2,8 @@ # Package: air # Description: application auto reload for go # Version: latest -# Methods: source (go install) +# Methods: +# - source (go install) # Helpers: go_install --- # {{{ Configure air @@ -14,7 +15,7 @@ when: - air_install_method is undefined ansible.builtin.set_fact: - air_install_method: "{% if install_method in air_install_methods %}{{ install_method }}{% else %}{{ air_install_method[0] }}{% endif %}" + air_install_method: "{{ install_method if install_method in air_install_methods else air_install_methods[0] }}" - name: Configure air source install when: @@ -33,9 +34,9 @@ - name: Clean existing air install when: - clean_install - loop: air_build_files + loop: "{{ air_build_files }}" loop_control: - lopo_var: air_file + loop_var: air_file ansible.builtin.file: state: absent path: "{{ install_prefix }}/{{ air_file }}" diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index dda3f48..9d5627e 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -1,6 +1,15 @@ # vim: set filetype=yaml.ansible : +# Package: alacritty +# Description: GPU accelerated terminal emulator written in rust +# Version: v0.16.1 +# Methods: +# - system +# - source (cargo build) +# Helpers: +# - cargo_build --- -- name: Configure alacritty # {{{ + # {{{ pre install configuration +- name: Configure alacritty when: - "'alacritty' not in __configured" block: diff --git a/tasks/pkgs/nerdfonts.yml b/tasks/pkgs/nerdfonts.yml index 5a509e5..2672056 100644 --- a/tasks/pkgs/nerdfonts.yml +++ b/tasks/pkgs/nerdfonts.yml @@ -4,11 +4,6 @@ when: - "'nerdfonts' not in __configured" block: - - name: Load nerdfonts list - ansible.builtin.include_vars: - file: nerdfonts.yml - name: __nerdfonts - - name: Create nerdfonts directories become: "{{ install_become }}" become_user: "{{ install_become_user }}" diff --git a/vars/nerdfonts.yml b/vars/nerdfonts.yml deleted file mode 100644 index a3a68cb..0000000 --- a/vars/nerdfonts.yml +++ /dev/null @@ -1,163 +0,0 @@ -0xProto: - brew: font-0xproto-nerd-font -"3270": - brew: font-3270-nerd-font -Agave: - brew: font-agave-nerd-font -AnonymicePro: - archive: AnonymousPro - brew: font-anonymice-nerd-font -Arimo: - brew: font-arimo-nerd-font -AurulentSansM: - archive: AurulentSansMono - brew: font-aurulent-sans-mono-nerd-font -BigBlueTerm: - archive: BigBlueTerminal - brew: font-bigblue-terminal-nerd-font -BitstromWera: - archive: BitstreamVeraSansMono - brew: font-bitstream-vera-sans-mono-nerd-font -BlexMono: - archive: IBMPlexMono - brew: font-blex-mono-nerd-font -CaskaydiaCove: - archive: CascadiaCode - brew: font-caskaydia-cove-nerd-font -CaskaydiaMono: - archive: 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 -D2CodingLigature: - archive: D2Coding - brew: font-d2coding-nerd-font -DaddyTimeMono: - brew: font-daddy-time-mono-nerd-font -DejaVuSansM: - archive: DejaVuSansMono - brew: font-dejavu-sans-mono-nerd-font -DepartureMono: - brew: font-departure-mono-nerd-font -DroidSansM: - archive: DroidSansMono - brew: font-droid-sans-mono-nerd-font -EnvyCodeR: - brew: font-envy-code-r-nerd-font -FantasqueSansM: - archive: 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 -GoMono: - archive: Go-Mono - brew: font-go-mono-nerd-font -GohuFont: - archive: Gohu - brew: font-gohufont-nerd-font -Hack: - brew: font-hack-nerd-font -Hasklug: - archive: Hasklig - brew: font-hasklug-nerd-font -HeavyData: - brew: font-heavy-data-nerd-font -Hurmit: - archive: Hermit - brew: font-hurmit-nerd-font -iMWriting: - archive: IA-Writer - brew: font-im-writing-nerd-font -Inconsolata: - brew: font-inconsolata-nerd-font -InconsolataGo: - brew: font-inconsolata-go-nerd-font -InconsolataLGC: - brew: font-inconsolata-lgc-nerd-font -IntoneMono: - archive: 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 -LiterationMono: - archive: LiberationMono - brew: font-liberation-nerd-font -Lilex: - brew: font-lilex-nerd-font -MartianMono: - brew: font-martian-mono-nerd-font -MesloLG: - archive: Meslo - brew: font-meslo-lg-nerd-font -Monaspice: - archive: Monaspace - brew: font-monaspace-nerd-font -Monofur: - brew: font-monofur-nerd-font -Monoid: - brew: font-monoid-nerd-font -Mononoki: - brew: font-mononoki-nerd-font -M+: - archive: MPlus - brew: font-m+-nerd-font -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 -RecMono: - archive: Recursive - brew: font-recursive-mono-nerd-font -RobotoMono: - brew: font-roboto-mono-nerd-font -ShureTechMono: - archive: ShareTechMono - brew: font-shure-tech-mono-nerd-font -SauceCodePro: - archive: SourceCodePro - brew: font-sauce-code-pro-nerd-font -SpaceMono: - brew: font-space-mono-nerd-font -Symbols: - archive: NerdFontsSymbolsOnly - brew: font-symbols-only-nerd-font -Terminess: - archive: Terminus - brew: font-terminess-ttf-nerd-font -Tinos: - brew: font-tinos-nerd-font -Ubuntu: - brew: font-ubuntu-nerd-font -UbuntuMono: - brew: font-ubuntu-mono-nerd-font -UbuntuSans: - brew: font-ubuntu-sans-nerd-font -VictorMono: - brew: font-victor-mono-nerd-font -ZedMono: - brew: font-zed-mono-nerd-font -base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download diff --git a/vars/pkglist.yml b/vars/pkglist.yml index 19efa4a..641fff0 100644 --- a/vars/pkglist.yml +++ b/vars/pkglist.yml @@ -27,6 +27,175 @@ go_install_methods: - system hyprland_install_methods: - source +nerdfonts_install_methods: + - archive + - system yazi_install_methods: - source - cargo + +## Package specific configuration that never need to be set by the installer +__nerdfonts: + 0xProto: + brew: font-0xproto-nerd-font + "3270": + brew: font-3270-nerd-font + Agave: + brew: font-agave-nerd-font + AnonymicePro: + archive: AnonymousPro + brew: font-anonymice-nerd-font + Arimo: + brew: font-arimo-nerd-font + AurulentSansM: + archive: AurulentSansMono + brew: font-aurulent-sans-mono-nerd-font + BigBlueTerm: + archive: BigBlueTerminal + brew: font-bigblue-terminal-nerd-font + BitstromWera: + archive: BitstreamVeraSansMono + brew: font-bitstream-vera-sans-mono-nerd-font + BlexMono: + archive: IBMPlexMono + brew: font-blex-mono-nerd-font + CaskaydiaCove: + archive: CascadiaCode + brew: font-caskaydia-cove-nerd-font + CaskaydiaMono: + archive: 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 + D2CodingLigature: + archive: D2Coding + brew: font-d2coding-nerd-font + DaddyTimeMono: + brew: font-daddy-time-mono-nerd-font + DejaVuSansM: + archive: DejaVuSansMono + brew: font-dejavu-sans-mono-nerd-font + DepartureMono: + brew: font-departure-mono-nerd-font + DroidSansM: + archive: DroidSansMono + brew: font-droid-sans-mono-nerd-font + EnvyCodeR: + brew: font-envy-code-r-nerd-font + FantasqueSansM: + archive: 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 + GoMono: + archive: Go-Mono + brew: font-go-mono-nerd-font + GohuFont: + archive: Gohu + brew: font-gohufont-nerd-font + Hack: + brew: font-hack-nerd-font + Hasklug: + archive: Hasklig + brew: font-hasklug-nerd-font + HeavyData: + brew: font-heavy-data-nerd-font + Hurmit: + archive: Hermit + brew: font-hurmit-nerd-font + iMWriting: + archive: IA-Writer + brew: font-im-writing-nerd-font + Inconsolata: + brew: font-inconsolata-nerd-font + InconsolataGo: + brew: font-inconsolata-go-nerd-font + InconsolataLGC: + brew: font-inconsolata-lgc-nerd-font + IntoneMono: + archive: 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 + LiterationMono: + archive: LiberationMono + brew: font-liberation-nerd-font + Lilex: + brew: font-lilex-nerd-font + MartianMono: + brew: font-martian-mono-nerd-font + MesloLG: + archive: Meslo + brew: font-meslo-lg-nerd-font + Monaspice: + archive: Monaspace + brew: font-monaspace-nerd-font + Monofur: + brew: font-monofur-nerd-font + Monoid: + brew: font-monoid-nerd-font + Mononoki: + brew: font-mononoki-nerd-font + M+: + archive: MPlus + brew: font-m+-nerd-font + 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 + RecMono: + archive: Recursive + brew: font-recursive-mono-nerd-font + RobotoMono: + brew: font-roboto-mono-nerd-font + ShureTechMono: + archive: ShareTechMono + brew: font-shure-tech-mono-nerd-font + SauceCodePro: + archive: SourceCodePro + brew: font-sauce-code-pro-nerd-font + SpaceMono: + brew: font-space-mono-nerd-font + Symbols: + archive: NerdFontsSymbolsOnly + brew: font-symbols-only-nerd-font + Terminess: + archive: Terminus + brew: font-terminess-ttf-nerd-font + Tinos: + brew: font-tinos-nerd-font + Ubuntu: + brew: font-ubuntu-nerd-font + UbuntuMono: + brew: font-ubuntu-mono-nerd-font + UbuntuSans: + brew: font-ubuntu-sans-nerd-font + VictorMono: + brew: font-victor-mono-nerd-font + ZedMono: + brew: font-zed-mono-nerd-font + base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download