dotfiles

install_files.py

@@ -45,17 +45,21 @@ def install_vim(pdotfiles, force=False):
         phome_vimrc.symlink_to(pdotfiles_vimrc)
 
     # vundle
-    pvundle = phome / Path(".vim/bundle/Vundle.vim")
+    bundle_dir = phome / Path(".vim/bundle")
+    pvundle = bundle_dir / Path("Vundle.vim")
 
-    if not force and pvundle.exists():
+    if not force and bundle_dir.exists():
         print("Vundle already installed?")
     else:
-        if force and pvundle.exists():
+        if force and bundle_dir.exists():
-            shutil.rmtree(pvundle.as_posix())
+            print("Removing bundle dir")
+            shutil.rmtree(bundle_dir.as_posix())
         print("Install Vundle")
         check_call(
             ["git", "clone", "https://github.com/VundleVim/Vundle.vim.git",
              pvundle.as_posix()])
+        print("Install vim plugins")
+        check_call("vim -X +PluginInstall +qall".split())
 
 
 def install_tmux(pdotfiles, force=False):
@@ -78,6 +82,22 @@ def install_tmux(pdotfiles, force=False):
         print("Symlinking {} to {}".format(phome_tmuxrc, pdotfiles_tmuxrc))
         phome_tmuxrc.symlink_to(pdotfiles_tmuxrc)
 
+    # tpm
+    tmux_plugins = phome / Path(".tmux/plugins")
+    tpm = tmux_plugins / Path("tpm")
+
+    if not force and tmux_plugins.exists():
+        print("plugin dir exits, tpm already installed?")
+    else:
+        if force and tmux_plugins.exists():
+            print("remove tmux plugin dir")
+            shutil.rmtree(tmux_plugins.as_posix())
+        print("Install tpm")
+        check_call(
+            ["git", "clone", "https://github.com/tmux-plugins/tpm",
+             tpm.as_posix()])
+        check_call((tpm / Path("bin") / Path("install_plugins")).as_posix())
+
 if __name__ == "__main__":
     args = docopt(HELPTEXT, version='0.1')
     if args["install"]:

mpv/input.conf

@@ -1,3 +1,3 @@
 ENTER playlist-next force
-R run "/bin/sh" "-ec" "kdialog --warningyesno 'Delete ${path}'  --title 'Delete ${media-title}' && output=\"$(rm -- '${path}' 2>&1)\" || kdialog --error \"$output\""
+R run "/bin/bash" "-ec" "kdialog --warningyesno 'Delete ${path}'  --title 'Delete ${media-title}' && output=\"$(rm -- '${path}' 2>&1)\" || kdialog --error \"$output\""
-C run "/bin/sh" "-ec" "echo -n '${path}' | xclip -selection clipboard"
+C run "/bin/bash" "-ec" "echo -n '${path}' | xclip -selection clipboard"

tmux/tmux.conf

@@ -1,7 +1,9 @@
 set -g base-index 1
 set -s escape-time 0
 set -g prefix C-a
-set -g terminal-overrides 'xterm*:smcup@:rmcup@'
+#set -g terminal-overrides 'xterm*:smcup@:rmcup@'
+bind C-a send-prefix
+unbind C-b
 unbind %
 bind | split-window -h
 bind - split-window -v 
@@ -23,9 +25,8 @@ set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
 #set -g status-right-length 6
 #set -g status-right "#[fg=yellow]%H:%M"
 
-set-window-option -g window-status-fg blue
+set-window-option -g window-status-style fg=blue,bg=black
-set-window-option -g window-status-bg black
+set-window-option -g window-status-current-style bold
-set-window-option -g window-status-current-attr bold
 
 
 #urxvt tab like window switching (-n: no prior escape seq)
@@ -34,3 +35,17 @@ bind -n S-F11 previous-window
 bind -n S-F12 next-window
 bind -n S-F9 swap-window -t -1
 bind -n S-F8 swap-window -t +1
+
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-yank'
+
+# Other examples:
+# set -g @plugin 'github_username/plugin_name'
+# set -g @plugin 'git@github.com/user/plugin'
+# set -g @plugin 'git@bitbucket.com/user/plugin'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'

vim/vimrc

@@ -30,10 +30,14 @@ Plugin 'fisadev/vim-ctrlp-cmdpalette'
 Plugin 'YankRing.vim'
 Plugin 'scrooloose/nerdtree'
 
-Plugin 'stephanlukasczyk/vim-syntax-specautomata'
+" Plugin 'stephanlukasczyk/vim-syntax-specautomata'
 
 Plugin 'rust-lang/rust.vim'
 
+Plugin 'tmux-plugins/vim-tmux'
+
+Plugin 'IN3D/vim-raml'
+
 " The following are examples of different formats supported.
 " Keep Plugin commands between vundle#begin/end.
 " plugin on GitHub repo
@@ -161,6 +165,8 @@ autocmd FileType json setlocal expandtab shiftwidth=3 tabstop=3 softtabstop=3
 
 autocmd FileType c setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4
 
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+
 " enable mouse
 set mouse=nvc 
 

zsh/etc/zsh/zshrc

@@ -431,11 +431,22 @@ ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0}
 
 typeset -ga ls_options
 typeset -ga grep_options
+
+# Colors on GNU ls(1)
 if ls --color=auto / >/dev/null 2>&1; then
     ls_options+=( --color=auto )
+# Colors on FreeBSD and OSX ls(1)
 elif ls -G / >/dev/null 2>&1; then
     ls_options+=( -G )
 fi
+
+# Natural sorting order on GNU ls(1)
+# OSX and IllumOS have a -v option that is not natural sorting
+if ls --version |& grep -q 'GNU' >/dev/null 2>&1 && ls -v / >/dev/null 2>&1; then
+    ls_options+=( -v )
+fi
+
+# Color on GNU and FreeBSD grep(1)
 if grep --color=auto -q "a" <<< "a" >/dev/null 2>&1; then
     grep_options+=( --color=auto )
 fi
@@ -659,7 +670,10 @@ fi
 # completion system
 COMPDUMPFILE=${COMPDUMPFILE:-${ZDOTDIR:-${HOME}}/.zcompdump}
 if zrcautoload compinit ; then
-    compinit -d ${COMPDUMPFILE} || print 'Notice: no compinit available :('
+    typeset -a tmp
+    zstyle -a ':grml:completion:compinit' arguments tmp
+    compinit -d ${COMPDUMPFILE} "${tmp[@]}" || print 'Notice: no compinit available :('
+    unset tmp
 else
     print 'Notice: no compinit available :('
     function compdef { }
@@ -1208,7 +1222,7 @@ function help_zle_parse_keybindings () {
     help_zle_keybindings['<Alt><arg>']="repeat next cmd/char <arg> times (<Alt>-<Alt>1<Alt>0a -> -10 times 'a')"
     help_zle_keybindings['<Alt>u']="make next word Uppercase"
     help_zle_keybindings['<Alt>l']="make next word lowercase"
-    help_zle_keybindings['<Ctrl>xd']="preview expansion under cursor"
+    help_zle_keybindings['<Ctrl>xG']="preview expansion under cursor"
     help_zle_keybindings['<Alt>q']="push current CL into background, freeing it. Restore on next CL"
     help_zle_keybindings['<Alt>.']="insert (and interate through) last word from prev CLs"
     help_zle_keybindings['<Alt>,']="complete word from newer history (consecutive hits)"
@@ -1582,7 +1596,7 @@ function command_not_found_handler () {
 # history
 
 #v#
-HISTFILE=${ZDOTDIR:-${HOME}}/.zsh_history
+HISTFILE=${HISTFILE:-${ZDOTDIR:-${HOME}}/.zsh_history}
 isgrmlcd && HISTSIZE=500  || HISTSIZE=5000
 isgrmlcd && SAVEHIST=1000 || SAVEHIST=10000 # useful for setopt append_history
 
@@ -2691,22 +2705,24 @@ Enjoy your grml system with the zsh!$reset_color"
 # debian stuff
 if [[ -r /etc/debian_version ]] ; then
     if [[ -z "$GRML_NO_APT_ALIASES" ]]; then
-        #a3# Execute \kbd{apt-cache search}
-        alias acs='apt-cache search'
-        #a3# Execute \kbd{apt-cache show}
-        alias acsh='apt-cache show'
         #a3# Execute \kbd{apt-cache policy}
         alias acp='apt-cache policy'
         if check_com -c apt ; then
+          #a3# Execute \kbd{apt search}
+          alias acs='apt search'
+          #a3# Execute \kbd{apt show}
+          alias acsh='apt show'
           #a3# Execute \kbd{apt dist-upgrade}
           salias adg="apt dist-upgrade"
           #a3# Execute \kbd{apt upgrade}
           salias ag="apt upgrade"
           #a3# Execute \kbd{apt install}
           salias agi="apt install"
-          #a3# Execute \kbd{apt-get update}
+          #a3# Execute \kbd{apt update}
           salias au="apt update"
         else
+          alias acs='apt-cache search'
+          alias acsh='apt-cache show'
           salias adg="apt-get dist-upgrade"
           salias ag="apt-get upgrade"
           salias agi="apt-get install"
@@ -3255,7 +3271,7 @@ fi
 #f5# Backup \kbd{file_or_folder {\rm to} file_or_folder\_timestamp}
 function bk () {
     emulate -L zsh
-    local current_date=$(date -u "+%Y-%m-%dT%H:%M:%SZ")
+    local current_date=$(date -u "+%Y%m%dT%H%M%SZ")
     local clean keep move verbose result all to_bk
     setopt extended_glob
     keep=1
@@ -3312,14 +3328,14 @@ return 0;;
     elif (( clean > 0 )); then
         if (( $# > 0 )); then
             for to_bk in "$@"; do
-                rm $verbose -rf "${to_bk%/}"_[0-9](#c4,)-(0[0-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3])(:[0-5][0-9])(#c2)Z
+                rm $verbose -rf "${to_bk%/}"_[0-9](#c8)T([0-1][0-9]|2[0-3])([0-5][0-9])(#c2)Z
                 (( result += $? ))
             done
         else
             if (( all > 0 )); then
-                rm $verbose -rf *_[0-9](#c4,)-(0[0-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3])(:[0-5][0-9])(#c2)Z(D)
+                rm $verbose -rf *_[0-9](#c8)T([0-1][0-9]|2[0-3])([0-5][0-9])(#c2)Z(D)
             else
-                rm $verbose -rf *_[0-9](#c4,)-(0[0-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3])(:[0-5][0-9])(#c2)Z
+                rm $verbose -rf *_[0-9](#c8)T([0-1][0-9]|2[0-3])([0-5][0-9])(#c2)Z
             fi
             (( result += $? ))
         fi
@@ -3717,7 +3733,10 @@ if check_com -c hg ; then
 
 fi # end of check whether we have the 'hg'-executable
 
-# grml-small cleanups
+# disable bracketed paste mode for dumb terminals
+[[ "$TERM" == dumb ]] && unset zle_bracketed_paste
+
+# grml-small cleanups and workarounds
 
 # The following is used to remove zsh-config-items that do not work
 # in grml-small by default.
@@ -3727,6 +3746,8 @@ fi # end of check whether we have the 'hg'-executable
 
 if (( GRMLSMALL_SPECIFIC > 0 )) && isgrmlsmall ; then
 
+    # Clean up
+
     unset "abk[V]"
     unalias    'V'      &> /dev/null
     unfunction vman     &> /dev/null
@@ -3737,6 +3758,36 @@ if (( GRMLSMALL_SPECIFIC > 0 )) && isgrmlsmall ; then
     unfunction manzsh   &> /dev/null
     unfunction man2     &> /dev/null
 
+    # Workarounds
+
+    # See https://github.com/grml/grml/issues/56
+    if ! [[ -x ${commands[dig]} ]]; then
+        function dig_after_all () {
+            unfunction dig
+            unfunction _dig
+            autoload -Uz _dig
+            unfunction dig_after_all
+        }
+        function dig () {
+            if [[ -x ${commands[dig]} ]]; then
+                dig_after_all
+                command dig "$@"
+                return "$!"
+            fi
+            printf 'This installation does not include `dig'\'' for size reasons.\n'
+            printf 'Try `drill'\'' as a light weight alternative.\n'
+            return 0
+        }
+        function _dig () {
+            if [[ -x ${commands[dig]} ]]; then
+                dig_after_all
+                zle -M 'Found `dig'\'' installed. '
+            else
+                zle -M 'Try `drill'\'' instead of `dig'\''.'
+            fi
+        }
+        compdef _dig dig
+    fi
 fi
 
 zrclocal