diff --git a/.gitmodules b/.gitmodules index 8bf3c845..274b93f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -113,15 +113,9 @@ [submodule "zsh/.zsh/bundle/base16-shell"] path = zsh/.zsh/bundle/base16-shell url = https://github.com/chriskempson/base16-shell -[submodule "zsh/.zsh/bundle/pure"] - path = zsh/.zsh/bundle/pure - url = https://github.com/intelfx/pure [submodule "zsh/.zsh/bundle/async"] path = zsh/.zsh/bundle/async url = https://github.com/mafredri/zsh-async -[submodule "zsh/.zsh/bundle/k"] - path = zsh/.zsh/bundle/k - url = https://github.com/supercrabtree/k [submodule "zsh/.zsh/bundle/alias-tips"] path = zsh/.zsh/bundle/alias-tips url = https://github.com/djui/alias-tips diff --git a/README.md b/README.md index ea384bfd..c0ce418a 100644 --- a/README.md +++ b/README.md @@ -66,10 +66,9 @@ git clone git://github.com/Tarrasch/zsh-autoenv ~/.zsh/bundle/zsh-autoenv ### Shell * [alias-tips](https://github.com/djui/alias-tips): A plugin to help remembering those aliases you defined once * [base-16-shell](https://github.com/chriskempson/base16-shell): A shell script to change your shell's default ANSI colors but most importantly, colors 17 to 21 of your shell's 256 colorspace (if supported by your terminal) - * [cdls](https://github.com/deathbeam/dotfiles/tree/experimental/zsh/.zsh/bundle/cdls): Runs `ls -A` on directory change + * [cdls](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/cdls): Runs `ls -A` on directory change * [fzf](https://github.com/junegunn/fzf): A command-line fuzzy finder written in Go - * [k](https://github.com/supercrabtree/k): k is the new l, yo - * [vi-mode](https://github.com/deathbeam/dotfiles/tree/experimental/zsh/.zsh/bundle/vi-mode): Enhanced Vi mode for zsh + * [vi-mode](https://github.com/deathbeam/dotfiles/tree/master/zsh/.zsh/bundle/vi-mode): Enhanced Vi mode for zsh with history substring search support * [zim](https://github.com/Eriner/zim): ZIM - Zsh IMproved diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc index 971d4a8a..251f9933 100644 --- a/bspwm/.config/sxhkd/sxhkdrc +++ b/bspwm/.config/sxhkd/sxhkdrc @@ -2,29 +2,32 @@ # wm independent hotkeys # -# terminal emulator +# terminal emulator + tmux super + Return - st -e $SHELL -c "export PS1='temp'; source ~/.zshrc; tmux new-session -A -s main" + st -e $SHELL -c "export PS1='temp'; \ + source ~/.zsh/bundle/base16-shell/base16-shell.plugin.zsh; \ + [ -z $BASE16_THEME ] && base16_solarized-dark; \ + tmux new-session -A -s main" # program menu super + space - bash -c 'dmenu_run ${DMENU_ARG} -p "run"' + dmenu_run -p "run" # password menu super + z - bash -c '~/.config/dmenu/lpassmenu ${DMENU_ARG} -p "pass"' + ~/.config/dmenu/lpassmenu -p "pass" # process menu super + x - bash -c '~/.config/dmenu/procmenu ${DMENU_ARG} -p "proc"' + ~/.config/dmenu/procmenu -p "proc" # clipboard menu super + c - bash -c '~/.config/dmenu/clipmenu/clipmenu ${DMENU_ARG} -p "clip"' + ~/.config/dmenu/clipmenu/clipmenu -p "clip" # music menu super + v - bash -c '~/.config/dmenu/mpdmenu ${DMENU_ARG} -p "mpd"' + ~/.config/dmenu/mpdmenu -p "mpd" # make sxhkd reload its configuration files: super + Escape diff --git a/vim/.vim/bundle/deoplete.nvim b/vim/.vim/bundle/deoplete.nvim index 3ac84017..d247740f 160000 --- a/vim/.vim/bundle/deoplete.nvim +++ b/vim/.vim/bundle/deoplete.nvim @@ -1 +1 @@ -Subproject commit 3ac84017cd226b42aba45752df4ad38b69a50ddc +Subproject commit d247740fe68d256f9c5fa6cab35dba1a93c1c3bb diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index d7338f8a..b2b125cf 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit d7338f8a635514270b441e381164ec477a2e0cfd +Subproject commit b2b125cfade75468faef6ac87742a78f2de26bfa diff --git a/vim/.vim/bundle/vim-dirvish b/vim/.vim/bundle/vim-dirvish index c71c2ab8..08d49eb8 160000 --- a/vim/.vim/bundle/vim-dirvish +++ b/vim/.vim/bundle/vim-dirvish @@ -1 +1 @@ -Subproject commit c71c2ab8d70c0ba869e47a9dc266c2df70da21a5 +Subproject commit 08d49eb88c60ac92b3c4145394707425dd603d1b diff --git a/vim/.vim/bundle/vim-unimpaired b/vim/.vim/bundle/vim-unimpaired index 11dc568d..e9397719 160000 --- a/vim/.vim/bundle/vim-unimpaired +++ b/vim/.vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit 11dc568dbfd7a56866a4354c737515769f08e9fe +Subproject commit e939771979393c502e2331fc7d44a963efd7bb46 diff --git a/zsh/.fzf b/zsh/.fzf index d295d20d..5d12f523 160000 --- a/zsh/.fzf +++ b/zsh/.fzf @@ -1 +1 @@ -Subproject commit d295d20dc4f0374d08ab251732c4052e6de43ce8 +Subproject commit 5d12f523a30ee70979b2967d375f62400301b13b diff --git a/zsh/.profile b/zsh/.profile index 085cf70f..8402d734 100644 --- a/zsh/.profile +++ b/zsh/.profile @@ -18,6 +18,3 @@ export LC_ALL="en_US.UTF-8" # Preferred editor for local and remote sessions export EDITOR="nvim" export VISUAL="$EDITOR" - -# Dmenu options -export DMENU_ARG="-i -l 10 -b -nb #073642 -nf #93a1a1 -sb #268bd2 -sf #eee8d5 -fn Terminus:size=12" diff --git a/zsh/.zim b/zsh/.zim index ae771c87..53a3cd79 160000 --- a/zsh/.zim +++ b/zsh/.zim @@ -1 +1 @@ -Subproject commit ae771c878f57d38c9860110aa30d2e2ddedc04e4 +Subproject commit 53a3cd793357336490ed63d86ee509618f024f5c diff --git a/zsh/.zsh/bundle/k b/zsh/.zsh/bundle/k deleted file mode 160000 index 1fa7c039..00000000 --- a/zsh/.zsh/bundle/k +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1fa7c039d40684d39cb225599bda4a86a62e765d diff --git a/zsh/.zsh/bundle/pure b/zsh/.zsh/bundle/pure deleted file mode 160000 index ec776c2c..00000000 --- a/zsh/.zsh/bundle/pure +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec776c2c280b952b95bc7df64ab771308575370e diff --git a/zsh/.zshrc b/zsh/.zshrc index 9f4c2e98..18dcd90c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -47,6 +47,7 @@ history \ input \ utility \ + prompt \ syntax-highlighting \ history-substring-search \ completion) @@ -58,6 +59,10 @@ # This determines what highlighters will be used with the syntax-highlighting module. zhighlighters=(main brackets cursor) + # Set prompt theme + zprompt_theme='pure' + PURE_PROMPT_SYMBOL='$' + # Source zim source ~/.zim/init.zsh fi