From f094cdec07fe7c4810258b0a45a4907722e62145 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 28 Feb 2023 12:10:59 -0600 Subject: [PATCH] many shell things --- home/private_dot_config/zsh/conf.d/misc.zsh | 17 +++++------------ home/private_dot_config/zsh/dot_zsh_plugins.txt | 5 ----- .../zsh/zexists.d/cmd/lsd.zsh | 2 +- .../zsh/zexists.d/path/dir--DOT-bun | 6 ------ .../zsh/zexists.d/path/dir--DOT-deno | 2 +- 5 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 home/private_dot_config/zsh/zexists.d/path/dir--DOT-bun diff --git a/home/private_dot_config/zsh/conf.d/misc.zsh b/home/private_dot_config/zsh/conf.d/misc.zsh index 89e311f..72a159f 100644 --- a/home/private_dot_config/zsh/conf.d/misc.zsh +++ b/home/private_dot_config/zsh/conf.d/misc.zsh @@ -2,24 +2,17 @@ # misc - Set general Zsh config options here, or change plugin settings. # -# # Options -# - # Undo options from plugins setopt NO_BEEP # Be quiet! setopt NO_HIST_BEEP # Be quiet! -# -# OMZ -# -MAGIC_ENTER_GIT_COMMAND="$MAGIC_ENTER_OTHER_COMMAND && git status -sb" +# start gpg agent +export GPG_TTY=$(tty) +gpgconf --launch gpg-agent -# -# Zsh-Utils -# -# The belek/zsh-utils completion plugin also introduces compstyles. Let's use that! -(( ! $+functions[compstyle_zshzoo_setup] )) || compstyle_zshzoo_setup +# OMZ +MAGIC_ENTER_GIT_COMMAND="$MAGIC_ENTER_OTHER_COMMAND && git status -sb" # let make handle it's own shell completion zstyle ':completion::complete:make:*:targets' call-command true diff --git a/home/private_dot_config/zsh/dot_zsh_plugins.txt b/home/private_dot_config/zsh/dot_zsh_plugins.txt index 12c541e..8a409b6 100644 --- a/home/private_dot_config/zsh/dot_zsh_plugins.txt +++ b/home/private_dot_config/zsh/dot_zsh_plugins.txt @@ -1,7 +1,6 @@ # utility romkatv/zsh-bench kind:path - ohmyzsh/ohmyzsh path:lib/clipboard.zsh ohmyzsh/ohmyzsh path:plugins/copybuffer ohmyzsh/ohmyzsh path:plugins/copyfile @@ -11,17 +10,13 @@ ohmyzsh/ohmyzsh path:plugins/magic-enter ohmyzsh/ohmyzsh path:plugins/fancy-ctrl-z belak/zsh-utils path:history -belak/zsh-utils path:utility zdharma-continuum/fast-syntax-highlighting 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/key-bindings.zsh # Source everything in $ZDOTDIR/rc.d prior to wrapping up. mattmc3/zshrc.d ~/.config/zsh/plugins/zexists - diff --git a/home/private_dot_config/zsh/zexists.d/cmd/lsd.zsh b/home/private_dot_config/zsh/zexists.d/cmd/lsd.zsh index bb98335..02217eb 100644 --- a/home/private_dot_config/zsh/zexists.d/cmd/lsd.zsh +++ b/home/private_dot_config/zsh/zexists.d/cmd/lsd.zsh @@ -1,3 +1,3 @@ is-tty && alias lsd="lsd --icon never" -alias ls="lsd --group-directories-first --color=always" +alias ls="lsd" alias lt='lsd --tree --depth=3' diff --git a/home/private_dot_config/zsh/zexists.d/path/dir--DOT-bun b/home/private_dot_config/zsh/zexists.d/path/dir--DOT-bun deleted file mode 100644 index 128b862..0000000 --- a/home/private_dot_config/zsh/zexists.d/path/dir--DOT-bun +++ /dev/null @@ -1,6 +0,0 @@ -#!/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) diff --git a/home/private_dot_config/zsh/zexists.d/path/dir--DOT-deno b/home/private_dot_config/zsh/zexists.d/path/dir--DOT-deno index bd5eb87..b19bb94 100644 --- a/home/private_dot_config/zsh/zexists.d/path/dir--DOT-deno +++ b/home/private_dot_config/zsh/zexists.d/path/dir--DOT-deno @@ -1,4 +1,4 @@ #!/usr/bin/env zsh -export DENO_INSTALL="$HOME/.deno"; \ +export DENO_INSTALL="$HOME/.deno" path=("$DENO_INSTALL/bin" $path)