Skip to content

Commit

Permalink
Updates...
Browse files Browse the repository at this point in the history
  • Loading branch information
Garret Smith committed Jun 26, 2014
1 parent 76f1b94 commit b49e394
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 33 deletions.
55 changes: 30 additions & 25 deletions dot.vimrc
@@ -1,34 +1,37 @@

set nocompatible

filetype off

set rtp+=~/.vim/bundle/vundle
call vundle#rc()

Bundle 'gmarik/vundle'
Bundle 'tpope/vim-sleuth'
Bundle 'tpope/vim-git'
Bundle 'tpope/vim-fugitive'
Bundle 'kien/ctrlp.vim'
Bundle 'bling/vim-airline'
Bundle 'scrooloose/nerdtree'
"Bundle 'scrooloose/syntastic'
Bundle 'altercation/vim-colors-solarized'
Bundle 'jimenezrick/vimerl'
Bundle 'tpope/vim-markdown'
Bundle 'wesgibbs/vim-irblack'
Bundle 'gregsexton/gitv'
Bundle 'mbbill/undotree'
Bundle 'Valloric/YouCompleteMe'
Bundle 'lastpos.vim'
Bundle 'jistr/vim-nerdtree-tabs'
Bundle 'rking/ag.vim'
Bundle 'majutsushi/tagbar'
Bundle 'edkolev/erlang-motions.vim'
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()

Plugin 'gmarik/Vundle.vim'
Plugin 'tpope/vim-sleuth'
Plugin 'tpope/vim-git'
Plugin 'tpope/vim-fugitive'
Plugin 'kien/ctrlp.vim'
Plugin 'bling/vim-airline'
Plugin 'scrooloose/nerdtree'
"Plugin 'scrooloose/syntastic'
Plugin 'jimenezrick/vimerl'
Plugin 'tpope/vim-markdown'
Plugin 'gregsexton/gitv'
Plugin 'mbbill/undotree'
Plugin 'Valloric/YouCompleteMe'
Plugin 'lastpos.vim'
Plugin 'jistr/vim-nerdtree-tabs'
Plugin 'rking/ag.vim'
Plugin 'majutsushi/tagbar'
Plugin 'edkolev/erlang-motions.vim'

Plugin 'altercation/vim-colors-solarized'
Plugin 'wesgibbs/vim-irblack'
Plugin 'https://github.com/gregsexton/Atom'
Plugin 'https://github.com/gregsexton/Muon'

call vundle#end()

filetype plugin indent on

syntax on

set backup
Expand Down Expand Up @@ -115,6 +118,7 @@ endif

"let g:solarized_contrast="low"
let g:solarized_visibility="high"
let g:solarized_termtrans=1
set bg=dark
let g:no_bg=1
"colo lowc
Expand All @@ -124,6 +128,7 @@ let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#tabline#tab_nr_type = 1
let g:airline#extensions#tabline#buffer_nr_show = 1
let g:airline#extensions#tagbar#enabled = 1
let g:airline_powerline_fonts=1

"let g:airline_theme='solarized'
"let g:airline_solarized_bg='dark'
Expand Down
26 changes: 18 additions & 8 deletions dot.zshrc
Expand Up @@ -49,11 +49,11 @@ DISABLE_UNTRACKED_FILES_DIRTY="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(colored-man compleat fasd git sudo wd)
plugins=(colored-man compleat fasd git history-substring-search sudo wd)

source $ZSH/oh-my-zsh.sh

source ~/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
source ~/.zkbd/$TERM-$VENDOR-$OSTYPE

bindkey -e

Expand All @@ -62,14 +62,20 @@ bindkey -s "${key[F1]}" '!:1 '
bindkey -s "${key[F2]}" '!:2 '
bindkey -s "${key[F3]}" '!:3 '
bindkey -s "${key[F4]}" '!:4 '
bindkey -s "${key[F5]}" '!:5 '

# up arrow key search history backward, down arrow key search forward
autoload -U up-line-or-beginning-search
autoload -U down-line-or-beginning-search
zle -N up-line-or-beginning-search
zle -N down-line-or-beginning-search
bindkey "${key[Up]}" up-line-or-beginning-search
bindkey "${key[Down]}" down-line-or-beginning-search
#autoload -U up-line-or-beginning-search
#autoload -U down-line-or-beginning-search
#zle -N up-line-or-beginning-search
#zle -N down-line-or-beginning-search
#bindkey "${key[Up]}" up-line-or-beginning-search
#bindkey "${key[Down]}" down-line-or-beginning-search
bindkey "${key[Up]}" history-substring-search
bindkey "${key[Down]}" history-substring-search

bindkey "${key[End]}" end-of-line
bindkey "${key[Backspace]}" backward-delete-char

autoload -U select-word-style
select-word-style whitespace
Expand All @@ -88,3 +94,7 @@ ffg() { find "$1" -type f -exec grep -l "$2" \{\} \; }

zstyle ':completion:*' matcher-list '' '+m:{a-z}={A-Z}' '+m:{A-Z}={a-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

alias glggd='git log --graph --decorate --all --stat'

alias ls='gnuls --color'

1 change: 1 addition & 0 deletions statbar/statbar.c
Expand Up @@ -120,6 +120,7 @@ int main(int argc, char ** argv) {
packets_out = tcpstat.tcps_sndtotal;

printf(" ^ca(1, xscreensaver-command -lock)lock^ca()");
printf(" vol ^ca(1, mixer vol +5)up^ca()/^ca(1, mixer vol -5)down^ca()");

printf("\n");
fflush(stdout);
Expand Down

0 comments on commit b49e394

Please sign in to comment.