Compare commits

..

No commits in common. "19e1944a901889272a128d66dbbc5d2b45fa214c" and "1ebf7ee1895a6b82d7dcbcae57f6b455dd3e6559" have entirely different histories.

8 changed files with 33 additions and 21 deletions

View file

@ -12,7 +12,7 @@ alias vi=vim
alias rr="rm -rf" alias rr="rm -rf"
# more ways to ls # more ways to ls
alias ls="${aliases[ls]:-ls} --group-directories-first --color=auto" alias ls="ls --group-directories-first --color=always"
alias l='ls -lh' alias l='ls -lh'
alias la='ls -a' alias la='ls -a'
alias ldot='ls -ld .*' alias ldot='ls -ld .*'

View file

@ -2,18 +2,25 @@
# misc - Set general Zsh config options here, or change plugin settings. # misc - Set general Zsh config options here, or change plugin settings.
# #
#
# Options # Options
#
# Undo options from plugins # Undo options from plugins
setopt NO_BEEP # Be quiet! setopt NO_BEEP # Be quiet!
setopt NO_HIST_BEEP # Be quiet! setopt NO_HIST_BEEP # Be quiet!
# start gpg agent #
export GPG_TTY=$(tty)
gpgconf --launch gpg-agent
# OMZ # OMZ
#
MAGIC_ENTER_GIT_COMMAND="$MAGIC_ENTER_OTHER_COMMAND && git status -sb" MAGIC_ENTER_GIT_COMMAND="$MAGIC_ENTER_OTHER_COMMAND && git status -sb"
#
# Zsh-Utils
#
# The belek/zsh-utils completion plugin also introduces compstyles. Let's use that!
(( ! $+functions[compstyle_zshzoo_setup] )) || compstyle_zshzoo_setup
# let make handle it's own shell completion # let make handle it's own shell completion
zstyle ':completion::complete:make:*:targets' call-command true zstyle ':completion::complete:make:*:targets' call-command true

View file

@ -1,6 +1,7 @@
# utility # utility
romkatv/zsh-bench kind:path romkatv/zsh-bench kind:path
ohmyzsh/ohmyzsh path:lib/clipboard.zsh ohmyzsh/ohmyzsh path:lib/clipboard.zsh
ohmyzsh/ohmyzsh path:plugins/copybuffer ohmyzsh/ohmyzsh path:plugins/copybuffer
ohmyzsh/ohmyzsh path:plugins/copyfile ohmyzsh/ohmyzsh path:plugins/copyfile
@ -10,13 +11,17 @@ ohmyzsh/ohmyzsh path:plugins/magic-enter
ohmyzsh/ohmyzsh path:plugins/fancy-ctrl-z ohmyzsh/ohmyzsh path:plugins/fancy-ctrl-z
belak/zsh-utils path:history belak/zsh-utils path:history
belak/zsh-utils path:utility
zdharma-continuum/fast-syntax-highlighting kind:defer zdharma-continuum/fast-syntax-highlighting kind:defer
Aloxaf/fzf-tab kind:defer Aloxaf/fzf-tab kind:defer
# zsh-users/zsh-completions path:src kind:fpath
junegunn/fzf path:shell/completion.zsh junegunn/fzf path:shell/completion.zsh
junegunn/fzf path:shell/key-bindings.zsh junegunn/fzf path:shell/key-bindings.zsh
# Source everything in $ZDOTDIR/rc.d prior to wrapping up. # Source everything in $ZDOTDIR/rc.d prior to wrapping up.
mattmc3/zshrc.d mattmc3/zshrc.d
~/.config/zsh/plugins/zexists ~/.config/zsh/plugins/zexists

View file

@ -15,6 +15,7 @@ function source-zshcmdd {
echo >&2 "zexists: dir not found '${ZSHCMDD:-${ZDOTDIR:-$HOME}/zexists.d/cmd}'" echo >&2 "zexists: dir not found '${ZSHCMDD:-${ZDOTDIR:-$HOME}/zexists.d/cmd}'"
return 1 return 1
fi fi
local -a conf_files=("$zshcmdd[1]"/*.{sh,zsh}(N)) local -a conf_files=("$zshcmdd[1]"/*.{sh,zsh}(N))
local rcfile local rcfile
local antircfile local antircfile
@ -32,6 +33,7 @@ function source-zshcmdd {
fi fi
done done
} }
source-zshcmdd
function zshdir-decode { function zshdir-decode {
# for now just remove the 'dir' part # for now just remove the 'dir' part
@ -86,18 +88,15 @@ function source-zshpathd {
directory=$HOME/$(zshdir-decode ${name}) directory=$HOME/$(zshdir-decode ${name})
# source files only if exe with that name exists # source files only if exe with that name exists
if [[ -d $directory ]]; then if [[ -d $directory ]]; then
# echo "$directory"
source $rcfile source $rcfile
else else
# TODO: antirc naming broken # if it doesn't exist try the anti version
# # if it doesn't exist try the anti version antircfile=${rcfile:h}/anti-${pathtype}-${rcfile:t}
# antircfile="${rcfile:h}/anti-${pathtype}-${rcfile:t}" [[ -f $antircfile ]] && source $antircfile
# [[ -f $antircfile ]] && source $antircfile
fi fi
done done
} }
source-zshcmdd || echo >&2 'issues loading zexists.d/cmd' source-zshpathd
source-zshpathd || echo >&2 'issues loading zexists.d/path'
unset _envsubst

View file

@ -1,3 +1,3 @@
is-tty && alias lsd="lsd --icon never" is-tty && alias lsd="lsd --icon never"
alias ls="lsd" alias ls="lsd --group-directories-first --color=always"
alias lt='lsd --tree --depth=3' alias lt='lsd --tree --depth=3'

View file

@ -0,0 +1,6 @@
#!/usr/bin/env zsh
# bun completions
[[ -s "$HOME/.bun/_bun" ]] && source "$HOME/.bun/_bun"
# bun
export BUN_INSTALL="$HOME/.bun"
path=("$BUN_INSTALL/bin" $path)

View file

@ -1,4 +1,4 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
export DENO_INSTALL="$HOME/.deno" export DENO_INSTALL="$HOME/.deno"; \
path=("$DENO_INSTALL/bin" $path) path=("$DENO_INSTALL/bin" $path)

View file

@ -1,5 +0,0 @@
# Dotfile Todo's
<!-- chezmoi forget --interactive ~/$(chezmoi managed | fzf) -->
- [ ] make a command to 'forget' files using fzf as selector