From 10af914eb413405e008f2dcbc0bedab0f36f166c Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 5 Jul 2023 08:43:13 -0700 Subject: [PATCH] fix apt calls --- provision/arch/ansible/tasks/desktop/packages.yml | 2 +- provision/arch/ansible/tasks/desktop/sway.yml | 2 +- provision/arch/ansible/tasks/development/packages.yml | 2 +- provision/arch/ansible/tasks/engineering/packages.yml | 2 +- provision/arch/ansible/tasks/gaming/packages.yml | 2 +- provision/arch/ansible/tasks/system/fonts.yml | 2 +- provision/arch/ansible/tasks/system/packages.yml | 2 +- provision/arch/ansible/tasks/terminal/nnn.yml | 2 +- provision/arch/ansible/tasks/terminal/packages.yml | 2 +- provision/arch/jumpstart.sh | 7 ++++--- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/provision/arch/ansible/tasks/desktop/packages.yml b/provision/arch/ansible/tasks/desktop/packages.yml index 72e638be..8a8b17d3 100644 --- a/provision/arch/ansible/tasks/desktop/packages.yml +++ b/provision/arch/ansible/tasks/desktop/packages.yml @@ -1,5 +1,5 @@ - name: Install desktop packages - apt: + pacman: name: - mpv # Video player based on MPlayer/mplayer2 - ffmpeg # Decoding, encoding and streaming software diff --git a/provision/arch/ansible/tasks/desktop/sway.yml b/provision/arch/ansible/tasks/desktop/sway.yml index 69637f93..2d9afa78 100644 --- a/provision/arch/ansible/tasks/desktop/sway.yml +++ b/provision/arch/ansible/tasks/desktop/sway.yml @@ -1,5 +1,5 @@ - name: Install sway packages - apt: + pacman: name: - alacritty - sway diff --git a/provision/arch/ansible/tasks/development/packages.yml b/provision/arch/ansible/tasks/development/packages.yml index 0933c2e1..f4c22ee1 100644 --- a/provision/arch/ansible/tasks/development/packages.yml +++ b/provision/arch/ansible/tasks/development/packages.yml @@ -1,5 +1,5 @@ - name: Install development packages - apt: + pacman: name: - python3 # Python programming language (3.11 series) - python-pip # A tool for installing and managing Python3 packages diff --git a/provision/arch/ansible/tasks/engineering/packages.yml b/provision/arch/ansible/tasks/engineering/packages.yml index 539c9539..a7e06512 100644 --- a/provision/arch/ansible/tasks/engineering/packages.yml +++ b/provision/arch/ansible/tasks/engineering/packages.yml @@ -1,5 +1,5 @@ - name: Install engineering packages - apt: + pacman: name: - freecad # General purpose 3D CAD modeler - gqrx diff --git a/provision/arch/ansible/tasks/gaming/packages.yml b/provision/arch/ansible/tasks/gaming/packages.yml index 298fc01b..ddcf4416 100644 --- a/provision/arch/ansible/tasks/gaming/packages.yml +++ b/provision/arch/ansible/tasks/gaming/packages.yml @@ -1,5 +1,5 @@ - name: Install gaming packages - apt: + pacman: name: - lutris # Video game preservation platform - gamemode # Optimize system performance for games on demand diff --git a/provision/arch/ansible/tasks/system/fonts.yml b/provision/arch/ansible/tasks/system/fonts.yml index d75d2638..b76ea598 100644 --- a/provision/arch/ansible/tasks/system/fonts.yml +++ b/provision/arch/ansible/tasks/system/fonts.yml @@ -14,7 +14,7 @@ fc-cache -fv - name: Install Noto Emoji Fonts - apt: + pacman: name: - fonts-noto-color-emoji state: present diff --git a/provision/arch/ansible/tasks/system/packages.yml b/provision/arch/ansible/tasks/system/packages.yml index e5b703a8..a7f75a1c 100644 --- a/provision/arch/ansible/tasks/system/packages.yml +++ b/provision/arch/ansible/tasks/system/packages.yml @@ -1,5 +1,5 @@ - name: Install system packages - apt: + pacman: name: - git # Fast Version Control System - git-lfs # Git extension for versioning large files diff --git a/provision/arch/ansible/tasks/terminal/nnn.yml b/provision/arch/ansible/tasks/terminal/nnn.yml index 2ab9adae..a8bd9edc 100644 --- a/provision/arch/ansible/tasks/terminal/nnn.yml +++ b/provision/arch/ansible/tasks/terminal/nnn.yml @@ -1,5 +1,5 @@ - name: Install nnn dependencies - apt: + pacman: name: - libreadline-dev state: present diff --git a/provision/arch/ansible/tasks/terminal/packages.yml b/provision/arch/ansible/tasks/terminal/packages.yml index a2965657..b8c2024f 100644 --- a/provision/arch/ansible/tasks/terminal/packages.yml +++ b/provision/arch/ansible/tasks/terminal/packages.yml @@ -1,5 +1,5 @@ - name: Install terminal packages - apt: + pacman: name: - neovim # Vim-fork focused on extensibility and agility - task # Command-line TODO list manager diff --git a/provision/arch/jumpstart.sh b/provision/arch/jumpstart.sh index cdcf926f..388ded03 100755 --- a/provision/arch/jumpstart.sh +++ b/provision/arch/jumpstart.sh @@ -8,7 +8,8 @@ read bitemail # Install ansible python dependencies sudo pacman -Syu -sudo pacman python3 python3-pip ansible cargo -y +sudo pacman -Syu python3 python-pip ansible cargo +sudo find / -name "EXTERNALLY-MANAGED" -type f -delete pip install pexpect cargo install rbw @@ -20,10 +21,10 @@ export PATH="$PATH:$CHEZDIR/temp_bin" export PATH="$PATH:$HOME/.local/bin" # Install ansible extensions -ansible-galaxy install -r "$CHEZDIR/provision/debian/ansible/requirements.yml" +ansible-galaxy install -r "$CHEZDIR/provision/arch/ansible/requirements.yml" # Run setup playbook -ansible-playbook "$CHEZDIR/provision/debian/ansible/setup.yml" -i "$CHEZDIR/provision/debian/ansible/hosts" --ask-become-pass +ansible-playbook "$CHEZDIR/provision/arch/ansible/setup.yml" -i "$CHEZDIR/provision/arch/ansible/hosts" --ask-become-pass # Copy jumpstart scripts to temp bin dir and add to path mkdir -p "$CHEZDIR/temp_bin"