From ad338c15c5f8c3c1b30cac819ccefe636b284548 Mon Sep 17 00:00:00 2001 From: yage Date: Wed, 15 Nov 2023 11:24:59 -0700 Subject: [PATCH] initial system update and some deps update --- setup/os-dependencies/arch.min.txt | 3 ++- setup/os-dependencies/arch.txt | 10 ++++++++++ setup/os.zsh | 12 ++++++++++-- setup/run | 4 ++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/setup/os-dependencies/arch.min.txt b/setup/os-dependencies/arch.min.txt index 6938e58..8dea324 100644 --- a/setup/os-dependencies/arch.min.txt +++ b/setup/os-dependencies/arch.min.txt @@ -1,13 +1,14 @@ aws-cli-v2 base-devel +bat cmake cowsay figlet fzf +htop lolcat ncurses python ripgrep tmux vim -vim-runtime diff --git a/setup/os-dependencies/arch.txt b/setup/os-dependencies/arch.txt index 49e435a..abffe70 100644 --- a/setup/os-dependencies/arch.txt +++ b/setup/os-dependencies/arch.txt @@ -1,10 +1,18 @@ +alacritty aws-cli-v2 base-devel +bat cmake cowsay figlet +fprintd fzf go +google-chrome +htop +i3-wm +i3lock-color +i3status jdk-openjdk lolcat monaspace-font @@ -12,9 +20,11 @@ mono ncurses nodejs npm +pam-fprint-grosshack python ripgrep tmux unipicker vim vim-runtime +yamllint diff --git a/setup/os.zsh b/setup/os.zsh index bb2fd64..f78d7fa 100644 --- a/setup/os.zsh +++ b/setup/os.zsh @@ -70,6 +70,11 @@ OS__INSTALL_MANAGED_DEPENDENCIES() { || DEPENDENCIES="$DOTWRYN_PATH/setup/os-dependencies/$OS_NAME.txt" \ ; + [ ! $CI ] && { + STATUS 'updating system, repositories, and mirrors' + UPDATE_REPOSITORIES__$OS_NAME + } + for DEPENDENCY in $(cat "$DEPENDENCIES") do INSTALL_MANAGED__$OS_NAME $DEPENDENCY @@ -84,23 +89,25 @@ OS__INSTALL_MANAGED_DEPENDENCIES() { return 0 } +UPDATE_REPOSITORIES__arch() { yay -Syu; } INSTALL_MANAGED__arch() { local TARGET="$1" STATUS "checking for $TARGET" - pacman -Qq | grep -q "^$TARGET$\|^$TARGET-git$" && { + yay -Qq | grep -q "^$TARGET$\|^$TARGET-git$" && { SUCCESS "found installation of '$TARGET'" } || { WARNING "'$TARGET' not found" STATUS "installing '$TARGET'" - sudo pacman -Syu --noconfirm $TARGET \ + yay -Syu --noconfirm $TARGET \ && SUCCESS "successfully installed '$TARGET'" \ || ERROR "failed to install '$TARGET'" } } +UPDATE_REPOSITORIES__debian() { sudo apt-get update && sudo apt-get upgrade; } INSTALL_MANAGED__debian() { STATUS "checking / installing '$1'" sudo apt-get install --yes $1 \ @@ -109,6 +116,7 @@ INSTALL_MANAGED__debian() { ; } +UPDATE_REPOSITORIES__generic() { return 0; } INSTALL_MANAGED__generic() { command -v $1 >/dev/null 2>&1 \ || ERROR "could not find '$1'; it's up to you to install this one!" diff --git a/setup/run b/setup/run index 8d7529e..b287175 100755 --- a/setup/run +++ b/setup/run @@ -3,8 +3,8 @@ cd "${0:a:h}" while [[ $# -gt 0 ]] do case $1 in - --force-root ) FORCE_ROOT=1 ;; - --ci ) export CI=1 ;; + --force-root ) FORCE_ROOT=1 ;; + --ci ) export CI=1 ;; --no-compile-dmenu ) COMPILE_DMENU=0 ;; --no-compile-vim ) COMPILE_VIM=0 ;;