Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:Funkmyster/Terminal

  • Loading branch information...
commit 4d387bd82a2991a7c730c51e7cec1c467a3f4250 2 parents 3ba1c55 + cd14bfb
@Funkmyster authored
View
3  .gitmodules
@@ -10,3 +10,6 @@
[submodule "vim/vim-latex"]
path = vim/vim-latex
url = git://vim-latex.git.sourceforge.net/gitroot/vim-latex/vim-latex
+[submodule "vim/vim/bundle/vim-bufexplorer"]
+ path = vim/vim/bundle/vim-bufexplorer
+ url = git://github.com/vim-scripts/bufexplorer.zip.git
View
20 bash/bashrc
@@ -92,6 +92,7 @@ bakcyn='\e[46m' # Cyan
bakwht='\e[47m' # White
txtrst='\e[0m' # Text Reset
+#PS1="\n\[\033[35m\]\$(/bin/date)\n\[\033[32m\]\w\n\[\033[1;31m\]\u@\h: \[\033[1;34m\]\$(/usr/bin/tty | /bin/sed -e 's:/dev/::'): \[\033[1;36m\]\$(/bin/ls -1 | /usr/bin/wc -l | /bin/sed 's: ::g') files \[\033[1;33m\]\$(/bin/ls -lah | /bin/grep -m 1 total | /bin/sed 's/total //')b\[\033[0m\] -> \[\033[0m\]"
if [ "$color_prompt" = yes ]; then
#PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
@@ -104,15 +105,17 @@ 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"
+ #PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+ PS1="${SCREENID}${debian_chroot:+($debian_chroot)}\[$bldpur\]\u\[$bldcyn\]@\[$bldgrn\]\h\[$bldblu\]:\w\[$bldgrn\]"
;;
*)
;;
esac
+PS1="$PS1 \n\[$txtgrn\][\t]\[$txtrst\]: "
# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
+#if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --classify --tabsize=0 --literal --color=auto --show-control-chars --human-readable --group-directories-first'
alias dir='dir --color=auto'
@@ -122,7 +125,7 @@ if [ -x /usr/bin/dircolors ]; then
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
alias tree='tree -C'
-fi
+#fi
# some more ls aliases
alias ll='ls -alF'
@@ -133,9 +136,14 @@ alias work='screen -c ~/Libs/Terminal/screen/work.screen'
alias station='screen -c ~/Libs/Terminal/screen/workstation.screen'
alias farm='screen -c ~/Libs/Terminal/screen/farm.screen'
-alias vim="/usr/bin/vim --servername JSILVA-$PPID-$SCREENID --remote-tab-silent"
+alias vim="/usr/bin/vim "
+alias vim="/usr/local/bin/vim --servername JSILVA-$PPID-$SCREENID --remote-tab-silent"
+
alias python="/usr/bin/python -B "
+alias vless='/usr/bin/vim -u /usr/share/vim/vim73/macros/less.vim'
+alias lint='pylint --reports=n --output-format=colorized'
+
# Alias definitions.
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
@@ -149,7 +157,8 @@ fi
export DJANGO_HOME=~/Libs/Django
if [ -d $DJANGO_HOME ] ; then
- source $DJANGO_HOME/extras/django_bash_completion
+ #source $DJANGO_HOME/extras/django_bash_completion
+ source ~/Libs/Terminal/django/bash_completion
fi
# enable programmable completion features (you don't need to enable
@@ -177,4 +186,5 @@ export MYSQL_PS1="MySQL [$USER@$HOSTNAME] [\U] [\d] [\r:\m:\s \P] [\c]: "
PYTHONSTARTUP=~/.pythonrc.py
export PYTHONSTARTUP
export EDITOR="/usr/bin/vim --servername JSILVA-$PPID-$SCREENID --remote-tab-silent"
+export EDITOR="/usr/local/bin/vim --servername JSILVA-$PPID-$SCREENID --remote-tab-silent"
View
72 django/bash_completion
@@ -0,0 +1,72 @@
+# #########################################################################
+# This bash script adds tab-completion feature to django-admin.py and
+# manage.py.
+#
+# Testing it out without installing
+# =================================
+#
+# To test out the completion without "installing" this, just run this file
+# directly, like so:
+#
+# . ~/path/to/django_bash_completion
+#
+# Note: There's a dot ('.') at the beginning of that command.
+#
+# After you do that, tab completion will immediately be made available in your
+# current Bash shell. But it won't be available next time you log in.
+#
+# Installing
+# ==========
+#
+# To install this, point to this file from your .bash_profile, like so:
+#
+# . ~/path/to/django_bash_completion
+#
+# Do the same in your .bashrc if .bashrc doesn't invoke .bash_profile.
+#
+# Settings will take effect the next time you log in.
+#
+# Uninstalling
+# ============
+#
+# To uninstall, just remove the line from your .bash_profile and .bashrc.
+
+_django_completion()
+{
+ COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
+ COMP_CWORD=$COMP_CWORD \
+ DJANGO_AUTO_COMPLETE=1 $1 ) )
+}
+complete -F _django_completion -o default django-admin.py manage.py django-admin
+
+_python_django_completion()
+{
+ if [[ ${COMP_CWORD} -ge 2 ]]; then
+ PYTHON_EXE=$( basename -- ${COMP_WORDS[0]} )
+ echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
+ if [[ $? == 0 ]]; then
+ PYTHON_SCRIPT=$( basename -- ${COMP_WORDS[1]} )
+ echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
+ if [[ $? == 0 ]]; then
+ COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
+ COMP_CWORD=$(( COMP_CWORD-1 )) \
+ DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
+ fi
+ fi
+ fi
+}
+
+# Support for multiple interpreters.
+unset pythons
+if command -v whereis &>/dev/null; then
+ python_interpreters=$(whereis python | cut -d " " -f 2-)
+ for python in $python_interpreters; do
+ pythons="${pythons} $(basename -- $python)"
+ done
+ pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+else
+ pythons=python
+fi
+
+complete -F _python_django_completion -o default $pythons
+
View
7 install.sh
@@ -26,4 +26,9 @@ rm ~/.vimrc
ln -s ~/Libs/Terminal/vim/vimrc ~/.vimrc
rm -rf ~/.vim
-ln -s ~/Libs/Terminal/vim/vim ~/.vim
+mkdir -p ~/.vim/autoload/
+
+mkdir ~/.vim/autoload/pathogen
+ln -s ~/Libs/Terminal/vim/pathogen/autoload/pathogen.vim ~/.vim/autoload/pathogen.vim
+
+ln -s ~/Libs/Terminal/vim/vim/bundle ~/.vim/bundle
View
9 less/color_filter
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+case "$1" in
+ *.awk|*.java|*.js|*.php|*.sh|*.inc|*.ch|*.xml|*.diff|*.patch|*.py|*.sql)
+ pygmentize -f 256 "$1";;
+ ;;
+ *)
+ pygmentize -f 256 -l sh "$1"
+ grep
View
36 screen/ut.screen
@@ -0,0 +1,36 @@
+startup_message off
+vbell off
+activity "Activity in %t(%n)"
+shelltitle "sh"
+defscrollback 10000
+
+#correct overwriting
+altscreen on
+
+
+caption always '%{= kG}[ %{G}%H %{g}][ %{W}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}][%{B}%Y-%m-%d %{W}%c %{g}]'
+
+#backtick 51 1 1 mocp --format "Moc [%artist] [%album] [%song] [%tl]"
+backtick 52 5 5 /root/Libs/Terminal/screen/mem.sh
+hardstatus alwayslastline
+#hardstatus string "%{= kG}%{W}%51`%{-} %{B}|%{-} %= %{kG}[%{-}%{W}Load: %l %{g}]%{-} %{B}|%{-} %{g}[%{-}%{W}%52`%{-}%{g}]%{-}"
+hardstatus string "%{= kG}%{W}%51`%{-} %{B}|%{-} %= %{kG}[%{-}%{W}Load: %l %{g}]%{-} %{B}|%{-} %{g}[%{-}%{W}%52`%{-}%{g}]%{-}"
+
+bind j focus down
+bind k focus up
+bind t focus top
+bind b focus bottom
+
+
+
+screen -t Server 0
+screen -t Bash 1
+screen -t Vim 2
+screen -t Test 3
+screen -t Svn 4
+screen -t IPython 5
+chdir /root/pype/26.3.2/lib/python2.6/site-packages/django/
+screen -t Docs 6
+screen -t Irssi 7
+
+select 0
2  vim/pathogen
@@ -1 +1 @@
-Subproject commit 7701d8220115fe3d1bbead51773346eccc3276af
+Subproject commit ab64b4ddd0c184a528780b498a0b0a5b40248f7c
2  vim/vim-latex
@@ -1 +1 @@
-Subproject commit 36d275da3266c1b0cdc8f525f4d977d0154241f1
+Subproject commit 3592f2eb47b67ac4760244bb822694d77311f037
2  vim/vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit 1b7e4070f5f7b7522422f5b00a75b323cc314daf
+Subproject commit 03e138c3496926b193402f4e1542f0a99924f999
1  vim/vim/bundle/vim-bufexplorer
@@ -0,0 +1 @@
+Subproject commit 6c4b3ffaa89c4788f73e9e3f490acf6bc08e8dd9
View
4 vim/vimrc
@@ -15,6 +15,10 @@ filetype plugin indent on "This helps python tabbing
set autoindent
set smartindent
+set tabstop=4
+set shiftwidth=4
+set expandtab
+
set hlsearch "Highlight search results"
set incsearch "Increment search as I type"
Please sign in to comment.
Something went wrong with that request. Please try again.