From 516af42ce849f5b1dcb738022e316650888ef71c Mon Sep 17 00:00:00 2001 From: askiiart Date: Mon, 20 Nov 2023 12:28:28 -0600 Subject: [PATCH] Update various arch installs --- distro-specific.bash | 3 +-- do-everything.bash | 1 + dotfiles | 2 +- install-stuff/install-misc.sh | 34 ++++++++++++++++++++++++++++++++ install-stuff/install-steam.bash | 4 ++-- 5 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 install-stuff/install-misc.sh diff --git a/distro-specific.bash b/distro-specific.bash index 3837a5a..78d12da 100755 --- a/distro-specific.bash +++ b/distro-specific.bash @@ -20,9 +20,8 @@ elif command_exists "pacman"; then cd yay makepkg -si cd $WD - yay -S noto-fonts-emoji --noconfirm --needed + yay -S noto-fonts-emoji digikam eog --noconfirm --needed elif command_exists "zypp"; then - # Untested echo "not yet implemented" elif command_exists "emerge"; then echo "not yet implemented" diff --git a/do-everything.bash b/do-everything.bash index d00418a..0175d68 100755 --- a/do-everything.bash +++ b/do-everything.bash @@ -13,6 +13,7 @@ chmod 700 ./*.bash ./install-vesktop.bash ./install-fish.bash ./install-librewolf.bash +./install-misc.sh ./install-qemu-libvirt.bash ./install-steam.bash ./install-vs-code.bash diff --git a/dotfiles b/dotfiles index bd8dfa6..087aec3 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit bd8dfa678e207d4570bfc7fc516ba35a887ef7e1 +Subproject commit 087aec304ecac6ead3e291e66c5cb89b96e41d23 diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh new file mode 100644 index 0000000..25b34a7 --- /dev/null +++ b/install-stuff/install-misc.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +set -e + +if [ $(whoami) == "root" ]; then + echo "Run as a normal user, not root" + exit 1 +fi + +command_exists() { type "$1" &>/dev/null; } + +echo "WARNING: Only Arch is fully supported" + +if command_exists "apt-get"; then + sudo apt-get install kitty -y + echo "Please install SchildiChat, nvim/neovim" +elif command_exists "yum"; then + sudo yum install kitty -y + echo "Please install SchildiChat, nvim/neovim" +elif command_exists "pacman"; then + sudo pacman -S kitty --noconfirm --neeeded + yay -S schildichat-desktop-bin --noconfirm --needed +elif command_exists "zypp"; then + # Untested + sudo zypper install kitty -y + echo "Please install SchildiChat, nvim/neovim" +elif command_exists "emerge"; then + echo Not yet supported, exiting... + exit +elif command_exists "apk"; then + echo Not yet supported, exiting... +else + echo "Unsupported: unknown package manager and distro" + exit +fi diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash index b4abc08..a2e0f9e 100755 --- a/install-stuff/install-steam.bash +++ b/install-stuff/install-steam.bash @@ -14,8 +14,8 @@ if command_exists "apt-get"; then elif command_exists "yum"; then sudo dnf install steam -y elif command_exists "yay"; then - printf '[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' - read -p "Enable the multilib repo in /etc/pacman.conf - look above" + #printf '[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' + #read -p "Enable the multilib repo in /etc/pacman.conf - look above" sudo $EDITOR /etc/pacman.conf yay -S steam --noconfirm --needed yay -S protonup-qt-bin dosbox inotify-tools timidity scummvm xdotool xwinfo yad --noconfirm --needed