Przeglądaj źródła

Fix many zsh things

Kevin Heinicke 9 miesięcy temu
rodzic
commit
cabcb9690c
5 zmienionych plików z 13 dodań i 22 usunięć
  1. 7 4
      sheldon-plugins.toml
  2. 1 1
      taskrc-dark
  3. 1 1
      taskrc-light
  4. 2 1
      zlogin
  5. 2 15
      zshrc

+ 7 - 4
sheldon-plugins.toml

@@ -33,13 +33,16 @@ github = "zsh-users/zsh-syntax-highlighting"
 [plugins.history-substring-search]
 github = "zsh-users/zsh-history-substring-search"
 
+[plugins.git]
+github = "sorin-ionescu/prezto"
+use = ["/init.zsh", "/modules/git/init.zsh", "/modules/osx/init.zsh", "/modules/archive/init.zsh"]
+
 [plugins.fzf]
 github = "junegunn/fzf"
-use = ["shell/*.zsh"]
+use = ["shell/completion.zsh"]
 
-[plugins.git]
-github = "sorin-ionescu/prezto"
-use = ["modules/git/init.zsh", "init.zsh", "modules/completion/init.zsh"]
+[plugins.fzf.hooks]
+post = "source <(fzf --zsh | sed -e '/zmodload/s/perl/perl_off/' -e '/selected/s/fc -rl/fc -irl/')"
 
 [plugins.docker-cli]
 github = "docker/cli"

+ 1 - 1
taskrc-dark

@@ -7,6 +7,6 @@ data.location=~/.task
 search.case.sensitive=no
 
 # Color theme (uncomment one to use)
-include /opt/homebrew/Cellar/task/3.1.0/share/doc/task/rc/solarized-dark-256.theme
+include /opt/homebrew/opt/task/share/doc/task/rc/solarized-dark-256.theme
 
 news.version=3.1.0

+ 1 - 1
taskrc-light

@@ -7,6 +7,6 @@ data.location=~/.task
 search.case.sensitive=no
 
 # Color theme (uncomment one to use)
-include /opt/homebrew/Cellar/task/3.1.0/share/doc/task/rc/solarized-light-256.theme
+include /opt/homebrew/opt/task/share/doc/task/rc/solarized-light-256.theme
 
 news.version=3.1.0

+ 2 - 1
zlogin

@@ -5,10 +5,11 @@ export PAGER='less'
 
 # let zsh find the history, see `man zshoptions`
 export HISTFILE=$HOME/.zhistory
-export SAVEHIST=3000
+export SAVEHIST=20000
 export HISTSIZE=20000
 setopt HIST_EXPIRE_DUPS_FIRST
 setopt SHARE_HISTORY
+setopt EXTENDED_HISTORY
 
 # use less threads to populate git status
 export GITSTATUS_NUM_THREADS=2

+ 2 - 15
zshrc

@@ -1,20 +1,7 @@
 # Device-specifig setup (ignored by git)
 # source local config first to overwrite default theme if wanted
-source ~/.zsh_local
-
-# activate plugin manager
-# export ZPLUG_HOME=$HOME/.dotfiles/external/zplug
-# source $ZPLUG_HOME/init.zsh
-
-# zplug "romkatv/powerlevel10k", as:theme, use:"*10k.zsh-theme", depth:1
-# zplug "zsh-users/zsh-syntax-highlighting", defer:2
-# zplug "zsh-users/zsh-history-substring-search", defer:3
-# zplug "junegunn/fzf", use:"shell/*.zsh"
-# zplug "modules/git", from:prezto
-# zplug "modules/completion", from:prezto
-# zplug "docker/compose", use:contrib/completion/zsh
-# zplug "docker/cli", use:contrib/completion/zsh
-# zplug "Azure/azure-cli", use:az.completion, defer:3
+[[ ! -f ~/.zsh_local ]] || source ~/.zsh_local
+
 ### U S E R  C O N F I G ###
 
 # random string function