diff --git a/zsh/.zprofile b/zsh/.zprofile index 33d3a19..8b13789 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -1,2 +1 @@ -export PATH="/usr/local/bin:/opt/homebrew/bin:$HOME/neovim/bin:$HOME/bin:${PATH}" diff --git a/zsh/.zsh_plugins_darwin.txt b/zsh/.zsh_plugins_darwin.txt deleted file mode 100644 index 7007731..0000000 --- a/zsh/.zsh_plugins_darwin.txt +++ /dev/null @@ -1 +0,0 @@ -lukechilds/zsh-nvm diff --git a/zsh/.zshenv b/zsh/.zshenv index 09af955..55552e8 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -7,17 +7,6 @@ export XDG_STATE_HOME="$HOME/.local/state" # ~/.local/bin export PATH="$HOME/.local/bin:$PATH" -# brew sbin -export PATH="/opt/homebrew/sbin:$PATH" - -# brew lib -export LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib" - -# cargo -if [[ "$OSTYPE" == "darwin"* ]]; then - source "$HOME/.cargo/env" -fi - # language environment export LANG=en_US.UTF-8 diff --git a/zsh/.zshrc b/zsh/.zshrc index 713fb81..9103051 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -12,21 +12,8 @@ export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ffffff,bg=cyan,bold,underline" source $ZDOTDIR/.antidote/antidote.zsh antidote load -if [[ "$OSTYPE" == "darwin"* ]]; then - antidote load ${ZDOTDIR:-~}/.zsh_plugins_darwin.txt -fi - unsetopt autocd -if [[ "$OSTYPE" == "darwin"* ]]; then - eval "$(pyenv init - zsh)" - eval "$(pyenv virtualenv-init - zsh)" -fi - -if [[ "$OSTYPE" == "darwin"* ]]; then - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -fi - # ggman eval "$(ggman shellrc)" @@ -40,7 +27,5 @@ autoload -Uz compinit compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION zstyle ':completion:*' cache-path $XDG_CACHE_HOME/zsh/zcompcache -# opam configuration -# [[ ! -r /Users/janezicmatej/.opam/opam-init/init.zsh ]] || source /Users/janezicmatej/.opam/opam-init/init.zsh > /dev/null 2> /dev/null - eval "$(starship init zsh)" +eval "$(direnv hook zsh)" diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index a98ecd1..677fcbd 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,12 +1,7 @@ alias z="exec zsh" alias t=tmux_attach -if [[ "$OSTYPE" == "darwin"* ]]; then - alias n=nvim_ve - alias vim=nvim_ve -elif [[ "$OSTYPE" == "linux"* ]]; then - alias n=nvim -fi +alias n=nvim alias s="ssh-menu" @@ -16,13 +11,8 @@ alias dcp="docker compose ps --format 'table {{.Name}}\t{{.Ports}}'" # navigation alias cdgit="cd $GGROOT" -alias icloud="cd $HOME/Library/Mobile\ Documents/com\~apple\~CloudDocs" alias temp="cd $HOME/Desktop/temp" -# apple specific -alias accenton="defaults write -g ApplePressAndHoldEnabled -bool true" -alias accentoff="defaults write -g ApplePressAndHoldEnabled -bool false" - # git alias gpo="git push origin" alias gros="git reset origin/$(git_current_branch) --soft" @@ -33,8 +23,6 @@ alias glogaa="git log --oneline --graph --all --pretty=format:\"%C(auto)%h %C(bl alias ci="glab ci list" alias bm=batman alias grow="~/.local/bin/cbonsai -liWC -M 15 -t 2 -w 60 -s $(date +%s)" -alias clean_ds_store='find . -name ".DS_Store" -type f -delete -print' - # ruff alias ruffme="ruff check --fix && ruff format" diff --git a/zsh/scripts.zsh b/zsh/scripts.zsh index db488f8..7aff897 100644 --- a/zsh/scripts.zsh +++ b/zsh/scripts.zsh @@ -1,13 +1,3 @@ -function nvim_ve { - if [[ -e $VIRTUAL_ENV && -f "$VIRTUAL_ENV/bin/activate" ]]; then - source "$VIRTUAL_ENV/bin/activate" - command nvim $@ - deactivate - else - command nvim $@ - fi -} - function afm { RES=$(curl -s "https://$1/api/monitoring/requirements") COUNT=$(echo "$RES" | grep -c $2) @@ -57,7 +47,7 @@ function lh { PORT=$1 fi - open "http://localhost:$PORT" + xdg-open "http://localhost:$PORT" } function dps {