From: Samir Benmendil Date: Fri, 4 Oct 2013 16:47:24 +0000 (+0200) Subject: Merge branch 'master' of tardis:/dotfiles X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/fb4010f03dd383a5b27b28d2b606516d6d6d057b?hp=ba5dbaf17e704206beafc61f8f9f8aa0bcbed876 Merge branch 'master' of tardis:/dotfiles --- diff --git a/.gitmodules b/.gitmodules index 225a52d..447a11a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,18 @@ [submodule "awesome/awesome-freedesktop"] path = awesome/awesome-freedesktop url = https://github.com/terceiro/awesome-freedesktop.git +[submodule "vim/bundle/vim-fugitive"] + path = vim/bundle/vim-fugitive + url = https://github.com/tpope/vim-fugitive.git +[submodule "vim/bundle/command-t"] + path = vim/bundle/command-t + url = git://git.wincent.com/command-t.git +[submodule "vim/bundle/syntastic"] + path = vim/bundle/syntastic + url = https://github.com/scrooloose/syntastic.git +[submodule "vim/bundle/nerdtree"] + path = vim/bundle/nerdtree + url = https://github.com/scrooloose/nerdtree.git +[submodule "vim/bundle/vim-airline"] + path = vim/bundle/vim-airline + url = https://github.com/bling/vim-airline diff --git a/Xresources b/Xresources index cb424d2..87fa239 100644 --- a/Xresources +++ b/Xresources @@ -44,32 +44,32 @@ URxvt.keysym.C-A-V: perl:clipboard:paste_escaped ! {{{ Colours URxvt*.depth: 32 -*background: [75]#222222 -*foreground: #f8f8f2 +URxvt*.background: [75]#222222 +URxvt*.foreground: #f8f8f2 ! Black -*color0: #262729 -*color8: #262729 +URxvt*.color0: #262729 +URxvt*.color8: #262729 ! Red -*color1: #f92671 -*color9: #ff669d +URxvt*.color1: #f92671 +URxvt*.color9: #ff669d ! Green -*color2: #a6e22e -*color10: #beed5f +URxvt*.color2: #a6e22e +URxvt*.color10: #beed5f ! Yellow -*color3: #fd971f -*color11: #e6db74 +URxvt*.color3: #fd971f +URxvt*.color11: #e6db74 ! Blue -*color4: #1692d0 -*color12: #66d9ef +URxvt*.color4: #1692d0 +URxvt*.color12: #66d9ef ! Magenta -*color5: #9e6ffe -*color13: #df92f6 +URxvt*.color5: #9e6ffe +URxvt*.color13: #df92f6 ! Cyan -*color6: #5e7175 -*color14: #a3babf +URxvt*.color6: #5e7175 +URxvt*.color14: #a3babf ! White -*color7: #ffffff -*color15: #ffffff +URxvt*.color7: #ffffff +URxvt*.color15: #ffffff ! Cursor -*cursorColor: #b5d2dd +URxvt*.cursorColor: #b5d2dd ! }}} diff --git a/dwb/default/cookies.allow b/dwb/default/cookies.allow index dc8009a..1378eab 100644 --- a/dwb/default/cookies.allow +++ b/dwb/default/cookies.allow @@ -47,3 +47,4 @@ talkgadget.google.com plus.google.com sourceforge.net .sourceforge.net +chakra-project.org diff --git a/flexget/config.yml b/flexget/config.yml index 6d97fa5..2266b17 100644 --- a/flexget/config.yml +++ b/flexget/config.yml @@ -23,10 +23,12 @@ presets: normal: - american dad - breaking bad + - boardwalk empire - burn notice - chuck - dexter - doctor who + - downton abbey - eureka - family guy - futurama @@ -38,6 +40,7 @@ presets: - qi xl - ray donovan - red dwarf + - sherlock - the big bang theory - the cleveland show - the walking dead diff --git a/vim/bundle/command-t b/vim/bundle/command-t new file mode 160000 index 0000000..89896bd --- /dev/null +++ b/vim/bundle/command-t @@ -0,0 +1 @@ +Subproject commit 89896bd88a3d0cd5c41f8754dfa004dda91fb488 diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree new file mode 160000 index 0000000..b0bb781 --- /dev/null +++ b/vim/bundle/nerdtree @@ -0,0 +1 @@ +Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic new file mode 160000 index 0000000..58ba3d4 --- /dev/null +++ b/vim/bundle/syntastic @@ -0,0 +1 @@ +Subproject commit 58ba3d429407944539852ff42a54cbc3accb1527 diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline new file mode 160000 index 0000000..008eb8c --- /dev/null +++ b/vim/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 008eb8cd3b54380cb2af59bdf0075a622501a0e5 diff --git a/vimrc b/vimrc index 99d28ba..5ed5e5b 100644 --- a/vimrc +++ b/vimrc @@ -1,43 +1,87 @@ " My vimrc file. " -" Maintainer: Samir Benmendil +" Maintainer: Samir Benmendil " if v:progname =~? "evim" finish endif -" TODO -" organize this file, never thought it'll get this big -" TODO - -" pathogen.vim runtime path manipulation -silent! call pathogen#infect() - " Use Vim settings, rather than Vi settings (much better!). " This must be first, because it changes other options as a side effect. set nocompatible -" allow backspacing over everything in insert mode -set backspace=indent,eol,start +" pathogen.vim runtime path manipulation +silent! call pathogen#infect() +" search {{{ +set incsearch +set ignorecase +set smartcase +set hlsearch +nmap q :nohl +" }}} + +" NERDTree {{{ +" open/close NERDTree with \e +nmap e :NERDTreeToggle +" to open files/dirs +let NERDTreeMapActivateNode='' +" open NERDTree if no files were selected +autocmd vimenter * if !argc() | NERDTree | endif +" close vim if only NERDTree is open +autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif +" }}} + +" airline {{{ +let g:airline#extensions#tabline#enabled = 1 +" }}} + +" tabbing {{{ +:nmap b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4 +:nmap B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4 +:nmap M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4 +:nmap m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2 +" }}} + +" backup {{{ if has("vms") set nobackup " do not keep a backup file, use versions instead else set backup " keep a backup file set backupdir=$HOME/.vim/backupdir endif -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time -set showcmd " display incomplete commands -set incsearch " do incremental searching -set number " show some linenumbers -" viminfo defaults but save file in .vim -set viminfo='100,<50,s10,h,n~/.vim/viminfo - -" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries -" let &guioptions = substitute(&guioptions, "t", "", "g") +" }}} + +" appearance {{{ +set background=dark " Dark background, d'uh! +set number " show some linenumbers +set showmatch " Show matching brackets. +set showbreak=▒▒ " show these chars for wrapped lines +set list listchars=tab:»·,trail:· " show these chars for tabs and trailing spaces +" }}} + +" misc options {{{ +set history=500 " keep 500 lines of command line history +set ruler " show the cursor position all the time +set confirm " Ask what to do when closing unsaved documents +set showcmd " Show (partial) command in status line. +set autowrite " Automatically save before commands like :next and :make +"set hidden " Hide buffers when they are abandoned +set splitright " split right when using :vsp +set scrolloff=5 " keep at least n lines above/below +set backspace=indent,eol,start " allow backspacing over everything in insert mode + +set viminfo='100,<50,s10,h,n~/.vim/viminfo " viminfo defaults but save file in .vim +" }}} + +" tabs {{{ +set softtabstop=4 +set shiftwidth=4 +set expandtab +" }}} +" misc bindings {{{ " Don't use Ex mode, use Q for formatting map Q gq @@ -45,33 +89,41 @@ map Q gq " so that you can undo CTRL-U after inserting a line break. inoremap u -"paste toggle +" Press `` to toggle insert and replace mode (no key on Mac keyboard) +imap `` +" }}} + +" paste toggle {{{ nmap :set paste! paste? imap :set paste! vmap :set paste!gv -set pastetoggle= +set pastetoggle= +" }}} +" mouse {{{ " In many terminal emulators the mouse works just fine, thus enable it. -"if has('mouse') -" "xterm mouse with middleclick paste -" nnoremap i -" vnoremap s -" set mouse=rnv -" "choose either one -" set ttymouse=xterm -" "set ttymouse=xterm2 -"endif +if has('mouse') + "xterm mouse with middleclick paste + nnoremap i + vnoremap s + set mouse=rnv + "choose either one + set ttymouse=xterm + "set ttymouse=xterm2 +endif +" }}} +" syntax {{{ " Switch syntax highlighting on, when the terminal has colors " Also switch on highlighting the last used search pattern. if &t_Co > 2 || has("gui_running") syntax on - set hlsearch endif +" }}} +" autocmd {{{ " Only do this part when compiled with support for autocommands. if has("autocmd") - " Enable file type detection. " Use the default filetype settings, so that mail gets 'tw' set to 72, " 'cindent' is on in C files, etc. @@ -98,13 +150,11 @@ if has("autocmd") \ endif augroup END - else - set autoindent " always set autoindenting on +endif " has("autocmd") }}} -endif " has("autocmd") - +" DiffOrig {{{ " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. " Only define it when not defined already. @@ -112,45 +162,9 @@ if !exists(":DiffOrig") command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis \ | wincmd p | diffthis endif +" }}} -" Ask what to do when closing unsaved documents -set confirm - -" If using a dark background within the editing area and syntax highlighting -" turn on this option as well -set background=dark - -" The following are commented out as they cause vim to behave a lot -" differently from regular Vi. They are highly recommended though. -set showcmd " Show (partial) command in status line. -set showmatch " Show matching brackets. -set ignorecase " Do case insensitive matching -set smartcase " Do smart case matching -set incsearch " Incremental search -set autowrite " Automatically save before commands like :next and :make -"set hidden " Hide buffers when they are abandoned -"set mouse=a " Enable mouse usage (all modes) - -" expand tabs -set softtabstop=4 -set shiftwidth=4 -set expandtab - -set showbreak=▒▒ -" show these chars for tabs and trailing spaces -set list listchars=tab:»·,trail:· - -set pastetoggle= -" split right when using :vsp -set splitright - -set scrolloff=3 " keep at least 3 lines above/below -" Press i to enter insert mode, and ii to exit. -imap ii -" Press `` to toggle insert and replace mode (no key on Mac keyboard) -imap `` - -" fold between {{{ }}} +" fold {{{ set foldmethod=marker set foldlevelstart=99 " space will toggle current fold in normal mode, if not in a fold, normal @@ -160,7 +174,9 @@ vnoremap zf " save and restore folds autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent loadview +" }}} +function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) " {{{ " Jump to the next or previous line that has the same level or a lower " level of indentation than the current line. " @@ -172,7 +188,6 @@ autocmd BufWinEnter *.* silent loadview " false: Go to line with the same indentation level " skipblanks (bool): true: Skip blank lines " false: Don't skip blank lines -function! NextIndent(exclusive, fwd, lowerlevel, skipblanks) let line = line('.') let column = col('.') let lastline = line('$') @@ -207,4 +222,4 @@ onoremap [l :call NextIndent(0, 0, 0, 1) onoremap ]l :call NextIndent(0, 1, 0, 1) onoremap [L :call NextIndent(1, 0, 1, 1) onoremap ]L :call NextIndent(1, 1, 1, 1) -" end of jump indent +" end of jump indent }}} diff --git a/zshrc b/zshrc index 880805c..dd2e117 100644 --- a/zshrc +++ b/zshrc @@ -57,6 +57,8 @@ hash -d UniMaas=~/dropbox/Documents/UniMaas export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle # ros -source /opt/ros/groovy/setup.zsh -export ROS_WORKSPACE=~/src/ros -export ROS_OS_OVERRIDE=arch +if [[ -f "/opt/ros/groovy/setup.zsh" ]]; then + source /opt/ros/groovy/setup.zsh + export ROS_WORKSPACE=~/src/ros + export ROS_OS_OVERRIDE=arch +fi