minor tweaks

.bash_profile

@@ -1,25 +1,16 @@
 # homebrew
 eval "$(/opt/homebrew/bin/brew shellenv)"
 
-# ---- zoxide ----
-eval "$(zoxide init --cmd cd bash)"
-
-# ---- fzf ----
-eval "$(fzf --bash)"
-
 # ----------------------
 # Aliases
 # ----------------------
 alias ga='git add'
 alias gaa='git add -A'
 alias gcm='git commit -m'
-alias gd='git diff'
+alias gpsh='git push'
-alias gpl='git pull'
-alias gp='git push'
 alias gs='git status'
 
 alias ls='lsd'
-alias cd='z'
 alias nv='nvim'
 alias neofetch="fastfetch"
 alias python='python3'
@@ -27,11 +18,11 @@ alias python='python3'
 # ---- Air for GO ----
 alias air="~/go/bin/air"
 
-# ---- bun ----
-export BUN_INSTALL="$HOME/.bun"
-export PATH="$BUN_INSTALL/bin:$PATH"
-
-[ -s "/Users/lilj/.bun/_bun" ] && source "/Users/lilj/.bun/_bun"
-
 # ---- starship ----
 eval "$(starship init bash)"
+
+# ---- zoxide ----
+eval "$(zoxide init --cmd cd bash)"
+
+# ---- fzf ----
+eval "$(fzf --bash)"

.config/nvim/plugin/options.lua

@@ -2,9 +2,9 @@ local opt = vim.opt
 
 -- Use 4 space tabs
 -- TODO: Change this back when no company work
-opt.tabstop = 2
+opt.tabstop = 4
-opt.softtabstop = 2
+opt.softtabstop = 4
-opt.shiftwidth = 2
+opt.shiftwidth = 4
 
 opt.number = true
 opt.relativenumber = true

.zshrc

@@ -5,7 +5,6 @@ eval "$(/opt/homebrew/bin/brew shellenv)"
 alias ga='git add'
 alias gaa='git add -A'
 alias gcm='git commit -m'
-alias gp='git pull'
 alias gpsh='git push'
 alias gs='git status'
 
@@ -30,4 +29,3 @@ source <(fzf --zsh)
 source /nix/store/5vkzp4m7aazakijfaq579mk5i40j57x0-zsh-syntax-highlighting-0.8.0/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 eval "$(direnv hook zsh)"
-export PATH="/opt/homebrew/opt/node@18/bin:$PATH"