diff --git a/bash_profile b/bash_profile index d1fb79b..cf5d27c 100644 --- a/bash_profile +++ b/bash_profile @@ -1 +1,3 @@ . ~/.bashrc + +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* diff --git a/bashrc b/bashrc index 94dc114..e415184 100644 --- a/bashrc +++ b/bashrc @@ -16,3 +16,5 @@ if [ -d "${HOME}/.bash" ] ; then . "${file}" done fi + +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting diff --git a/commonsh/02_term b/commonsh/02_term index 23d8e58..eea41f0 100755 --- a/commonsh/02_term +++ b/commonsh/02_term @@ -8,6 +8,9 @@ fix_term () echo $1 else case $1 in + xterm-termite) + fix_term xterm-256colors + ;; rxvt|xterm?*|kterm|putty|screen) fix_term xterm ;; @@ -90,7 +93,7 @@ if command -v infocmp >/dev/null 2>&1 ; then export TERM case $TERM in - *256*) + *256*|xterm-termite) alias screen="screen -T `fix_term xterm-256color`" ;; linux) diff --git a/commonsh/10_alias b/commonsh/10_alias index 9922ba4..36f1917 100755 --- a/commonsh/10_alias +++ b/commonsh/10_alias @@ -99,5 +99,6 @@ alias du='du -h' alias ping='ping -c4' alias cobiwin='rdesktop -u Cobi -g 1440x900 -x 0x80 -B cobiwin.cobi.ninja' alias cssh='cssh -l root' +alias ssh='TERM=xterm-256color ssh' command -v time >/dev/null 2>&1 && alias time='command time' diff --git a/commonsh/11_cobi b/commonsh/11_cobi index 50d4884..7311eee 100755 --- a/commonsh/11_cobi +++ b/commonsh/11_cobi @@ -1 +1,4 @@ #! /bin/sh +export OKTA_HOME=/home/cobi/oktagit + +[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" diff --git a/shinit b/shinit index 49e334f..435e3c5 100644 --- a/shinit +++ b/shinit @@ -9,3 +9,5 @@ if [ -d "${HOME}/.sh" ] ; then . "${file}" done fi + +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting diff --git a/vim/after/plugin/colorscheme.vim b/vim/after/plugin/colorscheme.vim new file mode 100644 index 0000000..abf97f8 --- /dev/null +++ b/vim/after/plugin/colorscheme.vim @@ -0,0 +1,2 @@ +set background=dark +colorscheme wombat diff --git a/vim/ftdetect/ipr.vim b/vim/ftdetect/ipr.vim new file mode 100644 index 0000000..c2b2c57 --- /dev/null +++ b/vim/ftdetect/ipr.vim @@ -0,0 +1 @@ +au BufRead,BufNewFile *.ipr set filetype=ipr diff --git a/vim/init.vim b/vim/init.vim new file mode 120000 index 0000000..e339a2b --- /dev/null +++ b/vim/init.vim @@ -0,0 +1 @@ +/home/cobi/.vimrc \ No newline at end of file diff --git a/vim/syntax/ipr.vim b/vim/syntax/ipr.vim new file mode 100644 index 0000000..8ca4594 --- /dev/null +++ b/vim/syntax/ipr.vim @@ -0,0 +1,56 @@ +" Vim syntax file +" Language: okta-iptables rules file +" Maintainer: Jacobi Carter +" Latest Revision: 06 April 2016 + +" To install me: +" Copy me to ~/.vim/syntax/ipr.vim +" Create a new file in ~/.vim/ftdetect/ipr.vim with this line: +" au BufRead,BufNewFile *.ipr set filetype=ipr +" +" If you want to install me as a pathogen bundle: +" Copy me to ~/.vim/bundle/okta-iptables/syntax/ipr.vim +" Create a new file in ~/.vim/bundle/okta-iptables/ftdetect/ipr.vim with this +" line: +" au BufRead,BufNewFile *.ipr set filetype=ipr + +if exists("b:current_syntax") + finish +endif + +syn match iprMacro '[A-Z0-9_]\+' + +syn match iprConstant '[a-z0-9][a-z0-9.:-]*' + +syn keyword iprTodo contained TODO FIXME XXX NOTE +syn match iprComment "//.*$" contains=iprTodo +syn match iprComment "#.*$" contains=iprTodo +syn region iprComment start='/\*' end='\*/' contains=iprTodo +syn keyword iprScope sector quadrant account slice cell installation aws_region +syn match iprPort '\(tcp\|udp\|icmp\)/\(\d*\-\d*\|\d*\|\-\)' +syn keyword iprVia ipsec unencrypted +syn keyword iprOps , ; +syn match iprOps '-\>' +syn keyword iprKeyword in nextgroup=iprScope +syn keyword iprKeyword on nextgroup=iprPort +syn match iprKeyword 'within\ same' nextgroup=iprScope +syn keyword iprKeyword all any +syn match iprKeyword '\*' +syn keyword iprKeyword over nextgroup=iprVia +syn match iprCidr '\(\([0-9]\|[1-9][0-9]\|1[0-9]\{2\}\|2[0-4][0-9]\|25[0-5]\)\.\)\{3\}\([0-9]\|[1-9][0-9]\|1[0-9]\{2\}\|2[0-4][0-9]\|25[0-5]\)\/\([1-2][0-9]\|3[0-2]\|[0-9]\)' +syn match iprPreProc '^\s*#.*$' +syn region iprComment start='#if 0' end='#endif' contains=iprTodo + +let b:current_syntax = "ipr" + +hi def link iprTodo Todo +hi def link iprComment Comment +hi def link iprKeyword Keyword +hi def link iprPort Number +hi def link iprScope Type +hi def link iprOps Operator +hi def link iprVia Label +hi def link iprCidr Number +hi def link iprMacro Constant +hi def link iprConstant String +hi def link iprPreProc PreProc diff --git a/zsh/bindkey b/zsh/bindkey index add3cd6..b3b898e 100755 --- a/zsh/bindkey +++ b/zsh/bindkey @@ -23,8 +23,8 @@ case $TERM in bindkey '\e[5D' emacs-backward-word bindkey '\eO5C' emacs-forward-word bindkey '\eO5D' emacs-backward-word - bindkey '\eOC' emacs-forward-word - bindkey '\eOD' emacs-backward-word + bindkey '\eOC' forward-char + bindkey '\eOD' backward-char bindkey '\eOc' emacs-forward-word bindkey '\eOd' emacs-backward-word bindkey '\e[c' emacs-forward-word diff --git a/zsh/prompt b/zsh/prompt index 26c2fba..1d7f353 100755 --- a/zsh/prompt +++ b/zsh/prompt @@ -6,7 +6,7 @@ BOLDERRORCOLOR='' BLACKCOLOR='' case "${TERM}" in - *256color*) + *256color*|xterm-termite) RESETCOLOR=$'%{\e[00;00m%}' if [ -z "${SSH_TTY}" ] ; then HOSTCOLOR=$'%{\e[01;38;5;113m%}' diff --git a/zshrc b/zshrc index 8cfc3a2..055c34f 100644 --- a/zshrc +++ b/zshrc @@ -56,3 +56,5 @@ if [ -d "${HOME}/.zsh" ] ; then . "${HOME}/.zsh/${file}" done fi + +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting