From a6dcb43c60809a1c5d8d29c140f72a929adabdac Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Wed, 18 Dec 2024 20:21:36 -0500
Subject: [PATCH] cleanup bootstrap/split out desktop

---
 bootstrap.sh | 48 +++++++++++++++++++++++++++---------------------
 desktop.sh   | 15 +++++++++++++++
 2 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100755 desktop.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 9b1be8e..57e1e25 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,50 +1,56 @@
 #!/bin/bash
+GO_VERSION=1.23
+NVIM_VERSION=0.10.2
+NERDFONTS_VERSION=3.3.0
+SOPS_VERSION=3.9.2
 
 # install packages
 sudo apt install \
+  age \
   apt-transport-https \
   curl \
   fd-find \
-  firefox \
   fontconfig \
-  golang-1.22 \
+  golang-${GO_VERSION} \
   gpg \
   htop \
-  imv \
   inxi \
   jq \
   kitty \
   luarocks \
-  mpv \
   ncdu \
-  neovim \
-  pipewire-alsa \
-  pipewire-audio \
-  pipewire-pulse sudo \
   python3-neovim \
   python3-pynvim \
   ripgrep \
-  sway \
-  swaylock \
   tmux \
   unzip \
-  waybar \
   wget \
-  wireplumber \
-  wl-clipboard \
   yq
 
+# install golang to path
+sudo update-alternatives --install /usr/bin/go go /usr/lib/go-${GO_VERSION}/bin/go 100 \
+  --slave /usr/bin/gofmt gofmt /usr/lib/go-${GO_VERSION}/bin/gofmt 100
+
 # set up nerd fonts
 FONT_DIR=${HOME}/.local/share/fonts/
 mkdir -p ${FONT_DIR}
-wget -qO- https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/DejaVuSansMono.tar.xz | tar -Jxv -C ${FONT_DIR}
+wget -qO- https://github.com/ryanoasis/nerd-fonts/releases/download/v${NERDFONTS_VERSION}/DejaVuSansMono.tar.xz | tar -Jxv -C ${FONT_DIR}
 fc-cache -fv
 
-# install lazygit
-/usr/lib/go-1.23/bin/go install github.com/jesseduffield/lazygit@latest
+# install neovim
+curl -LO https://github.com/neovim/neovim/releases/download/v${NVIM_VERSION}/nvim-linux64.tar.gz
+sudo rm -rf /opt/nvim
+sudo tar -C /opt -xzf nvim-linux64.tar.gz
+rm nvim-linux64.tar.gz
 
-# setup moolticute
-echo 'deb http://download.opensuse.org/repositories/home:/fawz:/mooltipass/Debian_Testing/ /' | sudo tee /etc/apt/sources.list.d/home:fawz:mooltipass.list
-curl -fsSL https://download.opensuse.org/repositories/home:fawz:mooltipass/Debian_Testing/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_fawz_mooltipass.gpg >/dev/null
-sudo apt update
-sudo apt install qtwayland5 moolticute
+# install neovim to path
+sudo update-alternatives --install /usr/bin/nvim nvim /opt/nvim-linux64/bin/nvim 100
+sudo update-alternatives --install /usr/bin/vim vim /opt/nvim-linux64/bin/nvim 100
+
+# install lazygit
+go install github.com/jesseduffield/lazygit@latest
+
+# install sops
+wget https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops_${SOPS_VERSION}_amd64.deb
+sudo apt install ./sops_${SOPS_VERSION}_amd64.deb
+rm ./sops_${SOPS_VERSION}_amd64.deb
diff --git a/desktop.sh b/desktop.sh
new file mode 100755
index 0000000..f58945e
--- /dev/null
+++ b/desktop.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# install packages
+sudo apt install \
+  firefox \
+  imv \
+  mpv \
+  pipewire-alsa \
+  pipewire-audio \
+  pipewire-pulse sudo \
+  sway \
+  swaylock \
+  waybar \
+  wireplumber \
+  wl-clipboard