diff --git a/do-everything.bash b/do-everything.bash index a360ac0..9a39b05 100755 --- a/do-everything.bash +++ b/do-everything.bash @@ -25,8 +25,6 @@ chmod 700 ./*.bash cd .. cd ./dotfiles -chmod 700 run-distro-de-script.sh -./run-distro-de-script.sh chmod 700 restore.sh ./restore.sh cd .. diff --git a/dotfiles b/dotfiles index b8ad9ef..3110da2 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit b8ad9ef33935e58c34bd0c74499069094b2c0784 +Subproject commit 3110da2e40b77caf275c95b368ab97d47982faa4 diff --git a/install-stuff/install-fish.bash b/install-stuff/install-fish.bash index d2768fc..7ada69f 100755 --- a/install-stuff/install-fish.bash +++ b/install-stuff/install-fish.bash @@ -17,7 +17,7 @@ elif command_exists "rpm-ostree" && ! command_exists "fish"; then read -p "Press enter to reboot, then run do-everything.bash again" reboot elif command_exists "pacman"; then - sudo pacman -S fish --noconfirm + sudo pacman -S fish elif command_exists "zypp"; then # Untested sudo zypper install fish -y diff --git a/install-stuff/install-fonts.bash b/install-stuff/install-fonts.bash index 3b5331c..9190458 100755 --- a/install-stuff/install-fonts.bash +++ b/install-stuff/install-fonts.bash @@ -4,23 +4,23 @@ command_exists() { type "$1" &>/dev/null; } # on void i could totally install the nerd fonts via `xbps-install nerd-fonts-otf` but i am NOT installing an extra 1.45-ish GB of the rest of the nerd fonts along with it # stock firacode is available via `font-firacode` though -mkdir -p ~/.local/share/fonts/firacode +sudo mkdir /usr/share/fonts/firacode mkdir ./tmp-fonts cd ./tmp-fonts curl $(curl -s https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest | grep "browser_download_url.*FiraCode.zip" | cut -d : -f 2,3 | tr -d \") -LO unzip FiraCode.zip -mv FiraCodeNerdFont*.ttf ~/.local/share/fonts/firacode/ +sudo mv FiraCodeNerdFont*.ttf /usr/share/fonts/firacode/ if command_exists "xbps-install"; then sudo xbps-install font-atkinson-hyperlegible-otf else - mkdir -p ~/.local/share/fonts/atkinson-hyperlegible + sudo mkdir /usr/share/fonts/atkinson-hyperlegible curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Regular.ttf curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Bold.ttf curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-Italic.ttf curl -LO https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible/main/fonts/ttf/AtkinsonHyperlegible-BoldItalic.ttf - mv AtkinsonHyperlegible*.ttf ~/.local/share/fonts/atkinson-hyperlegible/ + sudo mv AtkinsonHyperlegible*.ttf /usr/share/fonts/atkinson-hyperlegible/ fi cd - diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh index 599f1af..2495d55 100755 --- a/install-stuff/install-misc.sh +++ b/install-stuff/install-misc.sh @@ -14,11 +14,7 @@ if command_exists "apt-get"; then sudo apt-get install kitty -y echo "Please install SchildiChat, nvim/neovim" elif command_exists "dnf"; then - sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup clippy p7zip mosh krita podman podman-docker podman-compose gajim progress yt-dlp genisoimage zstd iperf3 keepassxc python3-pip -y - - # Install schildichat-desktop - # should be in my repo, but this works as both a fallback, and is faster than downloading from my repo - updates will come from my repo, though - sudo dnf install $(curl -s https://api.github.com/repos/SchildiChat/schildichat-desktop/releases/latest | grep "browser_download_url.*schildichat-desktop-.*.x86_64.rpm" | cut -d : -f 2,3 | tr -d \" | tr -d ' ') + sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rustup clippy p7zip mosh krita podman podman-docker podman-compose gajim schildichat-desktop progress yt-dlp genisoimage zstd iperf3 -y # Install Prism Launcher sudo dnf copr enable g3tchoo/prismlauncher diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash index 6ae18b5..e1028ed 100755 --- a/install-stuff/install-steam.bash +++ b/install-stuff/install-steam.bash @@ -13,7 +13,7 @@ if command_exists "apt-get"; then sudo dpkg -i steam.deb elif command_exists "dnf"; then sudo dnf install steam -y - sudo dnf install appimagelauncher qt5-qtbase-gui lutris protontricks -y + sudo dnf install appimagelauncher qt5-qtbase-gui -y mkdir $HOME/Applications cd $HOME/Applications curl -LO $(curl -s https://api.github.com/repos/DavidoTek/ProtonUp-Qt/releases/latest | grep "browser_download_url.*ProtonUp-Qt-.*-x86_64.AppImage" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -C -