From 2f4dd4187f70b8505f7757f4a1c42567e034f2a5 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Wed, 28 Mar 2012 16:26:58 -0400 Subject: Reformat for use with Effuse --- .irbrc | 2 + .riplrc | 6 + .xinitrc | 17 + .zshrc | 189 +++++++++++ _config/Terminal/terminalrc | 44 --- _config/openbox/autostart.sh | 22 -- _config/openbox/environment | 4 - _config/openbox/menu.xml | 162 --------- _config/openbox/rc.xml | 791 ------------------------------------------- _conkyrc | 62 ---- _irbrc | 2 - _riplrc | 6 - _vimrc | 102 ------ _xinitrc | 10 - _zshrc | 187 ---------- update.rb | 29 -- 16 files changed, 214 insertions(+), 1421 deletions(-) create mode 100644 .irbrc create mode 100644 .riplrc create mode 100644 .xinitrc create mode 100644 .zshrc delete mode 100644 _config/Terminal/terminalrc delete mode 100644 _config/openbox/autostart.sh delete mode 100644 _config/openbox/environment delete mode 100644 _config/openbox/menu.xml delete mode 100644 _config/openbox/rc.xml delete mode 100644 _conkyrc delete mode 100644 _irbrc delete mode 100644 _riplrc delete mode 100644 _vimrc delete mode 100644 _xinitrc delete mode 100644 _zshrc delete mode 100755 update.rb diff --git a/.irbrc b/.irbrc new file mode 100644 index 00000000..008e97cf --- /dev/null +++ b/.irbrc @@ -0,0 +1,2 @@ +$:.unshift 'lib' +$: << '.' diff --git a/.riplrc b/.riplrc new file mode 100644 index 00000000..8830a335 --- /dev/null +++ b/.riplrc @@ -0,0 +1,6 @@ +require 'ripl/multi_line' +require 'ripl/rocket' +require 'ripl/color_error' +require 'ripl/color_result' +require 'ripl/auto_indent' +require 'ripl/short_errors' diff --git a/.xinitrc b/.xinitrc new file mode 100644 index 00000000..ef325a38 --- /dev/null +++ b/.xinitrc @@ -0,0 +1,17 @@ +export BROWSER=chromium + +xrdb ~/.Xresources & +xautolock -locker slimlock -time 30 & +start-pulseaudio-x11 & +mpd & +mpdscribble & +mpDris2 & + +# Keyboard stuff +xmodmap -e "clear Lock" -e "keysym Caps_Lock = Escape" # Caps Lock -> Esc +xmodmap -e "remove mod1 = Alt_R" -e "keysym Alt_R = Multi_key" # Right Alt -> Compose +xmodmap -e "remove mod1 = Alt_L" -e "remove mod4 = Super_L" -e "add mod1 = Super_L" -e "add mod4 = Alt_L" # Swap Super and Alt + +SESSION=openbox-session +[ $1 ] && SESSION=$1 +exec ck-launch-session dbus-launch $SESSION diff --git a/.zshrc b/.zshrc new file mode 100644 index 00000000..a627eb72 --- /dev/null +++ b/.zshrc @@ -0,0 +1,189 @@ +# The following lines were added by compinstall + +zstyle ':completion:*' completer _complete _ignored _correct _approximate +zstyle ':completion:*' max-errors 2 +zstyle :compinstall filename '/home/home/.zshrc' + +autoload -Uz compinit +compinit +# End of lines added by compinstall +# Lines configured by zsh-newuser-install +HISTFILE=~/.histfile +HISTSIZE=5000 +SAVEHIST=5000 +setopt appendhistory autocd nomatch notify +unsetopt beep extendedglob +bindkey -e +# End of lines configured by zsh-newuser-install + +bindkey "\e[1~" beginning-of-line +bindkey "\e[4~" end-of-line +bindkey "\e[5~" beginning-of-history +bindkey "\e[6~" end-of-history +bindkey "\e[3~" delete-char +bindkey "\e[2~" quoted-insert +bindkey "\e[5C" forward-word +bindkey "\eOc" emacs-forward-word +bindkey "\e[5D" backward-word +bindkey "\eOd" emacs-backward-word +bindkey "\e\e[C" forward-word +bindkey "\e\e[D" backward-word +bindkey "\e[8~" end-of-line +bindkey "\e[7~" beginning-of-line +bindkey "\eOH" beginning-of-line +bindkey "\eOF" end-of-line +bindkey "\e[H" beginning-of-line +bindkey "\e[F" end-of-line + +setopt autopushd +setopt interactive_comments + +source /etc/profile.d/autojump.zsh + +autoload colors zsh/terminfo +colors + +source /etc/profile.d/pkgfile-hook.sh + +PATH=$PATH:~/bin +export EDITOR=vim + +export QEMU_AUDIO_DRV=alsa + +[[ "$TERM" == "xterm" ]] && export TERM=xterm-256color + +function clyde { + case $1 in + -S | -S[^si]* | -R* | -U*) + /usr/bin/sudo /usr/bin/clyde "$@" ;; + *) + /usr/bin/clyde "$@" ;; + esac +} + +function pacman { + case $1 in + -S | -S[^si]* | -R* | -U*) + /usr/bin/sudo /usr/bin/pacman "$@" ;; + *) + /usr/bin/pacman "$@" ;; + esac +} + +mkcd() { + mkdir $@ + if [ "$1" = "-p" ]; then + cd $2 + else + cd $1 + fi +} + +function extract { + echo Extracting $1 ... + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xjf $1 ;; + *.tar.gz) tar xzf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar e $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xf $1 ;; + *.tbz2) tar xjf $1 ;; + *.tgz) tar xzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1 ;; + *.7z) 7z x $1 ;; + *) echo "'$1' cannot be extracted via extract()" ;; + esac + else + echo "'$1' is not a valid file" + fi +} + +function reload { + source ~/.zshrc +} + +alias ls='ls --color=auto' +alias grep='grep --color=auto' +alias sprunge='curl -F "sprunge=<-" http://sprunge.us' +alias git=hub +compdef hub=git +alias readme='cat README*' +alias S='pacman -S' +alias Syu='pacman -Syu' +alias Ss='pacman -Ss' +alias p='pacman' +alias g='hub' +alias rm='rm -I' +alias tsmusic='ssh music@gewt.ath.cx' +alias gs='git status' +alias gc='git commit' +alias gd='git diff' +alias gp='git push' +alias gl='git log' +alias ga='git add' +alias gb='git branch' +alias gco='git checkout' +alias gm='git merge' +alias gcl='git clone' +alias gt='git tag' +alias gr='git remote' +alias gpl='git pull' +alias gsh='git show' +alias gmv='git mv' +alias grm='git rm' +alias gi='git init' +alias glg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --color" +alias mc='make clean' +alias m='make -j4' +alias killlall='killall' +alias irb='ripl' +alias l='ls' + +function gvim { + [ "$@" ] && =gvim --remote-silent $@ || =gvim +} + +function prompt_char { + #[ -e ".git" ] && echo '+' && return + #git branch &> /dev/null && echo '+' && return + #[ -e ".hg" ] && echo '☿' && return + #hg root &> /dev/null && echo '☿' && return + #echo '$' + echo '%(!.#.$)' +} + +function git_branch { + #[ -e ".git" ] && echo ':'${"$(cat .git/HEAD)"##*/} + #git branch &> /dev/null && echo -e '\033[32m:\033[33m'${"$(git branch)"##* } && return +} + +#setopt prompt_subst +#function chpwd { +PROMPT="%{$terminfo[bold]$fg[green]%}[%{$fg[blue]%}%30<..<%~$(git_branch)%{$fg[green]%}]$(prompt_char)%{$terminfo[sgr0]$reset_color%} " +#} +#chpwd +RPROMPT="%(?..%{$terminfo[bold]$fg[green]%}[%{$fg[red]%}%?%{$fg[green]%}]%{$terminfo[sgr0]%})" + +source ~/.zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +ZSH_HIGHLIGHT_STYLES[command]='bold' +ZSH_HIGHLIGHT_STYLES[builtin]='none' +ZSH_HIGHLIGHT_STYLES[alias]='fg=magenta,bold' +ZSH_HIGHLIGHT_STYLES[function]='fg=magenta,bold' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=yellow,bold' +ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='bold' +ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='bold' +ZSH_HIGHLIGHT_STYLES[globbing]='fg=blue,bold' +ZSH_HIGHLIGHT_STYLES[path]='none' +ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=blue,bold' +ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=yellow,bold' +ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=yellow,bold' + +#source .zsh-syntax-highlighting-filetypes/zsh-syntax-highlighting-filetypes.zsh + +#eval $(dircolors -b ~/stuff/LS_COLORS/LS_COLORS) + +pacman -Qu > /dev/null && [ ! -f /var/lib/pacman/db.lck ] && sudo pacman -Syu +echo -n diff --git a/_config/Terminal/terminalrc b/_config/Terminal/terminalrc deleted file mode 100644 index adb21a1f..00000000 --- a/_config/Terminal/terminalrc +++ /dev/null @@ -1,44 +0,0 @@ -[Configuration] -FontName=Monospace 9 -MiscAlwaysShowTabs=FALSE -MiscBell=FALSE -MiscBordersDefault=TRUE -MiscCursorBlinks=TRUE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK -MiscDefaultGeometry=80x24 -MiscInheritGeometry=FALSE -MiscMenubarDefault=FALSE -MiscMouseAutohide=FALSE -MiscToolbarsDefault=FALSE -MiscConfirmClose=TRUE -MiscCycleTabs=TRUE -MiscTabCloseButtons=TRUE -MiscTabCloseMiddleClick=TRUE -MiscTabPosition=GTK_POS_TOP -MiscHighlightUrls=TRUE -ColorPalette2=#d7d77c7c7979 -ColorPalette10=#dfdf65656565 -ColorPalette3=#c2c2c7c77b7b -ColorPalette11=#c5c5d1d15c5c -ColorPalette4=#f4f4cfcf8686 -ColorPalette12=#ececcece5858 -ColorPalette5=#9292b2b2caca -ColorPalette13=#8c8cb6b6e1e1 -ColorPalette6=#c0c0a7a7c7c7 -ColorPalette14=#cfcfababdfdf -ColorPalette7=#9a9ac9c9c4c4 -ColorPalette15=#8080cacabfbf -ColorPalette8=#a7a7a8a8a7a7 -ColorPalette16=#a7a7a8a8a7a7 -ColorPalette9=#555557575353 -ColorCursor=#d7d7dadad8d8 -ScrollingOnOutput=FALSE -ScrollingLines=100000 -BackgroundDarkness=0.850000 -ShortcutsNoMenukey=TRUE -TitleMode=TERMINAL_TITLE_REPLACE -Term=xterm-256color -ColorForeground=#d7d7dadad8d8 -ColorSelection=#47474c4c5252 -BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT - diff --git a/_config/openbox/autostart.sh b/_config/openbox/autostart.sh deleted file mode 100644 index 53b386fc..00000000 --- a/_config/openbox/autostart.sh +++ /dev/null @@ -1,22 +0,0 @@ -thunar --daemon & - -# Compositing -#xcompmgr & -xcompmgr -c -f -D 3 -C & - -# Wallpaper -nitrogen --restore - -# Panels/Docks -lxpanel & -docky & - -# Tray apps -parcellite & -volwheel & - -# Conky -conky & - -# Other daemons -/home/home/code/c/keycounter/keycounter -f -d -p /home/home/.keycounter.pid /home/home/.keycount & diff --git a/_config/openbox/environment b/_config/openbox/environment deleted file mode 100644 index 2aeeb03e..00000000 --- a/_config/openbox/environment +++ /dev/null @@ -1,4 +0,0 @@ -export DESKTOP_ENV="OPENBOX" -export BROWSER=chromium -export XDG_DATA_DIRS=/home/home/.local/share:$XDG_DATA_DIRS:/home/home/.local/share -export GNOME_DESKTOP_SESSION_ID="openbox" diff --git a/_config/openbox/menu.xml b/_config/openbox/menu.xml deleted file mode 100644 index 003d819b..00000000 --- a/_config/openbox/menu.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - thunar - - - - - - - - thunar ~/code - - - - - - - thunar ~/Downloads - - - - - - - thunar ~/Music - - - - - - - thunar ~/Videos - - - - - - - thunar ~/stuff - - - - - - - - thunar / - - - - - - - - - lxappearance - - - - - - - qtconfig - - - - - - - nitrogen - - - - - - - gmenu-simple-editor - - - - - - - - - obconf - - - - - - - obmenu - - - - - - - obkey - - - - - - - - gvim ~/.config/openbox/rc.xml - - - - - - - gvim ~/.config/openbox/menu.xml - - - - - - - gvim ~/.config/openbox/autostart.sh - - - - - - - - - - - - - - - - - - - /home/home/bin/cb-logout.py - - - - - diff --git a/_config/openbox/rc.xml b/_config/openbox/rc.xml deleted file mode 100644 index dfd07ece..00000000 --- a/_config/openbox/rc.xml +++ /dev/null @@ -1,791 +0,0 @@ - - - - 10 - 20 - - - yes - - no - - yes - - no - - 200 - - no - - - - Smart - -
yes
- - Active - - 1 - - - - egtk - CL - - yes - no - - Sans - 8 - - Bold - - Normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - Sans - 9 - - Normal - - Normal - - - - - - - Sans - 8 - - - - - - - 6 - 1 - - One - Two - Three - Four - Five - Six - - 875 - - - - yes - NonPixel - - Center - - - - 10 - - 10 - - - - - - 0 - 0 - 0 - 0 - - - Top - - 0 - 0 - no - Below - - Horizontal - - no - 300 - - 300 - - Middle - - - - C-g - - - - - - - - - no - - - - - no - - - - - no - - - - - no - - - - - no - - - - - no - - - - - - - - 2 - - - - - 3 - - - - - 4 - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - yes - yes - - - - - gmrun - - - - - terminal - - - - - root-menu - - - - - /home/home/bin/scrot-upload - - - - - /home/home/bin/scrot-upload -b -s - - - - - - - - - - - - - - - - - - - - - - - banshee --toggle-playing - - - - - banshee --previous - - - - - banshee --next - - - - - banshee --stop - - - - - qalculate - - - - - xautolock -locknow - - - - - 8 - - 200 - - 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - top - - - - - - - - - - - left - - - - - - - client-menu - - - - - - - - - - - right - - - - - - - client-menu - - - - - - - - - - - bottom - - - - - - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-list-combined-menu - - - - - root-menu - - - - - - - - - - - - - - - - - - - menu.xml200no100400 - if this is a negative value, then the delay is infinite and the - submenu will not be hidden until a different submenu is opened --> - yes - - yes - - - - - - no - no - yes - no - no - above - - - no - no - yes - yes - no - yes - below - all - - - diff --git a/_conkyrc b/_conkyrc deleted file mode 100644 index ce1e7a24..00000000 --- a/_conkyrc +++ /dev/null @@ -1,62 +0,0 @@ - -alignment top_right -background no -border_width 1 -cpu_avg_samples 2 -default_color white -default_outline_color white -default_shade_color white -draw_borders no -draw_graph_borders yes -draw_outline no -draw_shades no -use_xft yes -xftfont DejaVu Sans Mono:size=9 -gap_x 5 -gap_y 29 -minimum_size 5 5 -net_avg_samples 2 -no_buffers yes -out_to_console no -out_to_stderr no -extra_newline no -own_window yes -own_window_class Conky -#own_window_type override -own_window_type desktop -own_window_hints below, undecorated, sticky, skip_taskbar, skip_pager -double_buffer true -own_window_transparent true -stippled_borders 0 -update_interval 1.0 -uppercase no -use_spacer right -show_graph_scale no -show_graph_range no -format_human_readable yes -short_units yes - -TEXT -${color white}$nodename $alignr $kernel -${color lightgrey}up${color white} $uptime_short $alignr $user_number ${color lightgrey}users${color white} -${color lightgrey}updates${color white}$alignr${texeci 300 /home/home/bin/updates.sh} -$hr -${color lightgrey}processes${color white}$alignr${running_processes}/${processes} -$alignc${cpugraph 18,200} -${color lightgrey}cpu-1${color white}$alignr${cpu cpu1}% ${cpubar cpu1 4,125} -${color lightgrey}cpu-2${color white}$alignr${cpu cpu2}% ${cpubar cpu2 4,125} -${color lightgrey}cpu-3${color white}$alignr${cpu cpu3}% ${cpubar cpu3 4,125} -${color lightgrey}cpu-4${color white}$alignr${cpu cpu4}% ${cpubar cpu4 4,125} -$hr -${color lightgrey}ram${color white}$alignr${mem}/${memmax} ${membar 4,85} -${color lightgrey}swap${color white}$alignr${swap}/${swapmax} ${swapbar 4,85} -$hr -${color lightgrey}/${color white}$alignr${fs_used /}/${fs_size /} ${fs_bar 4,75 /} -${color lightgrey}/home${color white}$alignr${fs_used /home}/${fs_size /home} ${fs_bar 4,75 /home} -${color lightgrey}read${color white}$alignr${diskio_read}/s ${diskiograph_read 9,105} -${color lightgrey}write${color white}$alignr${diskio_write}/s ${diskiograph_write 9,105} -$hr -${color lightgrey}eth0${color white}$alignr${addr eth0} -$alignr${texeci 3600 curl da.gd/ip} -${color lightgrey}down${color white}$alignr${downspeed eth0}/s ${downspeedgraph eth0 9,70} $totaldown -${color lightgrey}up${color white}$alignr${upspeed eth0}/s ${upspeedgraph eth0 9,70} $totalup diff --git a/_irbrc b/_irbrc deleted file mode 100644 index 008e97cf..00000000 --- a/_irbrc +++ /dev/null @@ -1,2 +0,0 @@ -$:.unshift 'lib' -$: << '.' diff --git a/_riplrc b/_riplrc deleted file mode 100644 index 8830a335..00000000 --- a/_riplrc +++ /dev/null @@ -1,6 +0,0 @@ -require 'ripl/multi_line' -require 'ripl/rocket' -require 'ripl/color_error' -require 'ripl/color_result' -require 'ripl/auto_indent' -require 'ripl/short_errors' diff --git a/_vimrc b/_vimrc deleted file mode 100644 index 20cb2441..00000000 --- a/_vimrc +++ /dev/null @@ -1,102 +0,0 @@ -set nocompatible - -noremap \ , -let mapleader = "," - -set backspace=indent,eol,start " allow backspacing everything -set hidden -set backup -set history=50 -set ruler " show cursor position all the time -set showcmd " show incomplete commands -set incsearch -set ignorecase -set smartcase -set guioptions-=t " no tear-off menus -if has('mouse') - set mouse=a -endif -if &t_Co > 2 || has("gui_running") - syntax on - set hlsearch -endif - -augroup vimrcEx -au! -" jump to the last cursor position -autocmd BufReadPost * - \ if line("'\"") > 1 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | - \ endif -augroup END - -set autoindent -set smartindent -colorscheme Tomorrow-Night -set nu - -" 4-space indents -set tabstop=4 -set shiftwidth=4 -set expandtab - -filetype plugin indent on -autocmd FileType ruby setlocal expandtab shiftwidth=2 - -"set showmatch " jump to matching bracket -set guioptions-=T " no toolbar in gvim -"set cc=80 " highlight 80th column -set guifont=Monospace\ 9 - -set spell -"set fdm=syntax " fold by syntax - -set cc=80 " Highlight column 80 - -nnoremap ' ` -nnoremap ` ' - -"better tab complete -set wildmenu -set wildmode=list:longest -set wildignore=*.o,*.d,*~ - -set title " change terminal title - -runtime macros/matchit.vim " smarter % - -nmap n :silent :nohlsearch - -" Show trailing whitespace with ,s -nmap s :set nolist! - -set shortmess=atI - -" Easy X copy/paste -map p "+p -map P "+P -map y "+y -map Y "+Y -map d "+d -map D "+D - -set visualbell t_vb= - -set cursorline - -" Insert hard tab -imap - -set browsedir=buffer " GUI Open starts in CWD - -map Q gq - -command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis | wincmd p | diffthis - -" Show trailing whitespace and hard tabs -set list -set listchars=tab:»·,trail:· - -set smarttab - -command W :w " I often accidentally type :W when I mean :w diff --git a/_xinitrc b/_xinitrc deleted file mode 100644 index 61d281d3..00000000 --- a/_xinitrc +++ /dev/null @@ -1,10 +0,0 @@ -xrdb ~/.Xresources & -xautolock -locker slimlock -time 30 & - -# Keyboard stuff -xmodmap -e "clear Lock" -e "keysym Caps_Lock = Escape" # Caps Lock -> Esc -xmodmap -e "remove mod1 = Alt_R" -e "keysym Alt_R = Multi_key" # Right Alt -> Compose - -SESSION=openbox-session -[ $1 ] && SESSION=$1 -exec ck-launch-session dbus-launch $SESSION diff --git a/_zshrc b/_zshrc deleted file mode 100644 index 18ce4bcf..00000000 --- a/_zshrc +++ /dev/null @@ -1,187 +0,0 @@ -# The following lines were added by compinstall - -zstyle ':completion:*' completer _complete _ignored _correct _approximate -zstyle ':completion:*' max-errors 2 -zstyle :compinstall filename '/home/home/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall -# Lines configured by zsh-newuser-install -HISTFILE=~/.histfile -HISTSIZE=5000 -SAVEHIST=5000 -setopt appendhistory autocd nomatch notify -unsetopt beep extendedglob -bindkey -e -# End of lines configured by zsh-newuser-install - -bindkey "\e[1~" beginning-of-line -bindkey "\e[4~" end-of-line -bindkey "\e[5~" beginning-of-history -bindkey "\e[6~" end-of-history -bindkey "\e[3~" delete-char -bindkey "\e[2~" quoted-insert -bindkey "\e[5C" forward-word -bindkey "\eOc" emacs-forward-word -bindkey "\e[5D" backward-word -bindkey "\eOd" emacs-backward-word -bindkey "\e\e[C" forward-word -bindkey "\e\e[D" backward-word -bindkey "\e[8~" end-of-line -bindkey "\e[7~" beginning-of-line -bindkey "\eOH" beginning-of-line -bindkey "\eOF" end-of-line -bindkey "\e[H" beginning-of-line -bindkey "\e[F" end-of-line - -setopt autopushd -setopt interactive_comments - -source /etc/profile.d/autojump.zsh - -autoload colors zsh/terminfo -colors - -source /etc/profile.d/pkgfile-hook.sh - -PATH=$PATH:~/bin -export EDITOR=vim - -export QEMU_AUDIO_DRV=alsa - -[[ "$TERM" == "xterm" ]] && export TERM=xterm-256color - -function clyde { - case $1 in - -S | -S[^si]* | -R* | -U*) - /usr/bin/sudo /usr/bin/clyde "$@" ;; - *) - /usr/bin/clyde "$@" ;; - esac -} - -function pacman { - case $1 in - -S | -S[^si]* | -R* | -U*) - /usr/bin/sudo /usr/bin/pacman "$@" ;; - *) - /usr/bin/pacman "$@" ;; - esac -} - -mkcd() { - mkdir $@ - if [ "$1" = "-p" ]; then - cd $2 - else - cd $1 - fi -} - -function extract { - echo Extracting $1 ... - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar e $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via extract()" ;; - esac - else - echo "'$1' is not a valid file" - fi -} - -function reload { - source ~/.zshrc -} - -alias ls='ls --color=auto' -alias grep='grep --color=auto' -alias sprunge='curl -F "sprunge=<-" http://sprunge.us' -alias git=hub -compdef hub=git -alias readme='cat README*' -alias S='pacman -S' -alias Syu='pacman -Syu' -alias Ss='pacman -Ss' -alias p='pacman' -alias g='hub' -alias rm='rm -I' -alias tsmusic='ssh music@gewt.ath.cx' -alias gs='git status' -alias gc='git commit' -alias gd='git diff' -alias gp='git push' -alias gl='git log' -alias ga='git add' -alias gb='git branch' -alias gco='git checkout' -alias gm='git merge' -alias gcl='git clone' -alias gt='git tag' -alias gr='git remote' -alias gpl='git pull' -alias gsh='git show' -alias gmv='git mv' -alias grm='git rm' -alias gi='git init' -alias mc='make clean' -alias m='make -j4' -alias killlall='killall' -alias irb='ripl' - -function gvim { - [ "$@" ] && =gvim --remote-silent $@ || =gvim -} - -function prompt_char { - #[ -e ".git" ] && echo '+' && return - #git branch &> /dev/null && echo '+' && return - #[ -e ".hg" ] && echo '☿' && return - #hg root &> /dev/null && echo '☿' && return - #echo '$' - echo '%(!.#.$)' -} - -function git_branch { - #[ -e ".git" ] && echo ':'${"$(cat .git/HEAD)"##*/} - #git branch &> /dev/null && echo -e '\033[32m:\033[33m'${"$(git branch)"##* } && return -} - -#setopt prompt_subst -#function chpwd { -PROMPT="%{$terminfo[bold]$fg[green]%}[%{$fg[blue]%}%30<..<%~$(git_branch)%{$fg[green]%}]$(prompt_char)%{$terminfo[sgr0]$reset_color%} " -#} -#chpwd -RPROMPT="%(?..%{$terminfo[bold]$fg[green]%}[%{$fg[red]%}%?%{$fg[green]%}]%{$terminfo[sgr0]%})" - -source ~/.zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -ZSH_HIGHLIGHT_STYLES[command]='bold' -ZSH_HIGHLIGHT_STYLES[builtin]='none' -ZSH_HIGHLIGHT_STYLES[alias]='fg=magenta,bold' -ZSH_HIGHLIGHT_STYLES[function]='fg=magenta,bold' -ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=yellow,bold' -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='bold' -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='bold' -ZSH_HIGHLIGHT_STYLES[globbing]='fg=blue,bold' -ZSH_HIGHLIGHT_STYLES[path]='none' -ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=blue,bold' -ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=yellow,bold' -ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=yellow,bold' - -#source .zsh-syntax-highlighting-filetypes/zsh-syntax-highlighting-filetypes.zsh - -#eval $(dircolors -b ~/stuff/LS_COLORS/LS_COLORS) - -pacman -Qu > /dev/null && [ ! -f /var/lib/pacman/db.lck ] && sudo pacman -Syu -echo -n diff --git a/update.rb b/update.rb deleted file mode 100755 index 9f1c67dd..00000000 --- a/update.rb +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env ruby - -require 'fileutils' - -dotfiles = {} - -dirs = ['.'] -dirs.each do |dir| - Dir.foreach(dir) do |file| - next if file[0] == '.' - file = File.join(dir, file) - if File.directory? file - dirs << file - next - end - dotfiles[file] = file.sub('.', '~').sub('_', '.') if %r{/_} =~ file - end -end - -dotfiles.each do |a, b| - a, b = File.expand_path(a), File.expand_path(b) - FileUtils.cp(b, a) - puts "#{b} -> #{a}" -end - -system('git diff') -system('git add .') -system('git commit') -system('git push') -- cgit 1.4.1