small adjustments

5 files changed, 37 insertions, 1 deletions

diff --git a/apps/Brewfile b/apps/Brewfile
index 8354cfb..37975b2 100644
--- a/apps/Brewfile
+++ b/apps/Brewfile
@@ -145,6 +145,7 @@ cask "google-drive-file-stream"        # Google Drive for desktop
 cask "karabiner-elements"              # Keyboard customizer
 cask "postman"                         # API platform
 cask "ghostty"                         # Modern terminal emulator
+cask "proton-mail"                     # ProtonMail client
 
 # Terminal Tools
 brew "pv"                              # Pipe viewer
diff --git a/bootstrap.sh b/bootstrap.sh
index 430feb4..aa5e103 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,9 +8,15 @@ fi
 # Install packages from Brewfile
 cd apps && brew bundle
 
+# Install Cargos
+cargo install \
+  git-trim \
+  starship \
+  twm
+
 # Create symlinks using stow
 cd ..
-stow_folders=(zsh git starship tmux nvim)
+stow_folders=(zsh git starship tmux nvim ghostty)
 for folder in "${stow_folders[@]}"; do
   echo "stow $folder"
   stow -t $HOME -D $folder
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index e69de29..92783ac 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -0,0 +1,26 @@
+unbind r
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded"
+
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",xterm-256color:RGB"
+
+set -g prefix C-s
+
+set -g mouse on
+ 
+set -g base-index 1
+set-window-option -g mode-keys vi
+
+bind g new-window -c "#{pane_current_path}" -n "lazygit" lazygit
+
+bind f run-shell "tmux neww twm"
+bind F run-shell "tmux neww twm -l"
+bind s run-shell "tmux neww twm -e"  # i rebind the original `s` to `S` so I can still use it
+# bind g run-shell "tmux neww twm -g"
+bind e run-shell "tmux switch -t $TWM_DEFAULT"  # i set TWM_DEFAULT in my shellrc, just a session that is always available as a scratch area
+
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 879967f..4f289da 100755
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -22,3 +22,5 @@ for file in ~/.config/zsh/{aliases,path,extras}; do
         source "$file"
     fi
 done
+
+eval "$(twm --print-zsh-completion)"
diff --git a/zsh/.config/zsh/path b/zsh/.config/zsh/path
index ef41549..51ae869 100755
--- a/zsh/.config/zsh/path
+++ b/zsh/.config/zsh/path
@@ -8,6 +8,7 @@ add_to_path() {
 }
 
 # Add ghq to PATH
+add_to_path "$HOME/.volta/bin"
 add_to_path "$GOPATH/bin"
 add_to_path "/Library/Frameworks/Firebird.framework/Resources/bin"