From ac1ffb870cc6a27a400bbca12ef04d6e24e093db Mon Sep 17 00:00:00 2001 From: Austen Date: Sat, 19 Apr 2014 13:25:29 -0400 Subject: [PATCH] Initial commit --- bash_aliases | 37 +++++++++ bash_functions | 20 +++++ bashrc | 118 ++++++++++++++++++++++++++ gitconfig | 31 +++++++ gitignore_global | 0 sync.sh | 50 +++++++++++ tmux.conf | 20 +++++ vimperatorrc | 12 +++ vimrc | 211 +++++++++++++++++++++++++++++++++++++++++++++++ wemux.sh | 4 + 10 files changed, 503 insertions(+) create mode 100644 bash_aliases create mode 100644 bash_functions create mode 100644 bashrc create mode 100644 gitconfig create mode 100644 gitignore_global create mode 100755 sync.sh create mode 100644 tmux.conf create mode 100644 vimperatorrc create mode 100644 vimrc create mode 100755 wemux.sh diff --git a/bash_aliases b/bash_aliases new file mode 100644 index 0000000..9cd3ee4 --- /dev/null +++ b/bash_aliases @@ -0,0 +1,37 @@ +#Colors! +alias ls='ls --color=always -F' +alias less='less -r' +alias tree='tree -C' +alias grep="grep --color=auto" + +alias skim="(head -5; tail -5) <" + +# Show where you copy +alias cp="cp -v" + +alias la='ls -lah $LS_COLOR' +function cl(){ cd "$@" && ls; } + +alias dt='date "+%F %T"' +#HISTCONTROL=ignoredups +#PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ; }"'echo `dt` `pwd` $$ $USER "$(history 1)" >> ~/.bash_eternal_history && sed -i \'$ d\' ~/.bash_eternal_history' + + +if [ "$BASH" ]; then + export HISTTIMEFORMAT="%Y-%m-%d_%H:%M:%S " + export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ; }"'echo "`date +'%y.%m.%d-%H:%M:%S:'`" $USER "$(pwd)" "$(history 1 | cut -c8-)" >> ~/.bash_eternal_history' + alias ehistory='tail -f ~/.bash_eternal_history' + readonly PROMPT_COMMAND + readonly HISTSIZE + readonly HISTFILE + readonly HOME + readonly HISTIGNORE + readonly HISTCONTROL +fi + + +alias install='sudo apt-get install' +alias remove='sudo apt-get remove' +alias update='sudo apt-get update' +alias upgrade='sudo apt-get update && sudo apt-get upgrade' +alias ..='cl ..' diff --git a/bash_functions b/bash_functions new file mode 100644 index 0000000..51e669f --- /dev/null +++ b/bash_functions @@ -0,0 +1,20 @@ +extract () { + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xvjf $1 ;; + *.tar.gz) tar xvzf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) rar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xvf $1 ;; + *.tbz2) tar xvjf $1 ;; + *.tgz) tar xvzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1 ;; + *.7z) 7z x $1 ;; + *) echo "don't know how to extract '$1'..." ;; + esac + else + echo "'$1' is not a valid file!" + fi +} diff --git a/bashrc b/bashrc new file mode 100644 index 0000000..3628506 --- /dev/null +++ b/bashrc @@ -0,0 +1,118 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi +export CLASSPATH=/home/stonewareslord/ownCloud/school/compsci/Year2/classes/gridworld.jar +function tsh(){ + ssh $* -t 'tmux a || tmux || /bin/bash' +} diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..db32aff --- /dev/null +++ b/gitconfig @@ -0,0 +1,31 @@ +[user] + name = Austen + email = stonewareslord@gmail.com +[alias] + pu = push --all + co = checkout + ci = commit -m + a = add + st = status + br = branch + hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short + type = cat-file -t + dump = cat-file -p + d = difftool + lg = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit +[push] + default = simple +[core] + excludesfile = /home/stonewareslord/.gitignore_global +[diff] + tool = vimdiff +[difftool] + prompt = false +[merge] + tool = diffconflicts +[mergetool "diffconflicts"] + cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED + trustExitCode = true + keepBackup = false +[http] + sslVerify = false diff --git a/gitignore_global b/gitignore_global new file mode 100644 index 0000000..e69de29 diff --git a/sync.sh b/sync.sh new file mode 100755 index 0000000..def830a --- /dev/null +++ b/sync.sh @@ -0,0 +1,50 @@ +trash ~/.tmux.conf ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.gitignore_global ~/.bashrc ~/.bash_aliases ~/.bash_functions +ln -s ${PWD}/gitignore_global ~/.gitignore_global +ln -s ${PWD}/vimrc ~/.vimrc +ln -s ${PWD}/vimperatorrc ~/.vimperatorrc +ln -s ${PWD}/tmux.conf ~/.tmux.conf +ln -s ${PWD}/gitconfig ~/.gitconfig +ln -s ${PWD}/bashrc ~/.bashrc +ln -s ${PWD}/bash_aliases ~/.bash_aliases +ln -s ${PWD}/bash_functions ~/.bash_functions +while getopts :b option +do + case "$option" in + b) + if [ -f ~/.vim/bundle/vundle/ ] + then + echo "Installing vundle" + git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle + fi + vim +BundleInstall +qa + ;; + *) + echo "Flag not found" + ;; + esac +done +if [ -f ~/.vim/plugin/ ] +then + echo "Installing plugin folder in ~/.vim/" + mkdir -p ~/.vim/plugin/ +fi +if [ -f ~/.vim/plugin/backup/ ] +then + echo "Installing backup folder in ~/.vim/" + mkdir -p ~/.vim/backup/ +fi +if [ -f ~/.vim/plugin/undo/ ] +then + echo "Installing undo folder in ~/.vim/" + mkdir -p ~/.vim/undo/ +fi +if [ -f ~/.vim/tmp/ ] +then + echo "Installing tmp folder in ~/.vim/" + mkdir -p ~/.vim/tmp/ +fi +if [ ! -f ~/.vim/plugin/sessionman.vim ] +then + echo "Installing sessionman in ~/.vim/plugin/" + wget -O ~/.vim/plugin/sessionman.vim http://www.vim.org/scripts/download_script.php?src_id=15599 +fi diff --git a/tmux.conf b/tmux.conf new file mode 100644 index 0000000..c71b1af --- /dev/null +++ b/tmux.conf @@ -0,0 +1,20 @@ +set -g status-bg black +set -g status-fg white +set -g status-left '#[fg=green]#H' +set-window-option -g window-status-current-bg red +setw -g monitor-activity on +set -g visual-activity on +setw -g automatic-rename on +unbind % +bind | split-window -h +bind - split-window -v +set -g default-terminal "screen-256color" +set-option -g history-limit 10000 + +set -g prefix C-a +bind C-a send-prefix +unbind C-b +bind-key k select-pane -U +bind-key j select-pane -D +bind-key h select-pane -L +bind-key l select-pane -R diff --git a/vimperatorrc b/vimperatorrc new file mode 100644 index 0000000..1fee496 --- /dev/null +++ b/vimperatorrc @@ -0,0 +1,12 @@ +nnoremap j 6j +nnoremap k 6k +noremap J gt +noremap K gT +noremap :tabm +1 +noremap :tabm -1 +set animations=true +"set complete= +"set hintchars=hjklasdfgyuiopqwertnmzxcvb +colorscheme vimPgray +set titlestring= +set newtab=all diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..d57a0b6 --- /dev/null +++ b/vimrc @@ -0,0 +1,211 @@ +inoremap pumvisible() ? "\" : "\" +imap \ neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : pumvisible() ? "\" : "\" +smap \ neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : "\" +let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets' +if has('conceal') + set conceallevel=2 concealcursor=i +endif +nnoremap autoformat! :%s/, /,:%s/ \/ /\/:%s/ {/{:%s/} /}:%s/ = /= +command! W %!sudo tee > /dev/null % +au BufWritePost .vimrc so ~/.vimrc +au VimResized * exe "normal! \=" +match Error /\s\+$/ +"nnoremap s xa +"nnoremap :UndotreeToggle +nnoremap G G$ +vnoremap G G$ +nnoremap :GundoToggle +nnoremap :TagbarToggle +nnoremap + +nnoremap - +nnoremap Q +noremap +nnoremap a :!git st:!ls:!git a +nnoremap up :!git pull origin +nnoremap st :!git st +nnoremap ci :!git st:!git ci "" +nnoremap log :!git hist +nnoremap br :!git br +nnoremap gb :ls:b +nnoremap d :bd +nnoremap q :q +nnoremap W :%s/\s\+$//:let @/='' +nnoremap o m`o`` +nnoremap O m`O`` +nnoremap go %m`%x`` +nnoremap :set hlsearch! hlsearch? +nnoremap if m"Oif(){jo}`"v>k^wa +nnoremap else m"kAelse{jo}`"v> +nnoremap for m"Ofor(){jo}`"v>k^wa +nnoremap while m"Owhile(){jo}`"v>k^wa +nnoremap rm m"kddjddkv<`" +nnoremap { O//{{{jo//}}}kk^la +vnoremap * :call VisualSelection('f') +vnoremap # :call VisualSelection('b') +vnoremap { ``>o//}}}`if ``>o}gv>`else ``>o}gv> +vnoremap for ``>o}gv>`while ``>o}gv>`rm `<kdd`>jddgv< +"nnoremap zo:set hlsearch! hlsearch? +nnoremap :nohlsearchgzo +nnoremap U +nnoremap K ik$ +nnoremap :w +"nnoremap s c +nnoremap j gj +nnoremap k gk +nnoremap H ^ +nnoremap L $ +nnoremap Y y$ +nnoremap h +nnoremap j +nnoremap k +nnoremap l +map , (easymotion-prefix) +noremap ! :! +nnoremap ; : +noremap J Jx +nnoremap ;; m"A;`" +vnoremap < >gv +vnoremap "+y +vnoremap "+y +inoremap +vnoremap +noremap o +nnoremap == yyPv$r=jyypv$r= +nnoremap ** yyPv$r*jyypv$r* +nnoremap = yypv$r= +nnoremap - yypv$r- +nnoremap ^ yypv$r^ +nnoremap " yypv$r" +set diffopt+=iwhite +set noesckeys +set mouse-=a +set expandtab +set shiftwidth=2 +set history=1000 +set hidden +set cursorline +set incsearch +set showmatch +set hlsearch +set scrolloff=3 +set scrolljump=5 +set autoindent +set backup +set backupdir=~/.vim/backup +set directory=~/.vim/tmp +set undolevels=1000 +set history=200 +set ttyfast +set ff=unix +inoremap '' '' +inoremap "" "" +inoremap () () +inoremap <> <> +inoremap {} {}O +inoremap [] [] +inoremap ;; m`A;``a +inoremap +inoremap +inoremap +inoremap +syntax on +let g:formatprg_cpp = "astyle" +let g:formatprg_args_expr_cpp = " --mode=c --style=1tbs -xe -k1 -j" +" -xn -xc -xl -S +let g:airline#extensions#tabline#enabled=1 +let g:Powerline_symbols = 'fancy' +set encoding=utf-8 +set laststatus=2 +set foldmethod=marker +set foldnestmax=10 +set foldlevel=2 +set rnu +set nu +set ts=2 sw=2 et +let g:indent_guides_start_level=2 +let g:indent_guides_guide_size=1 +let g:indent_guides_enable_on_vim_startup=1 +set background=dark +set t_Co=256 +set gdefault +let g:neocomplcache_enable_at_startup=1 +let g:neocomplcache_enable_camel_case_completion=1 +let g:neocomplcache_enable_smart_case=1 +let g:neocomplcache_enable_underbar_completion=1 +let g:neocomplcache_enable_auto_delimiter=1 +let g:neocomplcache_max_list=20 +let g:neocomplcache_force_overwrite_completefunc=1 +let g:neocomplcache_min_syntax_length = 2 + +let g:php_refactor_command='php /usr/local/bin/refactor.phar' +inoremap neocomplcache#smart_close_popup()."\" +"let g:neocomplcache_enable_auto_select = 1 +let loaded_matchit = 1 +set nocompatible " be iMproved +filetype off " required! +set rtp+=~/.vim/bundle/vundle/ +call vundle#rc() +Bundle 'gmarik/vundle' +Bundle 'Chiel92/vim-autoformat' +Bundle 'tpope/vim-surround' +Bundle 'scrooloose/syntastic' +Bundle 'Shougo/neocomplcache.vim' +Bundle 'nathanaelkane/vim-indent-guides' +Bundle 'elzr/vim-json' +Bundle 'groenewege/vim-less' +Bundle 'pangloss/vim-javascript' +Bundle 'briancollins/vim-jst' +Bundle 'kchmck/vim-coffee-script' +Bundle 'Lokaltog/powerline-fonts' +Bundle 'bling/vim-airline' +Bundle 'terryma/vim-multiple-cursors' +Bundle 'scrooloose/nerdtree' +Bundle 'altercation/vim-colors-solarized' +Bundle 'spf13/vim-colors' +Bundle 'Floobits/floobits-vim' +Bundle 'spf13/PIV' +Bundle 'vim-scripts/AutoTag' +Bundle 'Lokaltog/vim-easymotion' +"Bundle 'tsaleh/vim-matchit' +Bundle 'mbbill/undotree' +Bundle 'vim-php/vim-php-refactoring' +Bundle 'tpope/vim-fugitive' +Bundle 'kien/ctrlp.vim' +Bundle 'vim-scripts/YankRing.vim' +Bundle 'majutsushi/tagbar' +Bundle 'sjl/gundo.vim' +"Bundle 'Shougo/neosnippet' +"Bundle 'honza/vim-snippets' +"Bundle 'msanders/snipmate.vim' +filetype plugin indent on +if exists("+undofile") + if isdirectory($HOME . '/.vim/undo') == 0 + :silent !mkdir -p ~/.vim/undo > /dev/null 2>&1 + endif + set undodir=./.vim-undo// + set undodir+=~/.vim/undo// + set undofile +endif +augroup vimrcEx + au! + " When editing a file, always jump to the last known cursor position. + autocmd BufReadPost * + \ if line("'\"") > 0 && line("'\"") <= line("$") | + \ exe "normal g`\"" | + \ endif +augroup END +if has('gui_running') + set guioptions-=T + set lines=40 + colorscheme fruity +else + if &term == 'xterm' || &term == 'screen' + set t_Co=256 + endif + colorscheme torte +endif diff --git a/wemux.sh b/wemux.sh new file mode 100755 index 0000000..15018b2 --- /dev/null +++ b/wemux.sh @@ -0,0 +1,4 @@ +git clone git://github.com/zolrath/wemux.git /usr/local/share/wemux +ln -s /usr/local/share/wemux/wemux /usr/local/bin/wemux +cp /usr/local/share/wemux/wemux.conf.example /usr/local/etc/wemux.conf +vim /usr/local/etc/wemux.conf +:13