Permalink
Browse files

s/bash+screen/zsh+tmux/

  • Loading branch information...
1 parent c0c4592 commit 42ec790da280e330eea4243244de6a22dbca0ecf @itdaniher committed Jun 20, 2012
Showing with 28 additions and 91 deletions.
  1. +3 −0 .gitmodules
  2. +0 −65 home/olpc/.bashrc
  3. +0 −26 home/olpc/.screenrc
  4. +1 −0 home/olpc/.tmux.conf
  5. +23 −0 home/olpc/.zshrc
  6. +1 −0 home/olpc/.zshuery
View
@@ -0,0 +1,3 @@
+[submodule "home/olpc/.zshuery"]
+ path = home/olpc/.zshuery
+ url = git://github.com/myfreeweb/zshuery.git
View
@@ -1,65 +0,0 @@
-#FIX FOR JAVA-DWM FUCKUP
-AWT_TOOLKIT=MToolkit
-export AWT_TOOLKIT
-
-TERM=xterm
-export TERM
-
-#Paths
-PATH=""
-export PATH
-PATH=$PATH:/bin
-PATH=$PATH:/sbin
-PATH=$PATH:/usr/bin
-PATH=$PATH:/usr/sbin
-PATH=$PATH:/usr/games
-PATH=$PATH:/usr/local/bin
-PATH=$PATH:$HOME/bash
-PATH=$PATH:/usr/games
-export PATH
-
-HISTFILESIZE=1000000
-export HISTFILESIZE
-
-EDITOR=nano
-export EDITOR
-
-RANDOM=$(cat /dev/urandom|head -n 2)
-
-source ~/.config/suckless/settings
-
-export HISTCONTROL=ignoredups
-export HISTCONTROL=ignoreboth
-
-shopt -s checkwinsize
-
-case "$TERM" in
- xterm-color) color_prompt=yes;;
-esac
-
-eval "`dircolors -b`"
-alias ls="ls -h --color=auto"
-alias grep="grep --color=auto"
-alias xbs="xoset b"
-alias pms="sudo xo-suspend"
-alias pgrep="pgrep -lf"
-
-# convert permissions to octal - http://www.shell-fu.org/lister.php?id=205
-alias lo='ls -lah | sed -e 's/--x/1/g' -e 's/-w-/2/g' -e 's/-wx/3/g' -e 's/r--/4/g' -e 's/r-x/5/g' -e 's/rw-/6/g' -e 's/rwx/7/g' -e 's/---/0/g''
-
-# If not running interactively, don't do anything else
-[ -z "$PS1" ] && return
-
-#export PROMPT_COMMAND='echo -ne "$USER@$HOSTNAME:$PWD"'
-export PROMPT_COMMAND='echo -ne "\e]0; $USER@$HOSTNAME:$PWD \a\033k\033\\"'
-#export PROMPT_COMMAND='echo -ne "$USER@$HOSTNAME:$PWD \a\033k\033\\"'
-#"\033k\033\\" - to help screen
-#"\e]0; \u@\h:\w \a" - to set xterm title
-export PS1='\u@\h:\w \$ '
-
-for a in $(ls /etc/bash_completion.d/)
-do
-source "/etc/bash_completion.d/$a"
-done
-
-#screen -xAr
View
@@ -1,26 +0,0 @@
-startup_message off
-
-vbell on
-
-shelltitle "$ |bash"
-#sets screen "tab" title to either bash or whatever job is running
-
-deflogin on
-
-# define a bigger scrollback, default is 100 lines
-defscrollback 1024
-
-defutf8 on
-#use utf-8 charset by default
-
-hardstatus alwayslastline "[ %H ] %= %{= y}%-w%{= rY} %n %t %{-}%{=y}%+w%{= dd} %= [ %Y.%m.%d :: %c:%s ]"
-caption always "%{= y}"
-
-termcapinfo xterm*|rxvt*|kterm*|Eterm* hs:ts=\E]0;:fs=\007:ds=\E]0;\007
-
-termcapinfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l'
-#change the xterm initialization string from is2=\E[!p\E[?3;4l\E[4l\E>
-
-termcapinfo xterm* ti@:te@
-#adds screen's output to xterm's scrollback
-
View
@@ -0,0 +1 @@
+set-option -g default-shell /bin/zsh
View
@@ -0,0 +1,23 @@
+source ~/.zshuery/zshuery.sh
+load_defaults
+load_aliases
+load_completion ~/.zshuery/completion
+load_correction
+
+prompts '%{$fg_bold[green]%}$(COLLAPSED_DIR)%{$reset_color%}$(virtualenv_info) %{$fg[yellow]%}$(prompt_char)%{$reset_color%} ' '%{$fg[red]%}$(ruby_version)%{$reset_color%}'
+
+if [[ $IS_MAC -eq 1 ]]; then
+ export EDITOR='mvim'
+else
+ export EDITOR='vim'
+fi
+
+chpwd() {
+ update_terminal_cwd
+}
+
+export PATH=$PATH:~/scripts
+
+export LS_OPTIONS='--color=auto'
+alias ls='gls $LS_OPTIONS -hF'
+alias scp='scp -rv'
Submodule .zshuery added at 23a3cd

0 comments on commit 42ec790

Please sign in to comment.