summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-07-14 10:10:01 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-07-14 10:10:01 +0100
commit8a10c634e3a3f26dc38f5660de0c6aacc6f1a0d1 (patch)
treee85547763991c465b05a2416f302f3118d157365
parentbc9c8ba28118a84a5a23eadd37fed855e000ebd0 (diff)
Add minor changes
-rw-r--r--bashrc2
-rw-r--r--bookmarks8
-rw-r--r--vim/.netrwhist7
-rw-r--r--vimrc6
-rw-r--r--zshrc20
5 files changed, 22 insertions, 21 deletions
diff --git a/bashrc b/bashrc
index d3578b3..0519eef 100644
--- a/bashrc
+++ b/bashrc
@@ -113,5 +113,5 @@ if ! shopt -oq posix; then
fi
fi
-source ~/github/fzf-marks/fzf-marks.bash
+source ~/github/fzf-marks/fzf-marks.plugin.bash
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/bookmarks b/bookmarks
index 8d3e14f..cd6711e 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,8 +1,8 @@
report : /home/urbain/Dropbox/phd/reports/esa
-phd : /home/urbain/Dropbox/phd
-dotfiles : /home/urbain/dotfiles
-presentation : /home/urbain/Dropbox/phd/presentations/spectral
paper : /home/urbain/Dropbox/phd/papers/spectral
+dotfiles : /home/urbain/dotfiles
+phd : /home/urbain/Dropbox/phd
code : /home/urbain/Dropbox/phd/code/spectral
-develop : /home/urbain/Dropbox/phd/code/spectral/develop
feature : /home/urbain/Dropbox/phd/code/spectral/feature
+develop : /home/urbain/Dropbox/phd/code/spectral/develop
+presentation : /home/urbain/Dropbox/phd/presentations/spectral
diff --git a/vim/.netrwhist b/vim/.netrwhist
index 1fa25b1..76938f5 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,6 +1,3 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =4
-let g:netrw_dirhist_1='/home/urbain/Dropbox/phd'
-let g:netrw_dirhist_2='/home/urbain'
-let g:netrw_dirhist_3='/home/urbain/Dropbox/phd/presentations/spectral'
-let g:netrw_dirhist_4='/home/urbain/Dropbox/phd/code/spectral/feature/cpp/src'
+let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/code/spectral/develop/cpp'
diff --git a/vimrc b/vimrc
index 35fd458..f1304d9 100644
--- a/vimrc
+++ b/vimrc
@@ -48,7 +48,8 @@ Plug 'tpope/vim-surround'
Plug 'tpope/vim-unimpaired'
Plug 'tpope/vim-vinegar'
Plug 'troydm/zoomwintab.vim'
-Plug 'Valloric/YouCompleteMe', { 'do' : './install.sh --clang-completer' }
+Plug 'Valloric/YouCompleteMe'
+", { 'do' : './install.sh --clang-completer' }
Plug 'xolox/vim-misc', { 'on' : 'Note' }
Plug 'xolox/vim-notes', { 'on' : 'Note' }
call plug#end()
@@ -108,7 +109,7 @@ let g:tagbar_autofocus=1
let g:tex_conceal= 'adgm'
let g:tex_flavor='latex'
-" let g:tex_fast=1
+ let g:tex_fast="1"
let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
\ '\.fls$','\.bbl$','\.blg$',
@@ -309,5 +310,6 @@ nnoremap <silent> <Leader>C :call fzf#run({
"" Experimental
let g:notes_directories = ['~/dotfiles/notes']
+let g:pymode=0
" Idea: instant download colorscheme
diff --git a/zshrc b/zshrc
index dce837d..432f0c0 100644
--- a/zshrc
+++ b/zshrc
@@ -20,9 +20,9 @@ if ! zgen saved; then
zgen load zsh-users/zsh-syntax-highlighting
# Appearance
- zgen load mafredri/zsh-async
- zgen load sindresorhus/pure
- # zgen oh-my-zsh themes/eastwood
+ # zgen load mafredri/zsh-async
+ # zgen load sindresorhus/pure
+ zgen oh-my-zsh themes/eastwood
# Other plugins
zgen load rupa/z
@@ -36,6 +36,12 @@ if ! zgen saved; then
zgen save
fi
+# Custom key bindings
+bindkey -a 'k' history-beginning-search-backward
+bindkey -a 'j' history-beginning-search-forward
+bindkey '^P' history-beginning-search-backward
+bindkey '^N' history-beginning-search-forward
+
# Plugins configuration
# Autosuggestion
@@ -82,6 +88,7 @@ alias install='sudo apt-get install'
alias m='mutt'
alias mail='offlineimap -u quiet &'
alias mc='make clean'
+alias mca='make clean-all'
alias n='nvim'
alias ns="$EDITOR -S Session.vim"
alias pull='git pull origin master'
@@ -108,11 +115,6 @@ alias eza="$EDITOR ~/.zathurarc"
alias son="tmux set -g status on"
alias soff="tmux set -g status off"
-# Fix smart search history
-bindkey -a 'k' history-beginning-search-backward
-bindkey -a 'j' history-beginning-search-forward
-bindkey '^P' history-beginning-search-backward
-bindkey '^N' history-beginning-search-forward
# Crontab jobs
crontab ~/.crontab
@@ -155,7 +157,7 @@ fi
# Colors
# export TERM=xterm-256color
-export COLORSCHEME=defau
+export COLORSCHEME=light
function colo {