From a9eafd950f9ea4bc20a5a8cd00fd1536cd0a8f2b Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 15 Jun 2015 17:11:20 +0200 Subject: Add minor fixes --- bashrc | 2 ++ install.sh | 12 ++++-------- mutt/mailboxes | 2 +- nvim/after/ftplugin/tex/mappings.vim | 2 +- nvimrc | 20 +++++++++++--------- offlineimaprc | 27 +-------------------------- zshrc | 2 +- 7 files changed, 21 insertions(+), 46 deletions(-) diff --git a/bashrc b/bashrc index d7d4121..7d576dc 100644 --- a/bashrc +++ b/bashrc @@ -113,3 +113,5 @@ if ! shopt -oq posix; then fi fi [ -f ~/.fzf.bash ] && source ~/.fzf.bash + +source ~/github/fzf-marks/fzf-marks.bash diff --git a/install.sh b/install.sh index 782c1c3..2dbac12 100755 --- a/install.sh +++ b/install.sh @@ -8,13 +8,13 @@ declare -A repodirs repodirs[Anthony25/gnome-terminal-colors-solarized]=$home/.solarized/gnome-terminal-colors-solarized repodirs[alols/xcape]=$home/xcape repodirs[altercation/mutt-colors-solarized]=$home/.solarized/mutt-colors-solarized -repodirs[gmarik/vundle]=$dir/bundle/vundle +repodirs[gmarik/vundle]=$dir/vim/bundle/vundle repodirs[icholy/ttygif]=$home/ttygif repodirs[junegunn/fzf]=$home/.fzf repodirs[junegunn/vim-plug]=$dir/nvim/vim-plug repodirs[seebi/dircolors-solarized]=$home/.solarized/dircolors-solarized repodirs[tmux-plugins/tpm]=$home/.tmux/plugins/tpm -repodirs[uvaes/fuzzy-zsh-marks]=$home/github/fuzzy-zsh-marks +repodirs[uvaes/fzf-marks]=$home/github/fzf-marks function after_vimplug { cd .. @@ -34,7 +34,7 @@ actions[junegunn/fzf]='./install' actions[junegunn/vim-plug]='after_vimplug' actions[seebi/dircolors-solarized]='' actions[tmux-plugins/tpm]='' -actions[uvaes/fuzzy-zsh-marks]='' +actions[uvaes/fzf-marks]='' function fetch_repo { cd $1 @@ -92,11 +92,7 @@ function update_repos { fi done - for job in `jobs -p` - do - wait $job - done - + waitjobs echo "--> Done!"; echo for repo in "${!repodirs[@]}"; do diff --git a/mutt/mailboxes b/mutt/mailboxes index d259b41..6161f0e 100644 --- a/mutt/mailboxes +++ b/mutt/mailboxes @@ -1 +1 @@ -mailboxes "+Gmail/Gmail" "+Hotmail/Hotmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent" +mailboxes "+Gmail/Gmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent" diff --git a/nvim/after/ftplugin/tex/mappings.vim b/nvim/after/ftplugin/tex/mappings.vim index a8753bb..c0f7036 100644 --- a/nvim/after/ftplugin/tex/mappings.vim +++ b/nvim/after/ftplugin/tex/mappings.vim @@ -46,5 +46,5 @@ nnoremap a :call SynctexShow() nnoremap i :Latexmk nnoremap e :LatexErrors nnoremap o :LatexView -nnoremap k :LatexmkStop:LatexmkClean +noremap k :LatexmkStop:LatexmkClean nnoremap h :split header.sty diff --git a/nvimrc b/nvimrc index a94c9ad..c5beef9 100644 --- a/nvimrc +++ b/nvimrc @@ -6,7 +6,7 @@ Plug 'AndrewRadev/splitjoin.vim' Plug 'benekastah/neomake' , { 'for' : 'cpp' } Plug 'bling/vim-airline' Plug 'christoomey/vim-tmux-navigator' -Plug 'edkolev/tmuxline.vim' +" Plug 'edkolev/tmuxline.vim' Plug 'freeo/vim-kalisi' Plug 'godlygeek/tabular' , { 'on' : 'Tab' } Plug 'gregsexton/gitv', { 'on' : 'Gitv' } @@ -21,7 +21,7 @@ Plug 'junegunn/vim-peekaboo' Plug 'junegunn/rainbow_parentheses.vim' Plug 'justinmk/vim-sneak' Plug 'kassio/neoterm', { 'on' : 'T' } -Plug 'kien/ctrlp.vim', { 'on' : 'CtrlP' } +Plug 'kien/ctrlp.vim' Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' } Plug 'majutsushi/tagbar' Plug 'mileszs/ack.vim', { 'on' : 'Ack' } @@ -31,7 +31,6 @@ Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'scrooloose/syntastic' Plug 'SirVer/ultisnips' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } -Plug 'szw/vim-ctrlspace' Plug 'terryma/vim-multiple-cursors' Plug 'tomasr/molokai' Plug 'tommcdo/vim-exchange' @@ -99,9 +98,12 @@ let g:limelight_conceal_ctermfg = 240 let g:syntastic_cpp_compiler = "g++" let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic" +let g:syntastic_error_symbol = "✗" +let g:syntastic_warning_symbol = "W" let g:tagbar_width = 30 let g:tagbar_show_linenumbers=1 +let g:tagbar_autofocus=1 let g:tex_conceal= 'adgm' let g:tex_flavor='latex' @@ -207,13 +209,13 @@ nnoremap pc :PlugClean nnoremap pd :PlugDiff nnoremap ps :PlugStatus -" Toggles +" Toggles (cp : change [stote of] plugin / yi? (you inverse) ) nnoremap cop :set paste! -nnoremap tg :GitGutterToggle -nnoremap tl :Limelight!! -nnoremap tn :NERDTreeToggle -nnoremap tt :TagbarToggle -nnoremap tu :GundoToggle +nnoremap cof :set foldenable! +nnoremap cpg :GitGutterToggle +nnoremap cpn :NERDTreeToggle +nnoremap cpt :TagbarToggle +nnoremap cpu :GundoToggle " Sourcing nnoremap sv :source ~/.vimrc diff --git a/offlineimaprc b/offlineimaprc index 8b2c786..4dc46f1 100644 --- a/offlineimaprc +++ b/offlineimaprc @@ -1,7 +1,7 @@ [general] ui = ttyui pythonfile = /home/urbain/.offlineimap.py -accounts = Imperial, Main, Hotmail, Gmail +accounts = Imperial, Main, Gmail maxsyncaccounts = 4 [Account Imperial] @@ -46,31 +46,6 @@ nametrans = lambda folder : {'INBOX' : 'Main', '[Gmail]/Sent Mail' : 'Sent' folderfilter = lambda folder: folder in ['INBOX', '[Gmail]/Sent Mail', '[Gmail]/Drafts'] sslcacertfile = /etc/ssl/certs/ca-certificates.crt - -[Account Hotmail] -localrepository = Hotmail-Local -remoterepository = Hotmail-Remote -autorefresh = 10 - -[Repository Hotmail-Local] -type = Maildir -localfolders = ~/.mail/Hotmail -status_backend = sqlite -nametrans = lambda folder : {'Hotmail' : 'Inbox'}.get(folder, folder) - -[Repository Hotmail-Remote] -type = IMAP -ssl = yes -remotehost = imap-mail.outlook.com -remoteport = 993 -remoteuser = urbainvaes@hotmail.com -remotepasseval = mailpasswd("hotmail") -realdelete = no -maxconnections = 3 -nametrans = lambda folder : {'Inbox' : 'Hotmail'}.get(folder, folder) -folderfilter = lambda folder: folder in ['Inbox'] -sslcacertfile = /etc/ssl/certs/ca-certificates.crt - [Account Gmail] localrepository = Gmail-Local remoterepository = Gmail-Remote diff --git a/zshrc b/zshrc index 8bd1407..43a2c02 100644 --- a/zshrc +++ b/zshrc @@ -93,7 +93,7 @@ bindkey -a 'j' history-beginning-search-forward crontab ~/.crontab TERM=xterm-256color -source ~/github/fuzzy-zsh-marks/plugin.zsh +source ~/github/fzf-marks/fzf-marks.zsh fancy-ctrl-z () { -- cgit v1.2.3