diff options
| author | David Kaufmann <astra@ionic.at> | 2017-03-07 00:29:16 +0100 |
|---|---|---|
| committer | David Kaufmann <astra@ionic.at> | 2017-03-07 00:29:16 +0100 |
| commit | cd86dfc94811914fa3a0930b628e022787bf9bd0 (patch) | |
| tree | ed1cbed7061b1b251c2c546330f28b31656b434c | |
| parent | 211ee1a75fad14d9d91225f6c80da535cd8fc3da (diff) | |
| download | config-cd86dfc94811914fa3a0930b628e022787bf9bd0.tar.gz | |
update config
| -rw-r--r-- | skel/.Xresources | 22 | ||||
| -rw-r--r-- | skel/.gitconfig | 4 | ||||
| -rw-r--r-- | skel/.zprofile | 2 | ||||
| -rw-r--r-- | skel/.zshrc.local | 7 |
4 files changed, 18 insertions, 17 deletions
diff --git a/skel/.Xresources b/skel/.Xresources index a11334e..6985f90 100644 --- a/skel/.Xresources +++ b/skel/.Xresources @@ -57,11 +57,11 @@ URxvt.colorIT: green URxvt*cursorBlink: false URxvt*underlineColor: #86a2be -URxvt*font: xft:Inconsolata For Powerline:regular:size=9:antialias=true -URxvt*imFont: xft:Inconsolata For Powerline:regular:size=9:antialias=true -URxvt*boldFont: xft:Inconsolata For Powerline:bold:size=9:antialias=true -URxvt*italicFont: xft:Inconsolata For Powerline:italic:size=9:antialias=true -URxvt*boldItalicFont: xft:Inconsolata For Powerline:bold:italic:size=9:antialias=true +URxvt*font: xft:Inconsolata For Powerline:regular:size=10:antialias=true +URxvt*imFont: xft:Inconsolata For Powerline:regular:size=10:antialias=true +URxvt*boldFont: xft:Inconsolata For Powerline:bold:size=10:antialias=true +URxvt*italicFont: xft:Inconsolata For Powerline:italic:size=10:antialias=true +URxvt*boldItalicFont: xft:Inconsolata For Powerline:bold:italic:size=10:antialias=true URxvt*scrollBar: false URxvt*jumpScroll: false @@ -149,14 +149,10 @@ URxvt*color14: #B0E2FF URxvt*color7: #DCDCCC URxvt*color15: #FFFFFF -!URxvt.keysym.M-C-q: command:\033]710;xft:DejaVu Sans Mono:pixelsize=7\007\033]711;xft:DejaVu Sans Mono:pixelsize=7\007 -URxvt.keysym.M-C-q: command:\033]710;xft:Inconsolata:pixelsize=16\007\033]711;xft:Inconsolata:pixelsize=16\007 -URxvt.keysym.M-C-w: command:\033]710;xft:Inconsolata:pixelsize=20\007\033]711;xft:Inconsolata:pixelsize=20\007 -!URxvt.keysym.M-C-e: command:\033]710;xft:DejaVu Sans Mono:pixelsize=10\007\033]711;xft:DejaVu Sans Mono:pixelsize=10\007 -URxvt.keysym.M-C-r: command:\033]710;xft:DejaVu Sans Mono:pixelsize=8\007\033]711;xft:DejaVu Sans Mono:pixelsize=8\007 -URxvt.keysym.M-C-t: command:\033]710;xft:DejaVu Sans Mono:pixelsize=14\007\033]711;xft:DejaVu Sans Mono:pixelsize=14\007 -URxvt.keysym.M-C-z: command:\033]710;xft:DejaVu Sans Mono:pixelsize=12\007\033]711;xft:DejaVu Sans Mono:pixelsize=12\007 -URxvt.keysym.M-C-u: command:\033]710;xft:Bitstream Vera Sans Mono:pixelsize=12\007\033]711;xft:Bitstream Vera Sans Mono:pixelsize=12\007 +URxvt.keysym.M-C-q: command:\033]710;xft:Inconsolata For Powerline:pixelsize=16\007\033]711;xft:Inconsolata For Powerline:pixelsize=16\007 +URxvt.keysym.M-C-w: command:\033]710;xft:Inconsolata For Powerline:pixelsize=20\007\033]711;xft:Inconsolata For Powerline:pixelsize=20\007 +URxvt.keysym.M-C-e: command:\033]710;xft:Inconsolata For Powerline:pixelsize=24\007\033]711;xft:Inconsolata For Powerline:pixelsize=24\007 +URxvt.keysym.M-C-r: command:\033]710;xft:Inconsolata For Powerline:pixelsize=32\007\033]711;xft:Inconsolata For Powerline:pixelsize=32\007 !------------------------------------------------------------------------------- ! diff --git a/skel/.gitconfig b/skel/.gitconfig index afa0211..b072155 100644 --- a/skel/.gitconfig +++ b/skel/.gitconfig @@ -39,3 +39,7 @@ [pretty] fixes = Fixes: %h (\"%s\") + +[svn] + # push empty directory removals back to svn as directory deletes + rmdir = true diff --git a/skel/.zprofile b/skel/.zprofile index b429d15..c45f71f 100644 --- a/skel/.zprofile +++ b/skel/.zprofile @@ -23,7 +23,7 @@ function start_agent { chmod 600 "${SSH_ENV}" . "${SSH_ENV}" > /dev/null if [[ -x /usr/bin/ssh-add ]]; then - for key in $(find ${HOME}/.ssh/ -maxdepth 1 -name 'id_*' | egrep -v '.pub$'); do + for key in $(find ${HOME}/.ssh/keys/ -maxdepth 1 -name 'id_*' | egrep -v '.pub$'); do /usr/bin/ssh-add $key done fi diff --git a/skel/.zshrc.local b/skel/.zshrc.local index 9a58a22..100b8f9 100644 --- a/skel/.zshrc.local +++ b/skel/.zshrc.local @@ -45,7 +45,7 @@ fi exec_exists() { type -p $1 &>/dev/null } exec_exists hostname && HOSTNAME=`hostname` -main_node() { [[ "$HOSTNAME" == "achelois" ]] } +main_node() { [[ "$HOSTNAME" == "anduin" ]] } # Vars used later on by Zsh export EDITOR="vim -p" @@ -82,8 +82,8 @@ alias route6="route -Ainet6" if main_node; then alias gnuplot="gnuplot -persist" - alias padoff="/usr/bin/synclient TouchpadOff=1" - alias padon="/usr/bin/synclient TouchpadOff=0" + alias padoff='/usr/bin/xinput disable "SynPS/2 Synaptics TouchPad"' + alias padon='/usr/bin/xinput enable "SynPS/2 Synaptics TouchPad"' alias snownews="snownews -u" alias biew="TERM=vt100 biew" exec_exists pm-suspen && alias vsuspend="sudo pm-suspend" @@ -95,6 +95,7 @@ if main_node; then alias mc='ssh -p666 dev.somenet.org -L 25565:10.10.0.253:25565' #alias xflux="/home/astra/git/f.lux/xflux -l 48.21 -g 16.37" alias openwlans='nmcli device wifi rescan ; sleep 2 ; nmcli device wifi list | egrep -v "(WPA1|WPA2|802.1X|WEP)" | grep -v Ad-Hoc | awk "!/^ --/ {print}"' + alias venv='source `find . -wholename "*/bin/activate" | head -n1`' fi if main_node; then |
