diff --git a/scripts/doorsbg b/bin/doorsbg similarity index 100% rename from scripts/doorsbg rename to bin/doorsbg diff --git a/scripts/install_arch b/scripts/install_arch index 5c0d81c..36189eb 100755 --- a/scripts/install_arch +++ b/scripts/install_arch @@ -1,5 +1,9 @@ #!/bin/bash +# +# install yay +# + cd && if ! type "yay" &> /dev/null; then echo "Yay not found, installing..." && @@ -17,44 +21,52 @@ else echo -e "\nYay is already installed, skipping..." fi && + +# +# install deps +# + echo -e "\nInstalling dependencies..." && -# Base/Shell yay -S --needed --noconfirm \ -\ -`# Standard`\ -rsync \ -sl \ -btop \ -neovim \ -byobu \ -zsh \ -lf \ -nnn \ alacritty \ -river \ -waybar \ -swaybg \ -firefox-developer-edition \ -thunderbird \ -chromium \ +beautiful-discord-git \ +btop \ +byobu \ caprine \ -fuzzel \ -telegram-desktop \ +chromium \ discord \ +firefox-developer-edition \ +fuzzel \ +gawk \ gimp \ -steam \ -spotify-launcher \ +lf \ +light \ mako \ +neovim \ +nnn \ +oh-my-zsh-git \ +otf-font-awesome \ pamixer \ playerctl \ -gawk \ -light \ -otf-font-awesome \ -pywal-discord-git \ -beautiful-discord-git \ -wal-telegram-git \ python-pywalfox \ -oh-my-zsh-git && +pywal-discord-git \ +river \ +rsync \ +sl \ +spotify-launcher \ +steam \ +swaybg \ +telegram-desktop \ +thunderbird \ +wal-telegram-git \ +waybar \ +zsh \ +&& + + +# +# set shell +# echo "" && sudo chsh -s /bin/zsh $USER diff --git a/scripts/install_full_arch b/scripts/install_full_arch deleted file mode 100755 index 4080b71..0000000 --- a/scripts/install_full_arch +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# Install all (most) dependencies -# This also serves as a list of dependencies - -yay -S --needed --noconfirm \ -\ -`# Standard`\ -awesome \ -btop \ -kitty \ -neovim \ -firefox-developer-edition \ -python-pywal \ -playerctl \ -pamixer \ -byobu \ -zsh \ -xorg-xmodmap \ -picom \ -unclutter \ -redshift \ -xclip \ -polkit-gnome \ -arc-icon-theme \ -acpi \ -nitrogen \ -spotify-launcher \ -xorg-server \ -xorg-xinit \ -xorg-xset \ -\ -`# Aur`\ -python-pywalfox \ -pywal-discord-git \ -wal-telegram-git \ -lf-git \ -ctpv-git \ -nvim-packer-git \ -oh-my-zsh-git diff --git a/setup b/setup index 0128ce4..2f3b398 100755 --- a/setup +++ b/setup @@ -42,19 +42,19 @@ if [[ $OS == *Arch* ]]; then git clone https://github.com/adoyle0/Doors.git .doors fi && - .doors/scripts/install_arch + ~/.doors/scripts/install_arch elif [[ $OS == *buntu* ]]; then cd && sudo apt-get -y install git rsync && git clone https://github.com/adoyle0/Doors.git .doors && - .doors/scripts/install_min_ubuntu + ~/.doors/scripts/install_min_ubuntu elif [[ $OS == *Fedora* ]]; then cd && sudo dnf install -y git rsync && git clone https://github.com/adoyle0/Doors.git .doors && - .doors/scripts/install_min_fedora + ~/.doors/scripts/install_min_fedora fi @@ -64,19 +64,15 @@ fi # echo -e "\nInstalling Configs..." && - cd .doors/configs && + cd ~/.doors/configs && for file in * do - if test -d $HOME/.config/$file; then - echo -e "\n$file already exists, creating backups..." - else - echo -e "\nWriting $file..." - fi - cp -rbv $file $HOME/.config/ + echo -e "\n$file..." && + cp -rbv $file ~/.config/ done && echo -e "\nLinking profile..." && - cp -sbv $HOME/.config/shell/profile $HOME/.zprofile && + cp -sbv ~/.config/shell/profile ~/.zprofile && @@ -85,13 +81,13 @@ echo -e "\nInstalling Configs..." && # echo -e "\nInstalling Scripts..." && - cd ../scripts && + cd ~/.doors && - if [ ! -d "$HOME/.local/bin" ]; then - mkdir "$HOME/.local/bin" + if [ ! -d "~/.local/bin" ]; then + mkdir "~/.local/bin" fi && - cp -rbv doorsbg $HOME/.local/bin && + cp -rbv bin ~/.local && @@ -102,6 +98,6 @@ echo -e "\nInstalling Scripts..." && echo -e "\nDone!\nLog out and back in for changes to take effect." -# wait for less to catch up and tell it we're done +# give less time to catch up and tell it we're done sleep 1 && killall -s SIGINT less