diff --git a/fish-config.fish b/fish-config.fish index 89337dc..ccb9011 100644 --- a/fish-config.fish +++ b/fish-config.fish @@ -1,4 +1,4 @@ -if status is-interactive +if status is-interactive && type -q pfetch # Commands to run in interactive sessions can go here echo pfetch @@ -8,3 +8,6 @@ set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; se # bun set --export BUN_INSTALL "$HOME/.bun" set --export PATH $BUN_INSTALL/bin $PATH + + + diff --git a/install b/install index 690511a..e07aebc 100755 --- a/install +++ b/install @@ -1,15 +1,14 @@ #!/usr/bin/bash DIR=$(dirname $(realpath "$0")) -cd $DIR if [[ -f /etc/os-release && $1 == "packages" ]]; then . /etc/os-release - distro=${$NAME,,} + distro=${NAME,,} - if [ $distro == "ubuntu" ]; then + if [[ $distro == "ubuntu" ]]; then export DEBIAN_FRONTEND=noninteractive sudo apt-get update && sudo apt-get -y install --no-install-recommends wget curl @@ -37,29 +36,25 @@ if [[ -f /etc/os-release && $1 == "packages" ]]; then sudo apt-get upgrade -y - elif [ $distro == "arch linux" ]; then + elif [[ $distro == "arch linux" ]]; then sudo pacman -Sy --noconfirm sudo pacman -S git base-devel curl wget --noconfirm - # install snapd - git clone https://aur.archlinux.org/snapd.git /tmp/snapd - cd /tmp/snapd && makepkg -si --noconfirm - sudo ln -s /var/lib/snapd/snap /snap - sudo systemctl enable snapd.socket - - # install yay AUR helper git clone https://aur.archlinux.org/yay.git /tmp/yay cd /tmp/yay && makepkg -si --noconfirm yay -Sy --noconfirm sudo pacman --noconfirm -S \ - fish pfetch grim slurp wl-clipboard sway swaylock swaybg alacritty rofi \ - light networkmanager networkmanager-openvpn xournalpp \ - php python helix jdk-openjdk jre-openjdk docker gdm gnome seahorse + fish grim slurp wl-clipboard sway swaylock swaybg alacritty rofi \ + networkmanager networkmanager-openvpn xournalpp \ + php python helix jdk-openjdk docker docker-buildx gdm gnome seahorse - yay -S google-chrome + yay -S google-chrome light snapd --noconfirm + + sudo ln -s /var/lib/snapd/snap /snap + sudo systemctl enable snapd.socket sudo systemctl enable gdm sudo systemctl enable NetworkManager @@ -70,9 +65,9 @@ if [[ -f /etc/os-release && $1 == "packages" ]]; then sudo usermod -aG video $USER sudo usermod -aG docker $USER - fi +cd $DIR # install config files for filename in $(ls -p | grep -v "install" | grep -v "/" | grep -v "README.md"); do