aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <hello@eugenetriguba.com>2025-11-26 08:44:14 -0500
committerEugene Triguba <hello@eugenetriguba.com>2025-11-26 08:44:14 -0500
commitf8e1a6aef0dc0b2faa267f48696f40fd5404889c (patch)
tree6c31b14a5e3565949ff5e2d10d732d9e4c3bdd8d
parentUpdate install scripts for macos and linux and use sh (diff)
downloaddotfiles-f8e1a6aef0dc0b2faa267f48696f40fd5404889c.zip
Consolidate zsh config down to 1 file
-rw-r--r--zsh/.zsh/aliases.sh23
-rw-r--r--zsh/.zsh/completion.sh4
-rw-r--r--zsh/.zsh/env.sh15
-rw-r--r--zsh/.zsh/history.sh7
-rw-r--r--zsh/.zsh/languages.sh40
-rw-r--r--zsh/.zsh/path.sh11
-rw-r--r--zsh/.zsh/prompt.sh11
-rw-r--r--zsh/.zsh/tmux.sh5
-rwxr-xr-xzsh/.zshrc104
9 files changed, 95 insertions, 125 deletions
diff --git a/zsh/.zsh/aliases.sh b/zsh/.zsh/aliases.sh
deleted file mode 100644
index 85e5d2a..0000000
--- a/zsh/.zsh/aliases.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env zsh
-
-# Git
-alias gs="git status"
-alias gc="git commit"
-alias ga="git add"
-alias gd="git diff"
-alias gds="git diff --staged"
-alias gp="git push"
-alias gpo="git push origin"
-alias gpl="git pull"
-alias gplrb="git pull --rebase"
-alias gl="git log"
-alias gv="git log --graph --decorate --oneline"
-alias gch="git checkout"
-alias gcb="git checkout -b"
-
-# System
-alias h="history 25"
-alias j="jobs -l"
-alias l="ls -alG"
-alias vi="nvim"
-alias vim="nvim"
diff --git a/zsh/.zsh/completion.sh b/zsh/.zsh/completion.sh
deleted file mode 100644
index 981c523..0000000
--- a/zsh/.zsh/completion.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env zsh
-
-autoload -Uz compinit
-compinit
diff --git a/zsh/.zsh/env.sh b/zsh/.zsh/env.sh
deleted file mode 100644
index 81a0255..0000000
--- a/zsh/.zsh/env.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env zsh
-
-export EDITOR="nvim"
-export BROWSER="firefox"
-export GPG_TTY=$(tty)
-export PAGER="less"
-export MANPAGER="less"
-export BAT_THEME="tokyonight_night"
-export SRC_DIR="$HOME/src"
-export BIN_DIR="$HOME/bin"
-
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_STATE_HOME="$HOME/.local/state"
diff --git a/zsh/.zsh/history.sh b/zsh/.zsh/history.sh
deleted file mode 100644
index 4f83e1c..0000000
--- a/zsh/.zsh/history.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env zsh
-
-eval "$(atuin init zsh --disable-up-arrow)"
-
-export HISTFILE=~/.zhistory
-export HISTSIZE=100000
-export SAVEHIST=100000
diff --git a/zsh/.zsh/languages.sh b/zsh/.zsh/languages.sh
deleted file mode 100644
index 0521807..0000000
--- a/zsh/.zsh/languages.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env zsh
-
-# Homebrew
-eval "$(brew shellenv)"
-export LDFLAGS="-L/opt/homebrew/lib"
-export CPPFLAGS="-I/opt/homebrew/include"
-export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
-
-# Go
-export GOPATH="$SRC_DIR/go"
-export GOBIN="$SRC_DIR/go/bin"
-export PATH="$GOPATH/bin:$PATH"
-export PATH="$GOROOT/bin:$PATH"
-export PATH="$GOBIN:$PATH"
-export GOPROXY="direct"
-
-# Python
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init -)"
-eval "$(pyenv virtualenv-init -)"
-
-# Rust
-source "$HOME/.cargo/env"
-
-# Node.js
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-
-# Java
-export JAVA_HOME=$(/usr/libexec/java_home -v 24)
-
-# PNPM
-export PNPM_HOME="/Users/eugene/Library/pnpm"
-case ":$PATH:" in
-*":$PNPM_HOME:"*) ;;
-*) export PATH="$PNPM_HOME:$PATH" ;;
-esac
-
diff --git a/zsh/.zsh/path.sh b/zsh/.zsh/path.sh
deleted file mode 100644
index 1293117..0000000
--- a/zsh/.zsh/path.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env zsh
-
-export PATH="/usr/local/bin:$PATH"
-export PATH="$BIN_DIR:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="$HOME/.poetry/bin:$PATH"
-export PATH="/opt/homebrew/opt/curl/bin:$PATH"
-
-export PATH="/opt/homebrew/opt/openjdk@24/bin:$PATH"
-export CPPFLAGS="-I/opt/homebrew/opt/openjdk@24/include"
-
diff --git a/zsh/.zsh/prompt.sh b/zsh/.zsh/prompt.sh
deleted file mode 100644
index 0c0a4d5..0000000
--- a/zsh/.zsh/prompt.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env zsh
-
-autoload -Uz vcs_info
-zstyle ":vcs_info:*" enable git
-zstyle ':vcs_info:git:*' formats '%F{green}(%b)%f '
-precmd() {
- vcs_info
-}
-setopt prompt_subst
-NEWLINE=$'\n'
-PROMPT=' %2~ ${vcs_info_msg_0_}%# '
diff --git a/zsh/.zsh/tmux.sh b/zsh/.zsh/tmux.sh
deleted file mode 100644
index 1c0620d..0000000
--- a/zsh/.zsh/tmux.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env zsh
-#
-if [[ -z "$TMUX" ]]; then
- tmux attach-session -t "$USER" || tmux new-session -s "$USER"
-fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 51b30b4..d5048d5 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,11 +1,97 @@
#!/usr/bin/env zsh
-source ~/.zsh/prompt.sh
-source ~/.zsh/tmux.sh
-source ~/.zsh/completion.sh
-source ~/.zsh/history.sh
-
-source ~/.zsh/env.sh
-source ~/.zsh/languages.sh
-source ~/.zsh/path.sh
-source ~/.zsh/aliases.sh
+#
+# Setup Shell Prompt
+#
+# This enables a simple prompt with git info
+# and the current working directory.
+#
+autoload -Uz vcs_info
+zstyle ":vcs_info:*" enable git
+zstyle ':vcs_info:git:*' formats '%F{green}(%b)%f '
+precmd() {
+ vcs_info
+}
+setopt prompt_subst
+NEWLINE=$'\n'
+PROMPT=' %2~ ${vcs_info_msg_0_}%# '
+
+#
+# Setup the zsh shell completion system
+#
+# See `man zshcompsys`.
+#
+autoload -Uz compinit
+compinit
+
+#
+# Setup shell history
+#
+export HISTFILE=~/.zhistory
+export HISTSIZE=100000
+export SAVEHIST=100000
+
+#
+# Setup default env variables
+#
+export EDITOR="nvim"
+export BROWSER="firefox"
+export GPG_TTY=$(tty)
+export PAGER="less"
+export MANPAGER="less"
+export BAT_THEME="tokyonight_night"
+export SRC_DIR="$HOME/src"
+export BIN_DIR="$HOME/bin"
+
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+#
+# Append additional directories onto PATH
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin:$HOME/.local/bin;
+export PATH
+
+#
+# Aliases
+#
+alias gs="git status"
+alias gc="git commit"
+alias ga="git add"
+alias gd="git diff"
+alias gds="git diff --staged"
+alias gp="git push"
+alias gpo="git push origin"
+alias gpl="git pull"
+alias gplrb="git pull --rebase"
+alias gl="git log"
+alias gv="git log --graph --decorate --oneline"
+alias gch="git checkout"
+alias gcb="git checkout -b"
+
+alias h="history 25"
+alias j="jobs -l"
+alias l="ls -alG"
+
+alias vi="nvim"
+alias vim="nvim"
+
+#
+# Language setup
+#
+export GOPATH="$SRC_DIR/go"
+export GOBIN="$SRC_DIR/go/bin"
+export PATH="$GOPATH/bin:$PATH"
+export PATH="$GOROOT/bin:$PATH"
+export PATH="$GOBIN:$PATH"
+export GOPROXY="direct"
+
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+
+. "$HOME/.cargo/env"
+