cleaner bootstraps

cuberhaus · Jan 22, 2021 · d8e3883 · d8e3883
1 parent 36c1428
commit d8e3883
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 48 deletions.
diff --git a/.local/scripts/bootstrap/arch b/.local/scripts/bootstrap/arch
@@ -1,20 +1,20 @@
 #! /usr/bin/env bash
 ### VARIABLES
 scripts=$HOME/.local/scripts
-source $scripts/bootstrap/arch_functions # Include functions
+source $scripts/bootstrap/arch_functions    # Include functions
 
 ### INSTALLATION
 sudo pacman -Syu
 echo "#! /bin/sh
-export DISTRO=arch" > $HOME/.config/distro # Distro variable
-yay_install # Needed to install AUR packages
+export DISTRO=arch" > $HOME/.config/distro  # Distro variable
+yay_install                                 # Needed to install AUR packages
 
 ### ONLY CHANGE FROM HERE ON
 base_install
 arch_install
 i3_install
 
-#applets             # Installs Cinnamon applets # implement pending
+#applets                                    # Installs Cinnamon applets (implement pending)
 #bloat_install
 #cinnamon_install
 #games_install
@@ -28,4 +28,4 @@ dwall
 laptop_install
 vim_install
 wget -qO- https://git.io/papirus-folders-install | sh # Install folder colors https://github.com/PapirusDevelopmentTeam/papirus-folders
-chsh -s $(which zsh) # Change default shell to zsh
+chsh -s $(which zsh)                        # Change default shell to zsh
diff --git a/.local/scripts/bootstrap/manjaro b/.local/scripts/bootstrap/manjaro
@@ -1,19 +1,19 @@
 #! /usr/bin/env bash
 ### VARIABLES
 scripts=$HOME/.local/scripts
-source $scripts/bootstrap/arch_functions # Include functions
+source $scripts/bootstrap/arch_functions        # Include functions
 
 ### INSTALLATION
 sudo pacman -Syu
 echo "#! /bin/sh
-export DISTRO=manjaro" > $HOME/.config/distro # Distro variable
+export DISTRO=manjaro" > $HOME/.config/distro   # Distro variable
 yay_install # Needed to install AUR packages
 
 ### ONLY CHANGE FROM HERE ON
 base_install
 i3_install
 
-#applets             # Installs Cinnamon applets # implement pending
+#applets                                        # Installs Cinnamon applets # implement pending
 #bloat_install
 #cinnamon_install
 #games_install
@@ -28,4 +28,4 @@ dwall
 laptop_install
 vim_install
 wget -qO- https://git.io/papirus-folders-install | sh # Install folder colors https://github.com/PapirusDevelopmentTeam/papirus-folders
-chsh -s $(which zsh) # Change default shell to zsh
+chsh -s $(which zsh)                            # Change default shell to zsh
diff --git a/.local/scripts/bootstrap/ubuntu b/.local/scripts/bootstrap/ubuntu
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 ### VARIABLES
 scripts=$HOME/.local/scripts
-source $scripts/bootstrap/ubuntu_functions # Include functions
+source $scripts/bootstrap/ubuntu_functions  # Include functions
 
 ### INSTALLATION
 sudo apt-get update; sudo apt-get full-upgrade
@@ -22,4 +22,4 @@ i3_install
 snap_install
 ubuntu_install
 vim_install
-chsh -s $(which zsh) # Change default shell to zsh
+chsh -s $(which zsh)                        # Change default shell to zsh
diff --git a/.local/scripts/bootstrap/ubuntu_functions b/.local/scripts/bootstrap/ubuntu_functions
@@ -3,11 +3,11 @@
 base_install () { ## For windows install it's good to have this
     # Fix some errors and cleanup
     mkdir -p "$XDG_DATA_HOME"/vim/{undo,swap,backup} # Fixes vim
-    touch ~/.vim/cache/viminfo                  # viminfo
+    touch $HOME/.vim/cache/viminfo              # viminfo
     touch $XDG_DATA_HOME/vim/viminfo            # viminfo
     mkdir -p "~/.vim/cache/viminfo"             # vim viminfo
-    mkdir ~/.cache/zsh
-    mkdir ~/.cache/vlc
+    mkdir $HOME/.cache/zsh
+    mkdir $HOME/.cache/vlc
     sudo mkdir /var/lib/samba/usershares
 
     # System tools
@@ -76,7 +76,7 @@ brew_install () {
     brew update
     brew upgrade
     brew install gcc patchelf graphviz
-    brew install exa                             # "ls" on steroids
+    brew install exa                            # "ls" on steroids
 }
 
 chrome_install () {
@@ -86,12 +86,11 @@ chrome_install () {
 }
 
 emacs_install () {
-    sudo apt-get install emacs-gtk
+
+    sudo apt-get install emacs-gtk              # Emacs
     # Doom
-    # required dependencies
-    sudo apt-get install git ripgrep
-    # optional dependencies
-    sudo apt-get install tar fd-find clang
+    sudo apt-get install git ripgrep            # required dependencies
+    sudo apt-get install tar fd-find clang      # optional dependencies
 }
 
 i3_install () {
@@ -129,11 +128,10 @@ steam_install () {
 }
 
 vim_install () {
-    cd ~/
-    vim +PlugInstall +qall
-    # Vim YouCompleteMe plugin install
-    bash ~/scripts/ycm
-    sudo npm install -g neovim
-    python3 -m pip install --user --upgrade pynvim
-    sudo gem install neovim
+    cd $HOME 
+    vim +PlugInstall +qall                      # Update plugins
+    bash $HOME/scripts/ycm                      # Vim YouCompleteMe plugin install
+    sudo npm install -g neovim                  # npm on neovim
+    python3 -m pip install --user --upgrade pynvim # Python for neovim
+    sudo gem install neovim                     # Gem for neovim
 }
diff --git a/.local/scripts/bootstrap/ubuntu_windows b/.local/scripts/bootstrap/ubuntu_windows
@@ -3,29 +3,24 @@
 
 ### VARIABLES
 scripts=$HOME/.local/scripts
-# Include functions
-source $scripts/bootstrap/ubuntu_functions
+source $scripts/bootstrap/ubuntu_functions      # Include functions
 
-### MAIN
-echo "Is it the first time you run this script? [y/n]"
-read FirstRun
-if [[ $FirstRun == y ]]; then
-    echo "#! /bin/sh
-    export DISTRO=ubuntu" > ~/.config/distro
-    brew_install
-fi
+### INSTALLATION
+sudo apt-get update; sudo apt-get full-upgrade  # Update
+echo "#! /bin/sh
+export DISTRO=ubuntu" > $HOME/.config/distro
+brew_install
 
+### ONLY CHANGE FROM HERE ON
 base_install
 vim_install
+
+#albert_install
+#bloat_install
+#chrome_install
+#emacs_install
+#i3_install
+#snap_install
+#steam_install
 #ubuntu_install
-if [[ $FirstRun == y ]]; then
-    #albert_install
-    #bloat_install
-    #chrome_install
-    #emacs_install
-    #i3_install
-    #snap_install
-    #steam_install
-    vim_install
-fi
-chsh -s $(which zsh) # Change default shell to zsh
+chsh -s $(which zsh)                            # Change default shell to zsh