diff --git a/.gitignore b/.gitignore index 9132d67..ebee737 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ irssi vim/bundle/* -!vim/bundle/vundle +!vim/bundle/Vundle.vim vim/spell .netrwhist diff --git a/.gitmodules b/.gitmodules index 19c1f6d..7fe50f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "vim/bundle/vundle"] - path = vim/bundle/vundle - url = git://github.com/gmarik/vundle.git [submodule "zsh/zilsh"] path = zsh/zilsh url = git@github.com:zilsh/zilsh.git [submodule "zsh/bundle/oh-my-zilsh"] path = zsh/bundle/oh-my-zilsh url = git@github.com:zilsh/oh-my-zilsh.git +[submodule "vim/bundle/Vundle.vim"] + path = vim/bundle/Vundle.vim + url = https://github.com/gmarik/Vundle.vim.git diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim new file mode 160000 index 0000000..8db3bcb --- /dev/null +++ b/vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5 diff --git a/vim/bundle/vundle b/vim/bundle/vundle deleted file mode 160000 index f31aa52..0000000 --- a/vim/bundle/vundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e diff --git a/vimrc b/vimrc index 2d14743..a520f2c 100644 --- a/vimrc +++ b/vimrc @@ -3,25 +3,38 @@ set nocompatible " Vundle filetype off " required! -set rtp+=~/.vim/bundle/vundle/ -call vundle#rc() +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() -" My Bundles here: -" -" original repos on github -Bundle 'gmarik/vundle' -Bundle 'scrooloose/nerdtree' -Bundle 'pangloss/vim-javascript' -Bundle 'tpope/vim-fugitive' -Bundle 'clones/vim-l9' -Bundle 'clones/vim-fuzzyfinder' -Bundle 'scrooloose/syntastic.git' -Bundle 'kien/ctrlp.vim' -Bundle 'Lokaltog/powerline' -Bundle 'flazz/vim-colorschemes' +" let Vundle manage Vundle, required +Plugin 'gmarik/Vundle.vim' + +Plugin 'L9' + +Plugin 'clones/vim-fuzzyfinder' +Plugin 'scrooloose/nerdtree' +Plugin 'kien/ctrlp.vim' +Plugin 'maxbrunsfeld/vim-yankstack', {'name': 'yankstack'} + +Plugin 'editorconfig/editorconfig-vim' + +Plugin 'pangloss/vim-javascript' +Plugin 'scrooloose/syntastic.git' + +Plugin 'mileszs/ack.vim' + +Plugin 'tpope/vim-fugitive' +Plugin 'airblade/vim-gitgutter' + +Plugin 'vim-airline', {'name': 'airline'} +Plugin 'flazz/vim-colorschemes' -filetype plugin indent on +" All of your Plugins must be added before the following line +call vundle#end() " required +filetype plugin indent on " required + " enable 256 color !!1! set t_Co=256 @@ -34,7 +47,7 @@ let mapleader = "," " CONFIGURATION MAPPING set scrolloff=3 " show 3 lines of context around the cursor set autoread " set to auto read when a file is changed from the outside -set mouse=a " allow for full mouse support +"set mouse=a " allow for full mouse support set autowrite set showcmd " show typed commands @@ -82,23 +95,10 @@ au GUIEnter * set vb t_vb= syntax enable " enable syntax highlighting -" Statusline - if has('statusline') set laststatus=2 - - " Broken down into easily includeable segments - set statusline=%<%f\ " Filename - set statusline+=%w%h%m%r " Options - set statusline+=%{fugitive#statusline()} " Git Hotness - set statusline+=\ [%{&ff}/%Y] " filetype - set statusline+=\ [%{getcwd()}] " current dir - "set statusline+=\ [A=\%03.3b/H=\%02.2B] " ASCII / Hexadecimal value of char - set statusline+=%=%-14.(%l,%c%V%)\ %p%% " Right aligned file nav info endif -" Powerline -set rtp+=~/.vim/bundle/powerline/powerline/bindings/vim " VIM 7.3 FEATURES @@ -121,7 +121,7 @@ set foldlevel=99 " ADDITIONAL KEY MAPPINGS " fast saving -nmap w :up +nmap w :update " fast escaping imap jj " prevent accidental striking of F1 key @@ -171,11 +171,15 @@ map sp [s map sa zg map s? z= -" numbers -set number -set relativenumber -nnoremap :set nonumber! -nnoremap :set relativenumber! +nmap hh :set invhlsearch +nmap ll :set invlist +nmap nn :set invnumber +nmap pp :set invpaste +nmap ii :set invrelativenumber + +if exists('+relativenumber') + set relativenumber +endif "" ADDITIONAL AUTOCOMMANDS @@ -226,6 +230,10 @@ nmap ]e vmap [egv vmap ]egv +" yankstack +nmap p yankstack_substitute_older_paste +nmap P yankstack_substitute_newer_paste + " MAIL HUMAN TEX au BufNewFile,BufRead *.txt set filetype=human au FileType human,mail,tex set expandtab textwidth=78 nocindent diff --git a/xinitrc b/xinitrc index d4cabab..0cc6954 100755 --- a/xinitrc +++ b/xinitrc @@ -4,36 +4,42 @@ # # Executed by startx (run your window manager from here) -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi +case $((hostname)) in + t430s-arch) + if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f + fi -start-pulseaudio-x11 -eval $(gpg-agent --daemon) & + pulseaudio --start -xrdb $HOME/.Xresources + eval $(gpg-agent --daemon) & -# add additional fonts -xset +fp /usr/share/fonts/local -xset fp rehash + xrdb $HOME/.Xresources -case $1 in - enlightenment) - exec enlightenment_start - ;; - xterm) - exec xterm - ;; - bspwm) - sxhkd & - exec bspwm - ;; - hlwm|*) # default is herbstluftwm - /usr/bin/xscreensaver -no-splash & - xbindkeys & - exec herbstluftwm --locked - ;; + # add additional fonts + xset +fp /usr/share/fonts/local + xset fp rehash + + case $1 in + enlightenment) + exec enlightenment_start + ;; + xterm) + exec xterm + ;; + bspwm) + sxhkd & + exec bspwm + ;; + hlwm|*) # default is herbstluftwm + /usr/bin/xscreensaver -no-splash & + xbindkeys & + exec herbstluftwm --locked + ;; + esac + ;; esac + diff --git a/zsh/bundle/npm/init.zsh b/zsh/bundle/npm/init.zsh new file mode 100644 index 0000000..da9818d --- /dev/null +++ b/zsh/bundle/npm/init.zsh @@ -0,0 +1,53 @@ +###-begin-npm-completion-### +# +# npm command completion script +# +# Installation: npm completion >> ~/.bashrc (or ~/.zshrc) +# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm +# + +COMP_WORDBREAKS=${COMP_WORDBREAKS/=/} +COMP_WORDBREAKS=${COMP_WORDBREAKS/@/} +export COMP_WORDBREAKS + +if type complete &>/dev/null; then + _npm_completion () { + local si="$IFS" + IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \ + COMP_LINE="$COMP_LINE" \ + COMP_POINT="$COMP_POINT" \ + npm completion -- "${COMP_WORDS[@]}" \ + 2>/dev/null)) || return $? + IFS="$si" + } + complete -F _npm_completion npm +elif type compdef &>/dev/null; then + _npm_completion() { + si=$IFS + compadd -- $(COMP_CWORD=$((CURRENT-1)) \ + COMP_LINE=$BUFFER \ + COMP_POINT=0 \ + npm completion -- "${words[@]}" \ + 2>/dev/null) + IFS=$si + } + compdef _npm_completion npm +elif type compctl &>/dev/null; then + _npm_completion () { + local cword line point words si + read -Ac words + read -cn cword + let cword-=1 + read -l line + read -ln point + si="$IFS" + IFS=$'\n' reply=($(COMP_CWORD="$cword" \ + COMP_LINE="$line" \ + COMP_POINT="$point" \ + npm completion -- "${words[@]}" \ + 2>/dev/null)) || return $? + IFS="$si" + } + compctl -K _npm_completion npm +fi +###-end-npm-completion-### diff --git a/zsh/bundle/oh-my-zilsh b/zsh/bundle/oh-my-zilsh index e5fdf78..22016bd 160000 --- a/zsh/bundle/oh-my-zilsh +++ b/zsh/bundle/oh-my-zilsh @@ -1 +1 @@ -Subproject commit e5fdf78509d41f2549335961a78f02d5146b6fe3 +Subproject commit 22016bd5512a09ef310ed5a56eaf03f660d83387 diff --git a/zsh/zilsh b/zsh/zilsh index 1120c71..7b1881d 160000 --- a/zsh/zilsh +++ b/zsh/zilsh @@ -1 +1 @@ -Subproject commit 1120c7175c0c47b36f54751016f61695dbd10c51 +Subproject commit 7b1881de4b77c52dfabe3278d2add6d9e3d8ccda