diff --git a/Makefile b/Makefile index 8405ec0..31d67f5 100644 --- a/Makefile +++ b/Makefile @@ -1,32 +1,22 @@ -FILES = ratpoisonrc vimrc Xresources zshrc emacs.el gitconfig \ - bashrc bash_completion screenrc commonshrc gnomerc gvimrc +FILES = bashrc vimrc zshrc emacs.el gitconfig screenrc commonshrc \ + gnomerc gvimrc ifeq "$(USER)" "gebner" -FILES += muttrc gnus.el ssh/config -XFILES = - -ifeq "$(shell hostname)" "marginata" -FILES += procmailrc -endif +FILES += ssh/config endif .PHONY: all install clean check -all: $(FILES) $(XFILES) +all: $(FILES) -install: $(FILES) $(XFILES) +install: $(FILES) mkdir -p ~/.ssh for i in $(FILES); do install -m0644 $$i ~/.$$i; done - for i in $(XFILES); do install -m0755 $$i ~/.$$i; done clean: - rm -f procmailrc muttrc -check: $(FILES) $(XFILES) - for i in $(FILES) $(XFILES); do diff -u ~/.$$i $$i; done - -procmailrc muttrc: maildirs.m4 -muttrc: gpg.rc +check: $(FILES) + for i in $(FILES); do diff -u ~/.$$i $$i; done %: %.m4 m4 $< >$@ diff --git a/Xresources b/Xresources deleted file mode 100644 index 25d4594..0000000 --- a/Xresources +++ /dev/null @@ -1 +0,0 @@ -vncviewer*grabKeyboard: true diff --git a/bash_completion b/bash_completion deleted file mode 100644 index 2df5dac..0000000 --- a/bash_completion +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (C) 2004 Gabriel Ebner - -test -f $MYPREFIX/etc/darcs/bash_completion.d/darcs \ -&& . $MYPREFIX/etc/darcs/bash_completion.d/darcs diff --git a/gnus.el b/gnus.el deleted file mode 100644 index 93e9103..0000000 --- a/gnus.el +++ /dev/null @@ -1,21 +0,0 @@ -(eval-when-compile (require 'gnus)) -(require 'spam) - -(setq gnus-select-method '(nntp "news.gmane.org") - gnus-message-archive-group "nnmaildir:outbox" - - gnus-secondary-select-methods - '((nntp "nntp.dragonflybsd.org") - (nntp "nntp.perl.org") - (nntp "news.chello.at") - (nntp "news.gnus.org") - (nnmaildir "" (directory "~/Mail"))) - - gnus-spam-process-newsgroups '(("^gmane\." ((spam spam-use-gmane)))) - - pgg-default-user-id - (concat user-full-name - " <" user-mail-address ">") - - spam-use-bogofilter t - spam-use-bogofilter-headers t) diff --git a/gpg.rc b/gpg.rc deleted file mode 100644 index 67fd705..0000000 --- a/gpg.rc +++ /dev/null @@ -1,85 +0,0 @@ -# -*-muttrc-*- -# -# Command formats for gpg. -# -# This version uses gpg-2comp from -# http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp.tar.gz -# -# $Id: gpg.rc,v 3.4 2005/01/27 18:27:36 roessler Exp $ -# -# %p The empty string when no passphrase is needed, -# the string "PGPPASSFD=0" if one is needed. -# -# This is mostly used in conditional % sequences. -# -# %f Most PGP commands operate on a single file or a file -# containing a message. %f expands to this file's name. -# -# %s When verifying signatures, there is another temporary file -# containing the detached signature. %s expands to this -# file's name. -# -# %a In "signing" contexts, this expands to the value of the -# configuration variable $pgp_sign_as. You probably need to -# use this within a conditional % sequence. -# -# %r In many contexts, mutt passes key IDs to pgp. %r expands to -# a list of key IDs. - -# Note that we explicitly set the comment armor header since GnuPG, when used -# in some localiaztion environments, generates 8bit data in that header, thereby -# breaking PGP/MIME. - -# decode application/pgp -set pgp_decode_command="/usr/bin/gpg --charset utf-8 --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - -# verify a pgp/mime signature -set pgp_verify_command="/usr/bin/gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f" - -# decrypt a pgp/mime attachment -set pgp_decrypt_command="/usr/bin/gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - -# create a pgp/mime signed attachment -# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" -set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" - -# create a application/pgp signed (old-style) message -# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" -set pgp_clearsign_command="/usr/bin/gpg --charset utf-8 --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" - -# create a pgp/mime encrypted attachment -# set pgp_encrypt_only_command="pgpewrapng gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" -set pgp_encrypt_only_command="pgpewrapng /usr/bin/gpg --charset utf-8 --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" - -# create a pgp/mime encrypted and signed attachment -# set pgp_encrypt_sign_command="pgpewrapng gpg-2comp --passphrase-fd 0 -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" -set pgp_encrypt_sign_command="pgpewrapng /usr/bin/gpg --charset utf-8 %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" - -# import a key into the public key ring -set pgp_import_command="/usr/bin/gpg --no-verbose --import %f" - -# export a key from the public key ring -set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r" - -# verify a key -set pgp_verify_key_command="/usr/bin/gpg --verbose --batch --fingerprint --check-sigs %r" - -# read in the public key ring -set pgp_list_pubring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-keys %r" - -# read in the secret key ring -set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" - -# fetch keys -# set pgp_getkeys_command="pkspxycwrap %r" - -# pattern for good signature - may need to be adapted to locale! - -# set pgp_good_sign="^gpg: Good signature from" - -# OK, here's a version which uses gnupg's message catalog: -# set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`" - -# This version uses --status-fd messages -set pgp_good_sign="^\\[GNUPG:\\] GOODSIG" - diff --git a/maildirs.m4 b/maildirs.m4 deleted file mode 100644 index b2bcb23..0000000 --- a/maildirs.m4 +++ /dev/null @@ -1,143 +0,0 @@ -dnl or(either, otherwise) -define(`or', `ifelse(`$1', `', `$2', `$1')') - -dnl q(text) -define(`q', `patsubst(`$1', `[.]', `\\\&')') - -dnl join(delim, elems*) -define(`join', `ifelse( - `$#', `0', `', - `$#', `1', `', - `$#', `2', `$2', - ``$2$1'join(`$1', shift(shift($@)))')') - -dnl md*(mbox, rule, addr) -define(`md', `indir(`md_'md_target, $@)') - -dnl muttrc -define(`md_muttrc_mboxes', `mailboxes +$1') -define(`md_muttrc_subscr', `ifelse(`$3', `', `', `subscribe $3')') - -dnl procmailrc -define(`md_procmailrc', ` -:0 -* ^$2 -deliver(`$1') - -') - -dnl ml(addr, mbox, id, fix, rule) -define(`ml', `md( - or(`$2', `substr(`$1', 0, index(`$1', `@'))'), - ml_rule(or(`$3', `ifelse( - `$4', `ecartis', `substr(`$1', 0, index(`$1', `@'))', - `translit(`$1', `@', `.')')'), `$1', `$4', `$5'), - `$1')') - -dnl ml_rule(id, addr, fix, rule) -define(`ml_rule', `ifelse( - `$3', `to', `TO_`'q($2)', - `$3', `ezmlm', `Mailing-List:.* q(substr(`$2', 0, - index(`$2', `@'))-help`'substr(`$2', index(`$2', `@')));', - `$3', `ecartis', `X-list: q($1)$', - `$4', `', `List-Id:.*[ <]q($1)', - `$4')') - -dnl Mailing Lists -ml(`swpat@ffii.org', `ffii-swpat') -ml(`at-parl@ffii.org', `ffii-at-parl') -ml(`swpat@mond.at', `mond-swpat') -ml(`soekris-tech@lists.soekris.com') -ml(`www-math@w3.org') -ml(`geo-discuss@lists.okfn.org') -ml(`geowanking@geowanking.org',, `geowanking_geowanking.org.geowanking.org') -ml(`info-gplv3@gplv3.fsf.org', `gplv3',, `to') -ml(`(european-gi-policy|egip)@jrc.it', `egip',, `to') -ml(`cryopid-devel@lists.berlios.de') -ml(`lojban-beginners@lojban.org',,, `ecartis') -ml(`lojban@googlegroups.com', `lojban-list') -ml(`talk-de@openstreetmap.org') -ml(`talk-fr@openstreetmap.org') -ml(`josm-dev@openstreetmap.org') -ml(`legal-talk@openstreetmap.org') -ml(`osmf-talk@openstreetmap.org') -ml(`tahoe-dev@allmydata.org') -ml(`ceph-devel@lists.sourceforge.net') -ml(`fonc@vpri.org') -ml(`qse_sepm_02@googlegroups.com', `sepm') -ml(`insoss1007@inso.tuwien.ac.at', `ase') - -dnl Mailman reminders -md(`reminders', `From: mailman-owner@ -* ^Subject:.* list memberships reminder$') - -dnl Bugzillas -define(`bz', `md(`bugs-$1', `$2')') -bz(`debian', `From.*') -bz(`gcc', `Reply-To: gcc-bugzilla@gcc.gnu.org') -bz(`gentoo', `From: bugzilla-daemon@gentoo.org') -bz(`kde', `X-Bugzilla-URL: http://bugs.kde.org/') -bz(`remotesensing', `From: bugzilla-daemon@bugzilla.remotesensing.org') -bz(`sablevm', `From: bugs-owner@sablevm.org') -bz(`berlios', `From: noreply@berlios.de') -bz(`gnome', `From: bugzilla-daemon@bugzilla.gnome.org') -md(`ase', `X-Redmine-Host: 5n07\.it-htl\.at:333') - -dnl Misc -md(`osm', `Subject:.*\[OpenStreetMap\] GPX Import success') -md(`sourceforge', `From:.*noreply@sourceforge\.net') -md(`facebook', `From: Facebook ') - -dnl System -md(`system', `From: root@gabrielebner\.at \(Cron Daemon\)$') -md(`snort', `Subject: \[SNORT\]') - -dnl GMane -md(`gmane', `From:.*auth.gmane\.org') - -dnl Service providers -md(`ums', `From:.*ums@a1\.net') -md(`nit', `From:.*kundensupport@nit\.at') - -dnl Newsletters -md(`ffii', `From:.*ffii.org|TO_.*ffii.org') -md(`diepresse', `From:.*newsletter@diepresse.com') -md(`geocaching', `From:.*') - -md(`werbung', `From:.*('join(`|', - `newsletter', - `newslist', - `newsteam', - `mailing', - `palmsource', - `palmgear', - `palmone', - `ebook.nl', - `webmaster@sony\.at', - `return@mandriva\.com', - `mailelk@.*swr3\.de', - `shockwave\.com', - `RealNetworks', - `email@softwarewelt\.de', - `noreply@widget-service\.de', - `tomtomnews@tomtommailer\.com', - `promotion5@amazon\.de', - `mailings@gmx-gmbh\.de', - `linuxland\.de', - `macromedia', - `promotion', - `', - `office@wenigzell\.at', - `', - `', - `@news\.niedermeyer\.at>', - `', - `softwarewelt')`)') - -dnl Personal mailboxes - -define(`mymbox', `md(`$1', `TO_'q(`$2'))') - -mymbox(`INBOX', `ge@gabrielebner.at') -mymbox(`webmaster', `webmaster@gabrielebner.at') -mymbox(`a1net', `dieschnecke@a1.net') diff --git a/muttrc.m4 b/muttrc.m4 deleted file mode 100644 index 59e6755..0000000 --- a/muttrc.m4 +++ /dev/null @@ -1,94 +0,0 @@ -# vim:ft=muttrc: -my_hdr From: Gabriel Ebner - -set folder=imaps://gebner@mail.gabrielebner.at/ - -mailboxes /var/mail/gebner +outbox +postponed +maybe-spam - -define(`md_target', `muttrc_mboxes') -include(`maildirs.m4') dnl ' - -set mbox=+INBOX -set move -set postponed=+postponed -set postpone -set record=+outbox -set copy - -define(`md_target', `muttrc_subscr') -include(`maildirs.m4') dnl ' - -# Various options -set pipe_decode=no -set charset=utf8 -set header_cache=~/.mutt/hcache - -set editor='vim "+se ft=mail"' -set signature=~/.signature.ml -set crypt_autoencrypt=no -set crypt_autosign=no - -#set sidebar_visible -#set sidebar_width=25 -set pager_index_lines=7 - -# GnuPG - -set pgp_sign_as=0xFC3509A0 -set pgp_timeout=3600 - -include(`gpg.rc') dnl '` - -# News -set news_cache_dir="~/.mutt/newsspool" -set newsrc="~/.mutt/newsrc-%s" - -set sort=threads -set sort_aux=date-sent -set folder_format="%2C %N %-40.40f %d" - -# Header formatting -ignore * -unignore from date subject bcc cc to # standard headers -unignore x-crm114-status # crm114 - -hdr_order from to cc bcc date subject x-crm114-status - -color header brightcyan default ^(From|Date|Subject): - -# Colors -color normal white black -color attachment brightyellow black -color hdrdefault cyan black -color indicator black cyan -color markers brightred black -color quoted green black -color signature cyan black -color status brightgreen blue -color tilde blue black -color tree red black -color header brightgreen black ^From: -color header brightcyan black ^To: -color header brightcyan black ^Reply-To: -color header brightcyan black ^Cc: -color header brightblue black ^Subject: -color body brightred black [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+ -color body brightblue black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+ - -# Key bindings: -# F2 news.gmane.org -# F3 news.chello.at - -macro generic "set news_server=news.gmane.org" -macro generic "set news_server=news.chello.at" - -# F9 requeue -# F10 queue as non-spam -# F11 queue as spam -# F12 process queues (out of order atm) - -macro generic "=queue-requeuey" -macro generic "=queue-unspamy" -macro generic "=queue-spamy" - -source ~/.mutt/aliases diff --git a/procmailrc.m4 b/procmailrc.m4 deleted file mode 100644 index 6656336..0000000 --- a/procmailrc.m4 +++ /dev/null @@ -1,14 +0,0 @@ -# vim:ft=m4: -MAILDIR=$HOME/Maildir -SHELL=/bin/dash -#VERBOSE=on - -define(`deliver', `ifelse(`$1', `INBOX', `./', `.$1/')') - -# Mailing lists - -define(`md_target', `procmailrc') -include(`maildirs.m4') - -:0 -deliver(`INBOX') diff --git a/ratpoisonrc b/ratpoisonrc deleted file mode 100644 index 875ac6f..0000000 --- a/ratpoisonrc +++ /dev/null @@ -1,2 +0,0 @@ -addhook switchwin banish -bind e exec emacs diff --git a/runcrm114 b/runcrm114 deleted file mode 100755 index dc878a8..0000000 --- a/runcrm114 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -CRM114DIR=/home/gebner/.crm114 - -lockfile $CRM114DIR/lock - -crm -u $CRM114DIR $@ -ret=$? - -rm -f $CRM114DIR/lock - -exit $ret diff --git a/ssh/config b/ssh/config index a273252..f374587 100644 --- a/ssh/config +++ b/ssh/config @@ -1,5 +1,2 @@ # vim:ft=sshconfig: -#Host aruanus achatina nilotica archachatina -# GSSAPIAuthentication yes -# GSSAPIDelegateCredentials yes diff --git a/xsession b/xsession deleted file mode 100644 index fb11c59..0000000 --- a/xsession +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -if [ "`basename "$SHELL"`" != zsh -o -n "$BASH" ] && which zsh 2>/dev/null; then - exec zsh ~/.xsession -fi - -XSESSION=gnome - -case $XSESSION in - ratpoison) - xsetroot -solid black -cursor_name left_ptr - unclutter -idle 1 & - exec ratpoison - ;; - - awesome) - exec awesome - ;; - - xmonad) - exec xmonad - ;; - - ion3) - exec ion3 - ;; - - gnome) - exec gnome-session - ;; - - kde) - exec startkde - ;; - - xfce4) - if test -x /etc/xdg/xfce4/xinitrc; then - exec /etc/xdg/xfce4/xinitrc - else - exec startxfce4 - fi - ;; - - *) - msg="I've got no clue on what to do! Call master Gabriel!" - xmessage "$msg" || echo "$msg" - exit 1 -esac