diff options
author | Stefan Ritter <xeno@thehappy.de> | 2011-07-26 17:45:08 +0200 |
---|---|---|
committer | Stefan Ritter <xeno@thehappy.de> | 2011-07-26 17:45:08 +0200 |
commit | 365604d48124f9daa8877d653c489f5b01b672fc (patch) | |
tree | dda1e5923e8b1d5acceb73b20ef0cee1a6c08382 | |
parent | b47da88aa440edd886eedcf4b154a68d6570d80e (diff) | |
parent | bafb947d05d17d9a7400bfa05b98034850bbac15 (diff) |
Merge branch 'master' of fucktheforce.de:xeno
-rwxr-xr-x | bin/randwall | 3 | ||||
-rw-r--r-- | vim/vimrc | 8 | ||||
-rwxr-xr-x | xorg/xinitrc | 5 | ||||
-rw-r--r-- | xorg/xresources | 5 | ||||
-rw-r--r-- | zsh/zshrc | 27 |
5 files changed, 21 insertions, 27 deletions
diff --git a/bin/randwall b/bin/randwall new file mode 100755 index 0000000..a0bd131 --- /dev/null +++ b/bin/randwall @@ -0,0 +1,3 @@ +#!/bin/bash + +feh --bg-scale ~/media/bilder/wallpaper/$(ls ~/media/bilder/wallpaper/ | sort --random-sort | head -1) @@ -27,7 +27,7 @@ inoremap { {}<Esc>i inoremap < <><Esc>i inoremap " ""<Esc>i -noremap s h -noremap n k -noremap r j -noremap t l +"noremap s h +"noremap n k +"noremap r j +"noremap t l diff --git a/xorg/xinitrc b/xorg/xinitrc index 4fd10ce..56460bb 100755 --- a/xorg/xinitrc +++ b/xorg/xinitrc @@ -1,7 +1,6 @@ #!/bin/bash WM='i3' -WALLPAPER='media/bilder/wallpaper/wallpaper.png' setxkbmap de neo setxkbmap -option terminate:ctrl_alt_bksp @@ -24,9 +23,7 @@ if [ -e /usr/bin/xrandr ]; then fi fi -if [ -e "$WALLPAPER" ] && [ -e /usr/bin/feh ]; then - feh --bg-scale $WALLPAPER -fi +feh --bg-scale ~/media/bilder/wallpaper/$(ls ~/media/bilder/wallpaper/ | sort --random-sort | head -1) if [ -e /usr/bin/xscreensaver ]; then xscreensaver -no-splash & diff --git a/xorg/xresources b/xorg/xresources index ddddb34..bfb066f 100644 --- a/xorg/xresources +++ b/xorg/xresources @@ -18,9 +18,6 @@ *background: #000000 *foreground: #ffffff - -*foreground: #a0a0a0 -*background: #000000 *color0: #1B1D1E *color8: #505354 *color1: #F92672 @@ -37,3 +34,5 @@ *color14: #899CA1 *color7: #CCCCC6 *color15: #F8F8F2 + +urxvt.perl-ext-common: digital-clock @@ -1,4 +1,4 @@ -PROMPT="%~%(1v.%F{green}%1v%f.)%F{red}%2v%f %% " +PROMPT="%F{red}$(date +%H:%M) %F{white}%~%(1v.%F{green}%1v%f.)%F{red}%2v%f %% " umask 077 @@ -8,6 +8,10 @@ zstyle ':completion:*:kill:*' force-list always zmodload -a zsh/complist complist +if [ -e /usr/share/zsh/plugins/zsh-syntax-highlight/zsh-syntax-highlighting.zsh ]; then + source /usr/share/zsh/plugins/zsh-syntax-highlight/zsh-syntax-highlighting.zsh +fi + setopt nobeep setopt autocd setopt listpacked @@ -36,16 +40,6 @@ HISTFILE=~/.zsh_history autoload -U compinit; compinit autoload zmv -autoload -Uz vcs_info -precmd() { - psvar=() - vcs_info - [[ -n $vcs_info_msg_0_ ]] && psvar[1]="$vcs_info_msg_0_" - - if [ "$(quilt applied 2> /dev/null)" ]; then - psvar[2]="(quilt)" - fi -} alias c="clear" alias ls="ls --color=auto" @@ -70,6 +64,7 @@ alias v="vim" alias vi="vim" alias vbm="VBoxManage" alias httpd="python2 -m SimpleHTTPServer" +alias unp="aunpack" alias agu="sudo apt-get update" alias agdu="sudo apt-get dist-upgrade" @@ -139,10 +134,10 @@ vpn() { sudo openvpn --config /etc/openvpn/$1 } -case $TERM in - rxvt*) - precmd () {print -Pn "\e]0;%n@%m: %~\a"} - ;; -esac +#case $TERM in +# rxvt*) +# precmd () {print -Pn "\e]0;%n@%m: %~\a"} +# ;; +#esac cd ~/ |