2 files changed, 381 insertions, 0 deletions

diff --git a/dotfiles/vimrc.vim b/dotfiles/vimrc.vim
new file mode 100644
index 0000000..a0451c6
--- /dev/null
+++ b/dotfiles/vimrc.vim
@@ -0,0 +1,139 @@
+" Some global variables are defined in ../vim.nix
+
+" Better default options {{{
+
+set undofile
+set backup
+set backupdir-=.
+
+set mouse=a
+
+set ignorecase
+set smartcase
+
+set smartindent
+set tabstop=4
+set shiftwidth=4
+
+set inccommand=split
+
+set scrolloff=1
+set sidescrolloff=5
+
+set colorcolumn=80
+set cursorline
+
+set modeline
+
+set title
+
+set wildmode=longest:full,full
+
+let g:maplocalleader = ','
+let g:mapleader = ';'
+
+" If previously opened jump to the last position in the file
+au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+
+let &grepprg = g:ripgrep_path . ' --vimgrep $*'
+let &grepformat = '%f:%l:%c:%m,' . &grepformat
+
+let g:tex_flavor = 'latex'
+
+" }}}
+
+" Colors, Statusline, Tabline, Code display {{{
+
+set termguicolors
+let g:gruvbox_contrast_dark = 'soft'
+let g:gruvbox_italic = 1
+set background=dark
+colorscheme gruvbox
+
+" Doesn't do anything because the tabline gets overwritten by lightline
+"exe 'hi! TabLineSel guifg=' . g:dominant_color
+
+let g:lightline = {
+                        \ 'colorscheme': 'gruvbox',
+                        \ 'subseparator':         { 'left': '|', 'right': '|' },
+                        \ 'tab_linesubseparator': { 'left': '|', 'right': '|' },
+                        \ }
+
+set noshowmode
+
+" Do not set "trail:-" because it messes up the highlighting
+set listchars=tab:│\ ,extends:>,precedes:<,nbsp:+
+set list
+
+set fillchars=fold:─,vert:│
+
+highlight ExtraWhitespace term=inverse cterm=inverse gui=inverse
+" Show trailing whitespace and spaces before tabs:
+autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/ containedin=ALL
+
+" }}}
+
+" Mappings {{{
+
+call camelcasemotion#CreateMotionMappings(g:maplocalleader)
+
+nmap =of :set <C-R>=(&formatoptions =~ "a") ? 'formatoptions-=a' : 'formatoptions+=a'<CR><CR>
+
+" }}}
+
+set completefunc=syntaxcomplete#Complete
+set completeopt+=noinsert,noselect
+
+" Deoplete {{{
+
+let g:deoplete#enable_at_startup = 1
+
+" }}}
+
+" Neosnippets {{{
+
+imap <C-k>     <Plug>(neosnippet_expand_or_jump)
+smap <C-k>     <Plug>(neosnippet_expand_or_jump)
+xmap <C-k>     <Plug>(neosnippet_expand_target)
+
+set conceallevel=2
+set concealcursor=nv
+
+" }}}
+
+" CtrlP {{{
+let g:ctrlp_user_command = g:fd_path . ' --type f --color never "" %s'
+let g:ctrlp_use_caching = 0
+" }}}
+
+" LanguageClient {{{
+let g:LanguageClient_loggingFile  = stdpath('data') . '/LanguageClient.log'
+let g:LanguageClient_serverStderr = stdpath('data') . '/LanguageServer.log'
+" }}}
+
+" VimWiki {{{
+        " {'path': '~/Documents/Wiki', 'path_html': '~/Documents/Wiki/html'} \
+let g:vimwiki_list = [
+        \ {'path': '~/Documents/Wiki/personal',
+                \ 'path_html': '~/Documents/Wiki/personal/html',
+                \ 'auto_tags': 1},
+        \ {'path': '~/Documents/Wiki/science', 'path_html': '~/Documents/Wiki/science/html', 'auto_tags': 1},
+        \ {'path': '~/Documents/Wiki/work', 'path_html': '~/Documents/Wiki/work/html', 'auto_tags': 1},
+\ ]
+
+let g:vimwiki_global_ext = 0
+
+let g:vimwiki_auto_header = 1
+let g:vimwiki_hl_headers = 1
+let g:vimwiki_hl_cb_checked = 1
+let g:vimwiki_html_header_numbering = 2
+let g:vimwiki_html_header_numbering_sym = '.'
+
+let g:vimwiki_links_header_level = 2
+let g:vimwiki_tags_header_level = 2
+let g:vimwiki_toc_header_level = 2
+
+call deoplete#custom#var('omni', 'input_patterns', { 'vimwiki': '\[\[\w*|\:\w+' })
+" }}}
+
+" vim: fdm=marker
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
new file mode 100644
index 0000000..1263eeb
--- /dev/null
+++ b/dotfiles/zshrc
@@ -0,0 +1,242 @@
+# Some variables are defined in ../commandline.nix
+
+# For users using home-manager
+if [ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then
+        . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+fi
+
+# Grml Zsh configuration {{{
+# ==========================
+
+# With prompt specific sequences
+local dominated="%{${dominant_escape_code}%}"
+local dimmed="%{${dim_fg_escape_code}%}"
+
+# Use the dominant color in the prompt
+# In the username item for non-root, in the host item for root
+if [ "$EUID" -ne 0 ]; then
+        zstyle ':prompt:grml:left:items:user' pre "${dominated}%B"
+else
+        zstyle ':prompt:grml:left:items:host' pre "${dominated}"
+        zstyle ':prompt:grml:left:items:host' post "%f"
+fi
+
+# Change the style of VCS prompt info
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' stagedstr "s"
+zstyle ':vcs_info:*' unstagedstr "u"
+zstyle ':vcs_info:*' formats "${dimmed}(%f%s${dimmed})-[${dominated}%b${dimmed}]-{%f%c%u${dimmed}}%f " "zsh: %r"
+zstyle ':vcs_info:*' actionformats "${dimmed}(%f%s${dimmed})-[${dominated}%b${dimmed}|%F{yellow}%a${dimmed}]-{%f%c%u${dimmed}}%f " "zsh: %r"
+
+# }}}
+
+# Completion system {{{
+# =====================
+
+# Change completion messages
+zstyle ':completion:*:corrections'  format "${dominated}%BFTFY: %b${dominated}(errors: %e)%f"
+zstyle ':completion:*:descriptions' format "${dominated} -- So you want a %B%d%b${dominated}? --%f"
+zstyle ':completion:*:messages'     format "${dominated}You got mail: %f%d"
+zstyle ':completion:*:warnings'     format "%F{red}I'm sorry Dave, but I cannot allow you to find%f %d"
+
+# Always activate selection in completion
+zstyle ':completion:*' menu select
+
+# Case insensitive completion and substring completion
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+# Increase the number of errors based on the length of the typed word. But make
+# sure to cap (at 7) the max-errors to avoid hanging.
+zstyle -e ':completion:*:approximate:*' max-errors 'reply=($((($#PREFIX+$#SUFFIX)/3>7?7:($#PREFIX+$#SUFFIX)/3))numeric)'
+
+# Tmux Completion {{{
+# -------------------
+
+# From: https://blog.plenz.com/2012-01/zsh-complete-words-from-tmux-pane.html
+# And: https://gist.github.com/blueyed/6856354
+
+_tmux_pane_words() {
+        local expl
+        local -a w
+        if [[ -z "$TMUX_PANE" ]]; then
+                _message "not running inside tmux!"
+                return 1
+        fi
+
+        # Based on vim-tmuxcomplete's splitwords function.
+        # https://github.com/wellle/tmux-complete.vim/blob/master/sh/tmuxcomplete
+        _tmux_capture_pane() {
+                tmux capture-pane -J -p -S -100 $@ |
+                # Remove "^C".
+                sed 's/\^C\S*/ /g' |
+                # copy lines and split words
+                sed -e 'p;s/[^a-zA-Z0-9_]/ /g' |
+                # split on spaces
+                tr -s '[:space:]' '\n' |
+                # remove surrounding non-word characters
+                =grep -o "\w.*\w"
+        }
+        # Capture current pane first.
+        w=( ${(u)=$(_tmux_capture_pane)} )
+        echo $w > /tmp/w1
+        local i
+        for i in $(tmux list-panes -F '#D'); do
+                # Skip current pane (handled before).
+                [[ "$TMUX_PANE" = "$i" ]] && continue
+                w+=( ${(u)=$(_tmux_capture_pane -t $i)} )
+        done
+        _wanted values expl 'word from current tmux pane' compadd -a w
+}
+
+zle -C tmux-pane-words-prefix   complete-word _generic
+zle -C tmux-pane-words-anywhere complete-word _generic
+
+zstyle ':completion:tmux-pane-words-(prefix|anywhere):*' completer _tmux_pane_words
+zstyle ':completion:tmux-pane-words-(prefix|anywhere):*' ignore-line current
+# Display the menu on first execution of the hotkey.
+zstyle ':completion:tmux-pane-words-(prefix|anywhere):*' menu yes select
+zstyle ':completion:tmux-pane-words-anywhere:*' matcher-list 'b:=* m:{A-Za-z}={a-zA-Z}'
+
+# }}}
+
+# }}}
+
+# Bindkeys {{{
+# ============
+
+bindkey -v
+
+bindkey '^X^T' tmux-pane-words-prefix
+
+bindkey '^[[A' history-substring-search-up
+bindkey '^[[B' history-substring-search-down
+bindkey '^[OA' history-substring-search-up
+bindkey '^[OB' history-substring-search-down
+
+# }}}
+
+# Aliases {{{
+# ===========
+
+# Some aliases taken from the Prezo zsh configuration framework:
+# https://github.com/sorin-ionescu/prezto
+
+# Git {{{
+# -------
+
+alias g='git'
+
+# Branch (b)
+alias gb='git branch'
+
+# Commit (c)
+alias  gc='git commit --verbose'
+alias gca='git commit --verbose --all'
+alias gcf='git commit --amend --reuse-message HEAD'
+alias gcs='git show'
+
+alias gco='git checkout'
+alias gcO='git checkout --patch'
+
+# Fetch (f)
+alias   gf='git fetch'
+alias  gfm='git pull'
+alias  gfc='git clone'
+alias gfcr='git clone --recurse-submodules'
+
+# Index (i)
+alias gia='git add'
+alias giA='git add --patch'
+alias gid='git diff --cached'
+alias giD='git diff --cached --word-diff'
+
+# Log (l)
+logMediumFormat='%C(bold)Commit:%C(reset) %C(green)%H%C(red)%d%n%C(bold)Author:%C(reset) %C(cyan)%an <%ae>%n%C(bold)Date:%C(reset)   %C(blue)%ai (%ar)%C(reset)%n%+B'
+logBriefFormat='%C(green)%h%C(reset) %s%n%C(blue)(%ar by %an)%C(red)%d%C(reset)%n'
+logOnelineFormat='%C(green)%h%C(reset) %s%C(red)%d%C(reset)%n'
+
+alias  gl='git log --topo-order --pretty=format:"${logMediumFormat}"'
+alias gls='git log --topo-order --stat --pretty=format:"${logMediumFormat}"'
+alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${logMediumFormat}"'
+alias glg='git log --topo-order --all --graph --pretty=format:"${logOnelineFormat}"'
+alias glo='git log --topo-order --pretty=format:"${logOnelineFormat}"'
+alias glb='git log --topo-order --pretty=format:"${logBriefFormat}"'
+alias glc='git shortlog --summary --numbered'
+
+# Merge (m)
+alias  gm='git merge'
+alias gmt='git mergetool'
+
+# Push (p)
+alias  gp='git push'
+alias gpf='git push --force-with-lease'
+alias gpt='git push --tags'
+
+# Rebase (r)
+alias gr='git rebase'
+
+# Stash (s)
+alias gs='git stash'
+
+# Working Copy (w)
+alias gws='git status --ignore-submodules=none'
+alias gwd='git diff'
+alias gwD='git diff --word-diff'
+
+# }}}
+
+# Prevents some mistakes
+alias cp='cp -i'
+alias mv='mv -i'
+alias rm='rm -i'
+
+# }}}
+
+# Helpful functions {{{
+# =====================
+
+function ssht
+{
+        /usr/bin/env ssh -t "$@" "tmux new-session -A -s 'ssh-$HOST'"
+}
+
+compdef ssht=ssh
+
+# }}}
+
+# Abbreviations {{{
+# =================
+
+# Abbreviation system provided by the grml config
+# More info here:
+# http://www.zshwiki.org/home/examples/zleiab
+
+abk=(
+        'P' '|& ${(z)PAGER}'
+        'L' '|& ${(z)PAGER}'
+
+        'HL' ' --help |& ${(z)PAGER}'
+
+        'G'  '|& rg'
+        'FG' '|& rg -F'
+
+        'H' '| head'
+        'T' '| tail'
+        'C' '| wc -l'
+)
+
+# }}}
+
+# GPG / SSH agents {{{
+# ====================
+
+#function _gpg-agent-update-tty
+#{
+#       gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null
+#}
+#
+#add-zsh-hook preexec _gpg-agent-update-tty
+
+# }}}
+
+# vim: fdm=marker