Merge branch 'master' of urbainvaes.com:public/dotfiles

8 files changed, 7 insertions, 169 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index e4cd4ff..e5d6fc1 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,118 +1,3 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
 
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-source ~/github/fzf-marks/fzf-marks.plugin.bash
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/bin/.dotmap b/bin/.dotmap
deleted file mode 100644
index f3a6946..0000000
--- a/bin/.dotmap
+++ /dev/null
@@ -1,35 +0,0 @@
-declare -A dotmap
-dotmap[$HOME/.bashrc]=$HOME/dotfiles/bashrc
-dotmap[$HOME/bin]=$HOME/dotfiles/bin
-dotmap[$HOME/.config/dunst/dunstrc]=$HOME/dotfiles/dunstrc
-dotmap[$HOME/.config/i3/config]=$HOME/dotfiles/i3/config
-dotmap[$HOME/.config/i3status/config]=$HOME/dotfiles/i3/i3status.conf
-dotmap[$HOME/.config/newsbeuter]=$HOME/dotfiles/newsbeuter
-dotmap[$HOME/.config/nvim]=$HOME/dotfiles/vim
-dotmap[$HOME/.config/qutebrowser]=$HOME/dotfiles/qutebrowser
-dotmap[$HOME/.config/zathura/zathurarc]=$HOME/dotfiles/zathurarc
-dotmap[$HOME/.gitconfig]=$HOME/dotfiles/gitconfig
-dotmap[$HOME/.git_template]=$HOME/dotfiles/git_template
-dotmap[$HOME/.inputrc]=$HOME/dotfiles/inputrc
-dotmap[$HOME/.latexmkrc]=$HOME/dotfiles/latexmkrc
-dotmap[$HOME/.ledgerrc]=$HOME/dotfiles/ledgerrc
-dotmap[$HOME/.local/share/qutebrowser/userscripts]=$HOME/dotfiles/qutebrowser/userscripts
-dotmap[$HOME/.mbsyncrc]=$HOME/dotfiles/mbsyncrc
-dotmap[$HOME/.mrconfig]=$HOME/dotfiles/mr/mrconfig
-dotmap[$HOME/.mrtrust]=$HOME/dotfiles/mr/mrtrust
-dotmap[$HOME/.msmtprc]=$HOME/dotfiles/msmtprc
-dotmap[$HOME/.mutt]=$HOME/dotfiles/mutt
-dotmap[$HOME/.ncmpcpp]=$HOME/dotfiles/ncmpcpp
-dotmap[$HOME/.password-store]=$HOME/dotfiles/passwords
-dotmap[$HOME/.surfraw.bookmarks]=$HOME/dotfiles/surfraw.bookmarks
-dotmap[$HOME/.tmux.conf]=$HOME/dotfiles/tmux.conf
-dotmap[$HOME/.urxvt]=$HOME/dotfiles/urxvt
-dotmap[$HOME/.vifm]=$HOME/dotfiles/vifm
-dotmap[$HOME/.vim]=$HOME/dotfiles/vim
-dotmap[$HOME/.vimperatorrc]=$HOME/dotfiles/vimperatorrc
-dotmap[$HOME/.vimrc]=$HOME/dotfiles/vim/vimrc
-dotmap[$HOME/.xinitrc]=$HOME/dotfiles/xinitrc
-dotmap[$HOME/.Xresources]=$HOME/dotfiles/Xresources
-dotmap[$HOME/.zgen]=$HOME/dotfiles/zsh/zgen
-dotmap[$HOME/.zsh]=$HOME/dotfiles/zsh
-dotmap[$HOME/.zshrc]=$HOME/dotfiles/zsh/zshrc
diff --git a/bin/bin/books b/bin/bin/books
deleted file mode 100755
index 8524277..0000000
--- a/bin/bin/books
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-BOOKS_DIR="$HOME/Dropbox/books"
-PDF=$(locate "$BOOKS_DIR/*.pdf")
-TARGET=$(echo "${PDF//"$BOOKS_DIR/"/}" | dmenu -i -p "Open File:")
-[[ -n $TARGET ]] && zathura "$BOOKS_DIR/$TARGET" &
diff --git a/vim/.gitignore b/vim/.gitignore
index c0f6ef5..f962736 100644
--- a/vim/.gitignore
+++ b/vim/.gitignore
@@ -1 +1,2 @@
 .vim/autoload
+.vim/vim-plug
diff --git a/vim/.vimrc b/vim/.vimrc
index 67d1d3e..9f1cbb2 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -60,6 +60,7 @@ Plug 'vim-scripts/ReplaceWithRegister'
 Plug 'vim-scripts/SpellCheck'
 Plug 'vim-scripts/gmsh.vim'
 " Plug 'w0rp/ale'
+Plug 'wellle/targets.vim'
 
 if has("nvim")
     Plug 'Shougo/deoplete.nvim'
@@ -210,7 +211,7 @@ let g:vimtex_fold_enabled=0
 let g:vimtex_view_method='zathura'
 let g:vimtex_latexmk_continuous=1
 let g:vimtex_quickfix_mode=2
-let g:vimtex_latexmk_build_dir='build'
+" let g:vimtex_latexmk_build_dir='build'
 let g:vimtex_latexmk_progname='nvr'
 
 " YouCompleteMe
@@ -227,10 +228,12 @@ endif
 " Plugins interactions
 function! Multiple_cursors_before()
     let b:deoplete_disable_auto_complete = 1
+    exe 'NeoCompleteLock'
 endfunction
 
 function! Multiple_cursors_after()
     let b:deoplete_disable_auto_complete = 0
+    exe 'NeoCompleteUnlock'
 endfunction
 
 "" Vim variables
diff --git a/zsh/.zsh/alias b/zsh/.zsh/alias
index d34f4b4..1ad7711 100644
--- a/zsh/.zsh/alias
+++ b/zsh/.zsh/alias
@@ -24,6 +24,3 @@ alias rd='cd $(git rev-parse --show-toplevel)'
 alias mi='make install'
 alias mc='make clean'
 alias mca='make clean-all'
-
-# Unablias ag from ubuntu plugin
-unalias ag
diff --git a/zsh/.zsh/plugins b/zsh/.zsh/plugins
index ab57ef5..649f00d 100644
--- a/zsh/.zsh/plugins
+++ b/zsh/.zsh/plugins
@@ -15,14 +15,6 @@ if ! zgen saved; then
     # Oh-my-zsh plugins
     zgen oh-my-zsh plugins/git
     zgen oh-my-zsh plugins/vi-mode
-    zgen oh-my-zsh plugins/archlinux
-    zgen oh-my-zsh plugins/ubuntu
-    zgen oh-my-zsh plugins/tmux
-    zgen oh-my-zsh plugins/themes
-
-    # Appearance
-    zgen load mafredri/zsh-async
-    zgen load sindresorhus/pure
 
     # Navigation plugins
     zgen load urbainvaes/fzf-marks
@@ -40,8 +32,6 @@ if ! zgen saved; then
     zgen save
 fi
 
-# Plugins configuration
-
 # Autosuggestion
 {
     ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=6'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index dc84770..379aa7d 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -19,4 +19,6 @@ if [[ -f "${HOME}/.gpg-agent-info" ]]; then
     export SSH_AUTH_SOCK
 fi
 
+PROMPT='%0~ $ '
+
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh