aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/.Xdefaults13
-rw-r--r--[-rwxr-xr-x]files/.gitconfig1
-rw-r--r--files/.mutt/mutt_mailcap2
-rw-r--r--files/.zsh/rc/S50_aliases4
-rw-r--r--files/.zsh/zprofile6
5 files changed, 8 insertions, 18 deletions
diff --git a/files/.Xdefaults b/files/.Xdefaults
index 342edfa..aaa9eb4 100644
--- a/files/.Xdefaults
+++ b/files/.Xdefaults
@@ -1,16 +1,7 @@
URxvt.visualBell: true
-!URxvt.font: -*-terminus-medium-*-*-*-14-*-*-*-*-*-*-u
-!URxvt.font: fixed
-urxvt.font: 9x15,\
- -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\
- -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \
- [codeset=JISX0208]xft:Kochi Gothic, \
- xft:Bitstream Vera Sans Mono:autohint=true, \
- xft:Code2000:antialias=false
-urxvt.boldFont: -xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-15
-urxvt.italicFont: xft:Bitstream Vera Sans Mono:italic:autohint=true
-urxvt.boldItalicFont: xft:Bitstream Vera Sans Mono:bold:italic:autohint=true
+URxvt.font: xft:Monospace-14:autohint=true
+URxvt.letterSpace: -1
URxvt.perl-ext-common: default,tabbed,matcher
URxvt.geometry: 140x36
diff --git a/files/.gitconfig b/files/.gitconfig
index cfe4dfc..b9c9357 100755..100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -23,3 +23,4 @@
kb = !sh -c 'gitk --branches' -
fix = commit --amend -C HEAD
ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' -
+ history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')"
diff --git a/files/.mutt/mutt_mailcap b/files/.mutt/mutt_mailcap
index 7ffba72..b3419ca 100644
--- a/files/.mutt/mutt_mailcap
+++ b/files/.mutt/mutt_mailcap
@@ -1,6 +1,6 @@
application/msword; oowriter %s
application/octet-stream; ~/.mutt/mutt.octet.filter %s; copiousoutput
image/*; geeqie '%s'
-text/html; lynx -display_charset=utf-8 -assume_charset=%{charset} -dump -force_html '%s'; copiousoutput; description=H
+text/html; lynx -display_charset=utf-8 -assume_charset=%{charset} -dump -force_html '%s' | sed 's/^\ \ \ //'; copiousoutput; description=H
# vim: ft=muttrc :
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index 693d34b..12b873c 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -31,6 +31,10 @@ alias xcd='cd "$(xclip -o)"'
alias man='LANG=C man'
+salias up='aptitude -u'
+
+alias cclip='xclip -selection clipboard'
+
check_com g || alias g='git'
check_com s || alias s='ssh'
diff --git a/files/.zsh/zprofile b/files/.zsh/zprofile
deleted file mode 100644
index b9df8e5..0000000
--- a/files/.zsh/zprofile
+++ /dev/null
@@ -1,6 +0,0 @@
-SSHAGENT=/usr/bin/ssh-agent
-SSHAGENTARGS="-s"
-if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
- eval `$SSHAGENT $SSHAGENTARGS`
- trap "kill $SSH_AGENT_PID" 0
-fi