update

debian.sh

@@ -46,7 +46,7 @@ include_debian_backports=false
 # confirm "\0cc[94mInstall Nerd Fonts?\033[0m" && install_nerdfonts=true
 
 echo "${fg_blue}"
-cat billypom-ascii.txt
+cat ascii.txt
 echo "${fg_cyan}-----Debian Install Script-----${reset}"
 confirm "Include debian backports in apt package manager? (Y/N)" && include_debian_backports=true
 confirm "Swap Left Super & Left Control <for mac keyboard> (Y/N)" && is_macbook=true
@@ -67,16 +67,12 @@ sudo apt install vim git cifs-utils nfs-common ripgrep stow virtualenv wget zip
 
 # wayland specific packages
 if echo $XDG_SESSION_TYPE | grep -q "wayland"; then
-# if grep -q "wayland" $(echo $XDG_SESSION_TYPE); then
-# if "$XDG_SESSION_TYPE" == "wayland"; then
     echo "Installing wayland specific packages"
     sudo apt install -y wl-clipboard
 fi
 
 # gnome specific packages
 if echo $DESKTOP_SESSION | grep -q "gnome" && $install_gnome_configs; then
-# if grep -q "gnome" $DESKTOP_SESSION; then
-# if "$DESKTOP_SESSION" == "gnome"; then
     echo "Installing gnome-specific packages"
     sudo apt install -y gnome-tweaks
     gsettings set org.gnome.desktop.interface gtk-theme Lavanda-Sea-Dark
@@ -91,7 +87,7 @@ if echo $DESKTOP_SESSION | grep -q "gnome" && $install_gnome_configs; then
     gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "[]"
     if $is_macbook; then 
         echo "Swapping left Super & left Control"
-        gsettings set org.gnome.desktop.input-sources xkb-options "['ctrl:swap_lwin_lctl']"
+        bash options/toggle-gnome-macbook-keyboard.sh 1
     fi
     sudo apt install -y pipx
     # adds ~/.local/bin to PATH
@@ -106,14 +102,15 @@ fi
 # nerdfonts
 if $install_nerdfonts; then
     echo "Installing nerdfonts"
-    bash nerdfonts.sh
+    bash options/install-nerdfonts.sh
 fi
 # themes
 if $install_themes; then
     # user theme directory
+    echo "Installing themes"
     mkdir -p ~/.themes
-    bash colloid-gtk-theme.sh
+    bash options/install-colloid-gtk-theme.sh
-    bash lavanda-gtk-theme.sh
+    bash options/install-lavanda-gtk-theme.sh
 fi
 
 # set default file manager
@@ -121,37 +118,18 @@ xdg-mime default nemo.desktop inode/directory
 
 # install neovim
 if $install_neovim; then
-    mkdir -p ~/applications
+    echo "Installing neovim"
-    wget -q --show-progress https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
+    bash options/install-neovim.sh
-    if check_dir_exists ~/applications/nvim-linux64/; then
-        mv ~/applications/nvim-linux64/ ~/applications/nvim-linux64.old/
-    fi
-    tar xzf nvim-linux64.tar.gz
-    mv nvim-linux64 ~/applications/
-    rm nvim-linux64.tar.gz
-    rm -r ~/applications/nvim-linux64.old
-    if ! grep -q "alias vim" ~/.bash_aliases; then echo ‘alias vim=“~/applications/nvim-linux64/bin/nvim”’ >> ~/.bash_aliases; fi
-    echo "Installed latest neovim"
 fi
 
 # install my dotfiles
 if $install_dotfiles; then
-    if check_dir_exists ~/code/dotfiles; then
+    echo "Installing billypom dotfiles"
-        cd ~/code/dotfiles
+    bash options/install-dotfiles.sh
-        git pull
-        echo "Pulled billypom/dotfiles from github"
-    else
-        mkdir -p ~/code
-        cd ~/code
-        git clone https://github.com/billypom/dotfiles.git
-        echo "Cloned billypom/dotfiles from github"
-    fi
-    cd ~/code
-    stow --adopt dotfiles/
-    echo "Stowed dotfiles"
 fi
 
 # apt repositories setup
+# this wont work because of permissions...hmmm
 if ! grep -q "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" /etc/apt/sources.list; then echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list; fi
 
 if ! grep -q "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" /etc/apt/sources.list; then echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list; fi

options/install-dotfiles.sh

@@ -0,0 +1,15 @@
+# ensure git and stow are installed
+sudo apt install git stow
+if check_dir_exists ~/code/dotfiles; then
+    cd ~/code/dotfiles
+    git pull
+    echo "Pulled billypom/dotfiles from github"
+else
+    mkdir -p ~/code
+    cd ~/code
+    git clone https://github.com/billypom/dotfiles.git
+    echo "Cloned billypom/dotfiles from github"
+fi
+cd ~/code
+stow --adopt dotfiles/
+echo "Stowed dotfiles"

options/install-neovim.sh

@@ -0,0 +1,11 @@
+mkdir -p ~/applications
+wget -q --show-progress https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
+if check_dir_exists ~/applications/nvim-linux64/; then
+    mv ~/applications/nvim-linux64/ ~/applications/nvim-linux64.old/
+fi
+tar xzf nvim-linux64.tar.gz
+mv nvim-linux64 ~/applications/
+rm nvim-linux64.tar.gz
+rm -r ~/applications/nvim-linux64.old
+if ! grep -q "alias vim" ~/.bash_aliases; then echo ‘alias vim=“~/applications/nvim-linux64/bin/nvim”’ >> ~/.bash_aliases; fi
+echo "Installed latest neovim"