From b0c7f5838fb726dc0d52bff03b888488a56729e6 Mon Sep 17 00:00:00 2001 From: Ambrevar Date: Tue, 3 Jul 2012 16:21:48 +0100 Subject: [PATCH] Pkg: removed obsolete lists. Emacs: improved file mode recognition. Mutt: added colors, custom headers, aliases and mailcap support. Shell: added emacs first-line. --- .arch-mirrors-odin | 4 - .arch-pkg-aur-odin | 14 - .arch-pkg-explicit-odin | 168 ------------ .arch-pkg-explicit-zeus | 2 + .arch-pkg-official-odin | 473 --------------------------------- .arch-pkg-official-zeus | 2 + .config/ranger/scope.sh | 5 + .emacs | 50 ++-- .emacs.d/abbrev_defs | 2 + .mutt.d/colors.default | 22 ++ .mutt.d/colors.linux | 21 ++ .mutt.d/colors.nongeek | 80 ++++++ .mutt.d/mailcap | 7 + .muttrc | 175 ++++++------ .shell.d/alias_rc | 1 + .shell.d/{colors => colors_rc} | 1 + .shell.d/funs_bash | 3 +- .shell.d/funs_rc | 1 + .shell.d/keys_zsh | 3 +- .shell.d/main_rc | 1 + .shell.d/options_bash | 1 + .shell.d/options_zsh | 1 + .shell.d/personal_rc | 13 +- 23 files changed, 267 insertions(+), 783 deletions(-) delete mode 100644 .arch-mirrors-odin delete mode 100644 .arch-pkg-aur-odin delete mode 100644 .arch-pkg-explicit-odin delete mode 100644 .arch-pkg-official-odin create mode 100644 .mutt.d/colors.default create mode 100644 .mutt.d/colors.linux create mode 100644 .mutt.d/colors.nongeek create mode 100644 .mutt.d/mailcap rename .shell.d/{colors => colors_rc} (99%) diff --git a/.arch-mirrors-odin b/.arch-mirrors-odin deleted file mode 100644 index 55245c4f..00000000 --- a/.arch-mirrors-odin +++ /dev/null @@ -1,4 +0,0 @@ -[options] -[core] -[extra] -[community] diff --git a/.arch-pkg-aur-odin b/.arch-pkg-aur-odin deleted file mode 100644 index d396bc5c..00000000 --- a/.arch-pkg-aur-odin +++ /dev/null @@ -1,14 +0,0 @@ -auto-complete -bashmount -dropbox -dropbox-cli -emacs-yasnippet -emacs-yasnippet-latex-git -gsharkdown -libfetch -movgrab -ns-3 -package-query -pacman-color -trash-cli -yaourt diff --git a/.arch-pkg-explicit-odin b/.arch-pkg-explicit-odin deleted file mode 100644 index 3544abe4..00000000 --- a/.arch-pkg-explicit-odin +++ /dev/null @@ -1,168 +0,0 @@ -acpi -alsa-utils -atool -auto-complete -autoconf -automake -awesome -bash -bash-completion -bashmount -binutils -bison -bzip2 -bzr -calc -cmus -consolekit -coreutils -cpufrequtils -cronie -cryptsetup -ctags -cups -device-mapper -dhcpcd -diffutils -dropbox -dropbox-cli -e2fsprogs -emacs-lua-mode -emacs-nox -emacs-yasnippet -emacs-yasnippet-latex-git -fakeroot -feh -file -filesystem -findutils -flashplugin -flex -gawk -gcc -gcc-libs -gcolor2 -gdb -gettext -glibc -gnuplot -gparted -grep -grub -gsharkdown -gzip -hdparm -heirloom-mailx -highlight -hplip -htop -inetutils -initscripts -inkscape -iproute2 -iptables -iputils -jfsutils -laptop-mode-tools -less -libpipeline -libtool -licenses -links -linux -linux-lts -logrotate -luakit -lvm2 -lxterminal -m4 -make -man-db -man-pages -mdadm -mediainfo -mercurial -mkinitcpio -movgrab -mplayer -mutt -nano -ncdu -ncurses -net-tools -nmap -ns-3 -numlockx -openssh -p7zip -package-query -pacman -pacman-color -pari -patch -pciutils -pcmciautils -perl -pkg-config -ppp -procps-ng -psmisc -pwgen -pygtk -ranger -reiserfsprogs -rtorrent -rxvt-unicode -scons -scrot -sed -shadow -slock -splint -sudo -sxiv -sysfsutils -syslog-ng -systemd-tools -sysvinit -tar -task -texinfo -texlive-genericextra -texlive-latexextra -texlive-pictures -trash-cli -tree -unrar -unzip -usbutils -util-linux -valgrind -vi -vicious -vim -vlock -waf -wget -which -wireless_tools -wpa_supplicant -xf86-input-synaptics -xf86-video-ati -xf86-video-vesa -xfsprogs -xorg-server -xorg-twm -xorg-xev -xorg-xinit -xorg-xrandr -xorg-xrdb -xsel -xterm -xz -yaourt -zathura -zathura-djvu -zathura-pdf-poppler -zathura-ps -zsh diff --git a/.arch-pkg-explicit-zeus b/.arch-pkg-explicit-zeus index 474364f2..9b58b2d6 100644 --- a/.arch-pkg-explicit-zeus +++ b/.arch-pkg-explicit-zeus @@ -54,6 +54,7 @@ gnuplot gparted grep grub +gsasl gsharkdown gzip hdparm @@ -69,6 +70,7 @@ iputils jfsutils laptop-mode-tools less +libgnome-keyring libtool licenses links diff --git a/.arch-pkg-official-odin b/.arch-pkg-official-odin deleted file mode 100644 index 06ab95f4..00000000 --- a/.arch-pkg-official-odin +++ /dev/null @@ -1,473 +0,0 @@ -a52dec -aalib -acl -acpi -alsa-lib -alsa-utils -archlinux-keyring -aspell -ati-dri -atk -atkmm -atool -attr -auctex -autoconf -automake -avahi -awesome -bash -bash-completion -bc -binutils -bison -bzip2 -bzr -ca-certificates -cairo -cairomm -calc -cdparanoia -cifs-utils -cloog -cmus -compositeproto -consolekit -coreutils -cpufrequtils -cracklib -cronie -cryptsetup -ctags -cups -cups-filters -curl -damageproto -db -dbus -dbus-core -dbus-glib -desktop-file-utils -device-mapper -dhcpcd -dialog -diffutils -dirmngr -djvulibre -dnssec-anchors -dri2proto -e2fsprogs -eject -emacs-lua-mode -emacs-nox -enca -enchant -eventlog -expat -faac -faad2 -fakeroot -feh -file -filesystem -findutils -fixesproto -flac -flashplugin -flex -fontconfig -fontsproto -foomatic-db -foomatic-db-engine -foomatic-filters -freeglut -freetype2 -fribidi -gawk -gc -gcc -gcc-libs -gcolor2 -gd -gdb -gdbm -gdk-pixbuf2 -geoclue -gettext -ghostscript -giblib -giflib -girara-common -girara-gtk2 -git -glib2 -glibc -glibmm -glib-networking -glproto -gmp -gnupg -gnuplot -gnutls -gparted -gpgme -gpm -grep -groff -grub -gsettings-desktop-schemas -gsl -gstreamer0.10 -gstreamer0.10-base -gstreamer0.10-python -gtk2 -gtkmm -gtkspell -gtk-update-icon-cache -gzip -hdparm -heirloom-mailx -hicolor-icon-theme -highlight -hplip -hspell -htop -hunspell -hwids -iana-etc -icu -imagemagick -imlib2 -inetutils -initscripts -inkscape -inputproto -iproute2 -iptables -iputils -isl -jack -jasper -jfsutils -json-c -kbd -kbproto -keyutils -kmod -krb5 -lame -laptop-mode-tools -lcms -lcms2 -ldns -less -libarchive -libass -libassuan -libasyncns -libatasmart -libbluray -libcaca -libcap -libcap-ng -libcddb -libcdio -libcups -libdaemon -libdatrie -libdca -libdrm -libedit -libev -libexif -libffi -libfontenc -libftdi -libgcrypt -libgl -libglade -libglapi -libgpg-error -libgssglue -libice -libid3tag -libidn -libirman -libjpeg-turbo -libksba -libldap -libltdl -libmad -libmediainfo -libmms -libmng -libmp4v2 -libmpc -libnl -libogg -libpcap -libpciaccess -libpipeline -libpng -libproxy -libpulse -libsamplerate -libsasl -libsigc++ -libsigsegv -libsm -libsndfile -libsoup -libspectre -libssh2 -libsystemd -libtasn1 -libthai -libtheora -libtiff -libtirpc -libtool -libtorrent -libunique -libusb-compat -libusbx -libvdpau -libvorbis -libvpx -libwbclient -libwebkit -libx11 -libxau -libxaw -libxcb -libxcomposite -libxcursor -libxdamage -libxdg-basedir -libxdmcp -libxext -libxfixes -libxfont -libxft -libxi -libxinerama -libxkbfile -libxml2 -libxmu -libxpm -libxrandr -libxrender -libxslt -libxss -libxt -libxtst -libxv -libxvmc -libxxf86dga -libxxf86vm -libzen -licenses -links -linux -linux-api-headers -linux-firmware -linux-lts -lirc-utils -logrotate -lsof -lua -luafilesystem -luajit -luakit -lvm2 -lxterminal -m4 -make -man-db -man-pages -mcpp -mdadm -mediainfo -mercurial -mesa -mime-types -mkinitcpio -mkinitcpio-busybox -mozilla-common -mpfr -mpg123 -mplayer -mtdev -mutt -nano -ncdu -ncurses -net-snmp -nettle -net-tools -nmap -nspr -nss -numlockx -opencore-amr -openjpeg -openslp -openssh -openssl -orc -p11-kit -p7zip -pacman -pacman-mirrorlist -pam -pambase -pango -pangomm -pari -parted -patch -pciutils -pcmciautils -pcre -perl -perl-error -pinentry -pixman -pkg-config -polkit -poppler -poppler-data -poppler-glib -popt -ppl -ppp -procps-ng -psmisc -pth -pwgen -pygobject2-devel -pygtk -python -python2 -python2-cairo -python2-dbus -python2-distribute -python2-gobject2 -python-configobj -python-dbus-common -python-pycurl -randrproto -ranger -readline -recode -recordproto -reiserfsprogs -renderproto -rtorrent -run-parts -rxvt-unicode -schroedinger -scons -scrnsaverproto -scrot -sdl -sed -sg3_utils -shadow -shared-mime-info -slock -smbclient -splint -sqlite -startup-notification -sudo -sxiv -sysfsutils -syslog-ng -systemd-tools -sysvinit -t1lib -talloc -tar -task -tdb -texinfo -texlive-bin -texlive-core -texlive-genericextra -texlive-latexextra -texlive-pictures -tree -ttf-dejavu -tzdata -udisks -unrar -unzip -usbutils -util-linux -valgrind -vi -vicious -videoproto -vim -vim-runtime -vlock -vte -vte-common -waf -wget -which -wireless_tools -wpa_supplicant -wxgtk -x264 -xbitmaps -xcb-proto -xcb-util -xcb-util-image -xcb-util-keysyms -xcb-util-wm -xextproto -xf86dgaproto -xf86-input-evdev -xf86-input-synaptics -xf86-video-ati -xf86-video-vesa -xf86vidmodeproto -xfsprogs -xineramaproto -xkeyboard-config -xmlrpc-c -xorg-bdftopcf -xorg-fonts-alias -xorg-fonts-encodings -xorg-fonts-misc -xorg-font-util -xorg-font-utils -xorg-luit -xorg-mkfontdir -xorg-mkfontscale -xorg-server -xorg-server-common -xorg-setxkbmap -xorg-twm -xorg-xauth -xorg-xev -xorg-xinit -xorg-xkbcomp -xorg-xmessage -xorg-xrandr -xorg-xrdb -xproto -xsel -xterm -xvidcore -xz -yajl -zathura -zathura-djvu -zathura-pdf-poppler -zathura-ps -zlib -zsh -zziplib diff --git a/.arch-pkg-official-zeus b/.arch-pkg-official-zeus index 1ca7b6bd..927340e0 100644 --- a/.arch-pkg-official-zeus +++ b/.arch-pkg-official-zeus @@ -123,6 +123,7 @@ gpm grep groff grub +gsasl gsettings-desktop-schemas gsl gsm @@ -209,6 +210,7 @@ libgl libglade libglapi libgme +libgnome-keyring libgpg-error libgssglue libice diff --git a/.config/ranger/scope.sh b/.config/ranger/scope.sh index 0ef18bdb..616f4164 100755 --- a/.config/ranger/scope.sh +++ b/.config/ranger/scope.sh @@ -45,11 +45,16 @@ case "$extension" in pdf) pdftotext -l 10 -nopgbrk -q "$path" - | head -n $maxln | fmt -s -w $width success && exit 0 || exit 1;; + # CUSTOM # MKV videos: mkv) mediainfo "$path" | sed 's/ \+:/: /;' success && exit 5 || exit 1;; + # doc files: + doc) + antiword "$path" + success && exit 5 || exit 1;; # BitTorrent Files torrent) diff --git a/.emacs b/.emacs index bbff84af..9655077b 100644 --- a/.emacs +++ b/.emacs @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Emacs config -;; 2012-06-22 +;; 2012-07-02 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;============================================================================== @@ -104,6 +104,23 @@ ;; Automode default modification ;;============================================================================== +;; rc support +(setq auto-mode-alist + (append + '(("rc\\'" . sh-mode) + ) + auto-mode-alist) + ) + +;; Shell support +;; We do not put 'sh' only because it could get messy. +(setq auto-mode-alist + (append + '(("\\(bash\\'\\|zsh\\'\\|csh\\'\\|tcsh\\'\\|ksh\\'\\)" . sh-mode) + ) + auto-mode-alist) + ) + ;; Read Matlab files in Octave mode. (setq auto-mode-alist (append @@ -112,10 +129,12 @@ auto-mode-alist) ) -;; Mutt support +;; Mutt support. +;; We make sure the file name has not dot in front of mutt to prevent .muttrc +;; from being seen as a mail file. (setq auto-mode-alist (append - '(("mutt.*" . mail-mode) + '(("[^\\./]mutt.*" . mail-mode) ) auto-mode-alist) ) @@ -336,23 +355,24 @@ ;;============================================================================== ;; Yasnippet ;;============================================================================== -;; Yasnippet is slow when loading snipepts from source. +;; Yasnippet is slow when loading snippets from source. ;; Generate a bundle instead: yas/compile-bundle ;; Besides you can convert the generated file to bytecode. (add-to-list 'load-path "~/.emacs.d/plugins") (require 'yasnippet-bundle) -;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/yas") -;; (require 'yasnippet) ;; not yasnippet-bundle -;; (yas/initialize) +;; Next follows a traditional, yet not-optimized configuration for Yasnippet. +; (add-to-list 'load-path "/usr/share/emacs/site-lisp/yas") +; (require 'yasnippet) ;; not yasnippet-bundle +; (yas/initialize) -;; ;; Personal snippets -;; (setq yas/root-directory "~/.emacs.d/plugins/yas/snippets" ) +;; Personal snippets +; (setq yas/root-directory "~/.emacs.d/plugins/yas/snippets" ) ;; Load the snippets -;; (yas/load-directory "~/.emacs.d/plugins/yas/snippets") ; Warning: slow! -;; (yas/load-directory yas/root-directory) +; (yas/load-directory "~/.emacs.d/plugins/yas/snippets") ; Warning: slow! +; (yas/load-directory yas/root-directory) ;;============================================================================== ;; Auto-Complete @@ -432,11 +452,3 @@ ;; (setq mediawiki-site-alist ;; (append '("ArchWiki" "https://wiki.archlinux.org/" "username" "password" "Main Page") ;; mediawiki-site-alist)) - - -;; (custom-set-variables -;; ;; custom-set-variables was added by Custom. -;; ;; If you edit it by hand, you could mess it up, so be careful. -;; ;; Your init file should contain only one such instance. -;; ;; If there is more than one, they won't work right. -;; ) diff --git a/.emacs.d/abbrev_defs b/.emacs.d/abbrev_defs index c0609471..929ac970 100644 --- a/.emacs.d/abbrev_defs +++ b/.emacs.d/abbrev_defs @@ -59,12 +59,14 @@ ("afaict" "as far as I can tell" nil 0) ("ajd" "aujourd'hui" nil 2) ("arch" "architecture" nil 1) + ("asap" "as soon as possible" nil 1) ("autom" "automatique" nil 2) ("atm" "at the moment" nil 1) ("bcp" "beaucoup" nil 2) ("biblio" "bibliothèque" nil 1) ("btw" "by the way" nil 1) ("chai" "je ne sais" nil 1) + ("chui" "je ne suis" nil 1) ("config" "configuration" nil 1) ("configs" "configurations" nil 1) ("càd" "c'est-à-dire" nil 1) diff --git a/.mutt.d/colors.default b/.mutt.d/colors.default new file mode 100644 index 00000000..d75c6649 --- /dev/null +++ b/.mutt.d/colors.default @@ -0,0 +1,22 @@ +# -*- mode:sh -*- +## Colors for use with xterm and the like, white background. + +color hdrdefault blue white +color quoted blue white +color signature red white +color attachment red white +color message brightred white +color error brightred white +color indicator brightyellow red +color status brightgreen blue +color tree black white +color normal black white +color markers red white +color search white black +color tilde brightmagenta white +color index blue white ~F +color index red white "~N|~O" + + +# color body brightblack white '\*+[^*]+\*+' +# color body brightblack white '_+[^_]+_+' diff --git a/.mutt.d/colors.linux b/.mutt.d/colors.linux new file mode 100644 index 00000000..b51ce9cb --- /dev/null +++ b/.mutt.d/colors.linux @@ -0,0 +1,21 @@ +# -*- mode:sh -*- +## Palette for use with the Linux console. Black background. + +color hdrdefault blue black +color quoted blue black +color signature blue black +color attachment red black +color message brightred black +color error brightred black +color indicator black red +color status brightgreen blue +color tree white black +color normal white black +color markers red black +color search white black +color tilde brightmagenta black +color index blue black ~F +color index red black "~N|~O" + +# color body brightwhite black '\*+[^*]+\*+' +# color body brightwhite black '_+[^_]+_+' diff --git a/.mutt.d/colors.nongeek b/.mutt.d/colors.nongeek new file mode 100644 index 00000000..6115118a --- /dev/null +++ b/.mutt.d/colors.nongeek @@ -0,0 +1,80 @@ +# -*- mode:sh -*- +## Theme kindly stolen from +# http://nongeekshandbook.blogspot.ie/2009/03/mutt-color-configuration.html + +## Colours for items in the index +color index brightcyan black ~N +## Hmm, don't like this. +#color index brightgreen black "~N (~x byers.world)|(~x byers.x)|(~x langly.levallois123.axialys.net)|(~x the.earth.li)" +color index brightyellow black ~F +color index black green ~T +color index brightred black ~D +mono index bold ~N +mono index bold ~F +mono index bold ~T +mono index bold ~D + +## Highlights inside the body of a message. + +# URLs +color body brightgreen black "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" +color body brightgreen black "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" +mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" +mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" + +## Email addresses. +color body brightgreen black "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+" +#mono body bold "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+" + +## Header +color header green black "^from:" +color header green black "^to:" +color header green black "^cc:" +color header green black "^date:" +color header yellow black "^newsgroups:" +color header yellow black "^reply-to:" +color header brightcyan black "^subject:" +color header red black "^x-spam-rule:" +color header green black "^x-mailer:" +color header yellow black "^message-id:" +color header yellow black "^Organization:" +color header yellow black "^Organisation:" +color header yellow black "^User-Agent:" +color header yellow black "^message-id: .*pine" +color header yellow black "^X-Fnord:" +color header yellow black "^X-WebTV-Stationery:" +color header yellow black "^X-Message-Flag:" +color header yellow black "^X-Spam-Status:" +color header yellow black "^X-SpamProbe:" +color header red black "^X-SpamProbe: SPAM" + +## Coloring quoted text - coloring the first 7 levels: +color quoted cyan black +color quoted1 yellow black +color quoted2 red black +color quoted3 green black +color quoted4 cyan black +color quoted5 yellow black +color quoted6 red black +color quoted7 green black + +## Default color definitions +#color hdrdefault white green +color signature brightmagenta black +color indicator black cyan +color attachment black green +color error red black +color message white black +color search brightwhite magenta +color status brightyellow blue +color tree brightblue black +color normal white black +color tilde green black +color bold brightyellow black +#color underline magenta black +color markers brightcyan black + +## Colour definitions when on a mono screen +mono bold bold +mono underline underline +mono indicator reverse diff --git a/.mutt.d/mailcap b/.mutt.d/mailcap new file mode 100644 index 00000000..36ee691b --- /dev/null +++ b/.mutt.d/mailcap @@ -0,0 +1,7 @@ +# $Id$ + +text/html; w3m -I %{charset} -T text/html; copiousoutput; +# text/html; netscape -remote openURL\(%s\) +image/gif; xv %s +image/jpg; xv %s +# application/pgp-keys; pgp -f < %s ; copiousoutput diff --git a/.muttrc b/.muttrc index b2e8583e..43c866c8 100644 --- a/.muttrc +++ b/.muttrc @@ -1,6 +1,35 @@ -#------------------------------------------------------------------------------- -# Multiple accounts -#------------------------------------------------------------------------------- +## -*- mode:sh -*- # +################################################################################ +## Mutt Configuration +## Date 2012-07-03 +################################################################################ + +## Note on folders: +## These folders are assumed to exist: +## -~/.mutt = personal stuff (contacts, account information) +## -~/.mutt.d = public stuff (cache, theme, mailcap) +## Optional: +## -~/.mutt.d/hcache = see hcache below. + +##------------------------------------------------------------------------------- +## General options +##------------------------------------------------------------------------------- + +## TODO: why doesn't the $EDITOR variable work for connecting to emacs daemon? +set editor="emacsclient -a \"\" -t" + +## Fix the BackSpace bug that happens on some terminals. +#bind index,pager  previous-page + +## Mailcap +# set mailcap_path = ~/.mutt.d/mailcap +# auto_view text/html +# alternative_order text/plain text/html + +##------------------------------------------------------------------------------- +## Multiple accounts +##------------------------------------------------------------------------------- + set my_ac_personal=personal set my_ac_work=work set my_ac_university=university @@ -9,7 +38,7 @@ folder-hook '$my_ac_personal' 'source ~/.mutt/$my_ac_personal' folder-hook '$my_ac_work' 'source ~/.mutt/$my_ac_work' folder-hook '$my_ac_university' 'source ~/.mutt/$my_ac_university' -# Switch to default account on startup +## Switch to default account on startup #source ~/.mutt/$my_ac_personal #source ~/.mutt/$my_ac_work source ~/.mutt/$my_ac_university @@ -18,19 +47,14 @@ macro index 'source ~/.mutt/$my_ac_personal 'source ~/.mutt/$my_ac_work!' macro index 'source ~/.mutt/$my_ac_university!' -#------------------------------------------------------------------------------- -# General options -#------------------------------------------------------------------------------- - -# TODO: why doesn't the $EDITOR variable work for connecting to emacs daemon? -set editor="emacsclient -a \"\" -t" - -#------------------------------------------------------------------------------- -# Receiving options -#------------------------------------------------------------------------------- +##------------------------------------------------------------------------------ +## Receiving options +##------------------------------------------------------------------------------ # Store message headers locally to speed things up. -set header_cache = ~/.mutt/hcache +# Gentoo wiki says that if a folder is specified, it is even faster. +# If no folder exists, the cache will be a single file. +set header_cache = ~/.mutt.d/hcache # Allow mutt to open new imap connection automatically. unset imap_passive @@ -41,101 +65,64 @@ set imap_keepalive = 300 # How often to check for new mail (time in seconds). set mail_check = 120 -# Manual fetch -bind index "^" imap-fetch-mail - -# Beep on new incoming mails +# Beep on new incoming mails. set beep_new = "yes" -#------------------------------------------------------------------------------- -# Sending options -#------------------------------------------------------------------------------- +##------------------------------------------------------------------------------ +## Sending options +##------------------------------------------------------------------------------ set mbox_type=Maildir set edit_headers=yes +##------------------------------------------------------------------------------ +## Aliasses +##------------------------------------------------------------------------------ +set alias_file= ~/.mutt/aliases +set sort_alias= alias +set reverse_alias=yes +source $alias_file +##------------------------------------------------------------------------------ +## Keys +##------------------------------------------------------------------------------ -#------------------------------------------------------------------------------- -# Theme -#------------------------------------------------------------------------------- +# Manual fetch. +bind index "^" imap-fetch-mail +##------------------------------------------------------------------------------ +## Custom headers for outgoing mail +##------------------------------------------------------------------------------ -# Colours for items in the index -color index brightcyan black ~N -# Hmm, don't like this. -#color index brightgreen black "~N (~x byers.world)|(~x byers.x)|(~x langly.levallois123.axialys.net)|(~x the.earth.li)" -color index brightyellow black ~F -color index black green ~T -color index brightred black ~D -mono index bold ~N -mono index bold ~F -mono index bold ~T -mono index bold ~D +## Undo any custom headers that may have been put in by the global Muttrc +# unmy_hdr * -# Highlights inside the body of a message. +## Remove any global From: header +#unset use_from +## Don't append a domain to my outgoing mails +#unset use_domain -# URLs -color body brightgreen black "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" -color body brightgreen black "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" -mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" -mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" +#my_hdr From: Firstname Lastname -# email addresses -color body brightgreen black "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+" -#mono body bold "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+" +## Extra info. +# my_hdr X-Info: Simplicity is the ultimate sophistication. -# header -color header green black "^from:" -color header green black "^to:" -color header green black "^cc:" -color header green black "^date:" -color header yellow black "^newsgroups:" -color header yellow black "^reply-to:" -color header brightcyan black "^subject:" -color header red black "^x-spam-rule:" -color header green black "^x-mailer:" -color header yellow black "^message-id:" -color header yellow black "^Organization:" -color header yellow black "^Organisation:" -color header yellow black "^User-Agent:" -color header yellow black "^message-id: .*pine" -color header yellow black "^X-Fnord:" -color header yellow black "^X-WebTV-Stationery:" -color header yellow black "^X-Message-Flag:" -color header yellow black "^X-Spam-Status:" -color header yellow black "^X-SpamProbe:" -color header red black "^X-SpamProbe: SPAM" +## OS Info. +# my_hdr X-Operating-System: `uname -s`, kernel `uname -r` +# my_hdr X-Operating-System: Neidy\'s OS +## This header only appears to MS Outlook users +#my_hdr X-Message-Flag: WARNING!! Outlook sucks! -# Coloring quoted text - coloring the first 7 levels: -color quoted cyan black -color quoted1 yellow black -color quoted2 red black -color quoted3 green black -color quoted4 cyan black -color quoted5 yellow black -color quoted6 red black -color quoted7 green black +## Custom Mail-User-Agent ID. +# set user_agent = no +#my_hdr User-Agent: Every email client sucks, this one just sucks less. +##------------------------------------------------------------------------------ +## Theme +##------------------------------------------------------------------------------ -# Default color definitions -#color hdrdefault white green -color signature brightmagenta black -color indicator black cyan -color attachment black green -color error red black -color message white black -color search brightwhite magenta -color status brightyellow blue -color tree brightblue black -color normal white black -color tilde green black -color bold brightyellow black -#color underline magenta black -color markers brightcyan black -# Colour definitions when on a mono screen -mono bold bold -mono underline underline -mono indicator reverse +#source ~/.mutt.d/colors.default +#source ~/.mutt.d/colors.linux +source ~/.mutt.d/colors.nongeek diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc index b043b3f5..a1b7aaf7 100644 --- a/.shell.d/alias_rc +++ b/.shell.d/alias_rc @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Shell Config -- Alias Definitions. ## Date 2012-07-02 diff --git a/.shell.d/colors b/.shell.d/colors_rc similarity index 99% rename from .shell.d/colors rename to .shell.d/colors_rc index fb8ecffb..8c17cbab 100644 --- a/.shell.d/colors +++ b/.shell.d/colors_rc @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ##============================================================================== ## Colors for universal support ##============================================================================== diff --git a/.shell.d/funs_bash b/.shell.d/funs_bash index 534aaab1..29629245 100644 --- a/.shell.d/funs_bash +++ b/.shell.d/funs_bash @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Bash specific functions ################################################################################ @@ -228,4 +229,4 @@ if isShell "bash"; then #unset wrap_alias -fi \ No newline at end of file +fi diff --git a/.shell.d/funs_rc b/.shell.d/funs_rc index 7b7534dd..c690fdfa 100644 --- a/.shell.d/funs_rc +++ b/.shell.d/funs_rc @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Shell -- Functions. ## Date 2012-06-21 diff --git a/.shell.d/keys_zsh b/.shell.d/keys_zsh index fdae3061..fd4285f4 100644 --- a/.shell.d/keys_zsh +++ b/.shell.d/keys_zsh @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Zsh Key bindings ## Date 2011-11-19 @@ -61,4 +62,4 @@ if isShell "zsh"; then # bindkey "\e[H" beginning-of-line # bindkey "\e[F" end-of-line -fi \ No newline at end of file +fi diff --git a/.shell.d/main_rc b/.shell.d/main_rc index 2b001a4d..33c95038 100644 --- a/.shell.d/main_rc +++ b/.shell.d/main_rc @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Shell Config -- Main ## Date 2011-11-19 diff --git a/.shell.d/options_bash b/.shell.d/options_bash index 63627dbe..8fa08d22 100644 --- a/.shell.d/options_bash +++ b/.shell.d/options_bash @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Bash specific options ################################################################################ diff --git a/.shell.d/options_zsh b/.shell.d/options_zsh index 856acf23..b8761ddd 100644 --- a/.shell.d/options_zsh +++ b/.shell.d/options_zsh @@ -1,3 +1,4 @@ +## -*- mode:sh -*- # ################################################################################ ## Zsh specific options ## Date 2011-11-19 diff --git a/.shell.d/personal_rc b/.shell.d/personal_rc index 0eb554e9..043ba0e7 100644 --- a/.shell.d/personal_rc +++ b/.shell.d/personal_rc @@ -1,19 +1,14 @@ +## -*- mode:sh -*- # ######################################################################## ## Shell -- Personal Definitions. -## Date 2012-04-22 +## Date 2012-07-02 ######################################################################## -##====================================================================== -## Personal -##====================================================================== - if [ -e "/media/data1/Personal" ]; then PERSONAL="/media/data1/Personal" elif [ -e "$HOME/Dropbox/Personal" ]; then PERSONAL="$HOME/Dropbox/Personal" fi -[ -e /media/data1/TEMP ] && TEMP="/media/data1/TEMP" - -# alias todo='$EDITOR $PERSONAL/TODO/TODO.txt' -# alias todo='emacsclient -t $PERSONAL/TODO/TODO.txt' +# [ -e /media/data1/TEMP ] && TEMP="/media/data1/TEMP" +[ -e "$HOME/temp" ] && TEMP="$HOME/temp"