Cleanup, fix prompt theme, speedup ST startup

Signed-off-by: Tomas Slusny <[email protected]>
deathbeam · Mar 31, 2017 · 2bdecfb · 2bdecfb
1 parent 1f64cd5
commit 2bdecfb
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
diff --git a/vim/.vim/bundle/vim-dirvish b/vim/.vim/bundle/vim-dirvish
diff --git a/vim/.vim/bundle/vim-unimpaired b/vim/.vim/bundle/vim-unimpaired
diff --git a/zsh/.fzf b/zsh/.fzf
diff --git 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
diff --git a/zsh/.zsh/bundle/k b/zsh/.zsh/bundle/k
diff --git a/zsh/.zsh/bundle/pure b/zsh/.zsh/bundle/pure
diff --git 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
+29 −0		autoload/syntastic/preprocess.vim
+17 −0		doc/syntastic-checkers.txt
+1 −1		plugin/syntastic.vim
+48 −0		syntax_checkers/d/dscanner.vim