From da0fe38fcea7ef73c0d5a06a05d1669c32c65c8e Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Sat, 20 Feb 2010 17:35:58 +0100
Subject: zshrc: switch to gpg2, and other file cleanup

---
 emacs               |  3 ++-
 fonts.conf          | 75 ++++++++++++++++++++++++++++-------------------------
 gnupg/gpg.conf      |  2 +-
 irssi/awesome.theme |  2 +-
 zshrc               |  8 +++---
 5 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/emacs b/emacs
index 778dd9b..18f850b 100644
--- a/emacs
+++ b/emacs
@@ -106,7 +106,8 @@
 (set-selection-coding-system 'utf-8)
 
 ;; Spell checking
-(setq-default ispell-program-name "aspell")
+(setq-default ispell-program-name "aspell"
+  ispell-extra-args '("--sug-mode=ultra"))
 (setq-default ispell-dictionary "en_US")
 
 ;; Default Web Browser
diff --git a/fonts.conf b/fonts.conf
index 59ba35e..b2a276b 100644
--- a/fonts.conf
+++ b/fonts.conf
@@ -1,60 +1,63 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
 <fontconfig>
-<!-- Accept bitmap fonts -->
+ <!-- Accept bitmap fonts -->
  <selectfont>
   <acceptfont>
    <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
+    <patelt name="scalable">
+     <bool>false</bool>
+    </patelt>
    </pattern>
   </acceptfont>
  </selectfont>
- <match target="font" >
-  <edit mode="assign" name="rgba" >
+ <match target="font">
+  <edit mode="assign" name="rgba">
    <const>rgb</const>
   </edit>
  </match>
- <match target="font" >
-  <edit mode="assign" name="hinting" >
+ <match target="font">
+  <edit mode="assign" name="hinting">
    <bool>true</bool>
   </edit>
  </match>
- <match target="font" >
-  <edit mode="assign" name="hintstyle" >
+ <match target="font">
+  <edit mode="assign" name="hintstyle">
    <const>hintfull</const>
   </edit>
  </match>
- <match target="font" >
-  <edit mode="assign" name="antialias" >
+ <match target="font">
+  <edit mode="assign" name="antialias">
    <bool>true</bool>
   </edit>
  </match>
  <match target="font">
-   <test name="family">
-     <string>ProggyCleanTT</string>
-   </test>
-   <edit name="pixelsize">
-      <double>16</double>
-   </edit>
-   <edit name="antialias">
-      <bool>false</bool>
-   </edit>
-   <edit name="hinting">
-      <bool>false</bool>
-   </edit>
+  <test name="family">
+   <string>ProggyCleanTT</string>
+  </test>
+  <edit name="pixelsize">
+   <double>16</double>
+  </edit>
+  <edit name="antialias">
+   <bool>false</bool>
+  </edit>
+  <edit name="hinting">
+   <bool>false</bool>
+  </edit>
  </match>
  <match target="font">
-   <test name="family">
-     <string>ProggyTinyTT</string>
-   </test>
-   <edit name="pixelsize">
-      <double>16</double>
-   </edit>
-   <edit name="antialias">
-      <bool>false</bool>
-   </edit>
-   <edit name="hinting">
-      <bool>false</bool>
-   </edit>
+  <test name="family">
+   <string>ProggyTinyTT</string>
+  </test>
+  <edit name="pixelsize">
+   <double>16</double>
+  </edit>
+  <edit name="antialias">
+   <bool>false</bool>
+  </edit>
+  <edit name="hinting">
+   <bool>false</bool>
+  </edit>
  </match>
+ <dir>~/.fonts</dir>
 </fontconfig>
diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf
index ee15bd1..56afa28 100644
--- a/gnupg/gpg.conf
+++ b/gnupg/gpg.conf
@@ -42,7 +42,7 @@ photo-viewer "geeqie %i"
 use-agent
 
 # PGP compatibility
-# - http://www.gnupg.org/(en)/documentation/faqs.html#q5.1
+# - http://www.gnupg.org/documentation/faqs.en.html#q5.1
 compress-algo 1
 #cipher-algo CAST5
 
diff --git a/irssi/awesome.theme b/irssi/awesome.theme
index ef745b6..a89f4c8 100644
--- a/irssi/awesome.theme
+++ b/irssi/awesome.theme
@@ -9,7 +9,7 @@
 # crap.
 #
 # - My configuration file is available here:
-#     http://sysphere.org/~anrxc/local/scr/dotfiles/irssi.config
+#     http://git.sysphere.org/dotfiles/tree/irssi/
 
 
 # default foreground color (%N) - -1 is the "default terminal color"
diff --git a/zshrc b/zshrc
index 96dadaa..4dcd78b 100644
--- a/zshrc
+++ b/zshrc
@@ -77,7 +77,7 @@ alias retract='eject -t -v '
 alias vuser='fuser -v '
 alias ping='ping -c 5'
 alias more='less'
-alias mc='. /usr/share/mc/bin/mc-wrapper.sh -x'
+alias mc='. /usr/lib/mc/mc-wrapper.sh -x'
 alias links='links ~/.links/startpage.html'
 alias cplay='cplay -v'
 alias xtr='extract'
@@ -91,8 +91,8 @@ alias iodrag='ionice -c3 nice -n19'
 alias spell='aspell -a <<< '
 alias ec='emacsclient -a emacs -n '
 alias ect='emacsclient -a emacs -t '
-alias gpgd='gpg --decrypt'
-alias gpge='gpg -ear anrxc'
+alias gpgd='gpg2 --decrypt'
+alias gpge='gpg2 -ear anrxc'
 alias keyshare='synergys -f --config /etc/synergy.conf'
 alias xpop='xprop | grep --color=none "WM_CLASS\|^WM_NAME" | xmessage -file -'
 # }}}
@@ -182,7 +182,7 @@ function extract () {
             *.gz)               gunzip     "$1"     ;;
             *.7z)               7z x       "$1"     ;;
             *.Z)                uncompress "$1"     ;;
-            *.gpg)        gpg -d "$1" | tar -xvzf - ;;
+            *.gpg)       gpg2 -d "$1" | tar -xvzf - ;;
             *) echo "Error: failed to extract '$1'" ;;
         esac
     else
-- 
cgit v1.2.3