Shell: minor fixes. [FIX]

Emacs: Abbrev update.
master
Ambrevar 2012-07-02 20:17:57 +01:00
parent d523af2f3c
commit ae3ca8e2b5
7 changed files with 54 additions and 64 deletions

View File

@ -1,5 +1,4 @@
auto-complete
bashmount
bustle
dropbox
dropbox-cli
@ -8,7 +7,7 @@ gsharkdown
linux-custom
movgrab
msmtp-pwpatched
otf-texgyre
notmuch
package-query
pacman-color
trash-cli

View File

@ -2,13 +2,13 @@ abook
acpi
alsa-utils
atool
auctex
auto-complete
autoconf
automake
awesome
bash
bash-completion
bashmount
binutils
bison
bustle
@ -98,10 +98,10 @@ nasm
ncdu
net-tools
nmap
notmuch
ntfs-3g
numlockx
openssh
otf-texgyre
p7zip
package-query
pacman

View File

@ -11,6 +11,7 @@ atk
atkmm
atool
attr
auctex
autoconf
automake
avahi
@ -111,6 +112,7 @@ glibc
glibmm
glib-networking
glproto
gmime
gmp
gnupg
gnuplot
@ -121,7 +123,6 @@ gpm
grep
groff
grub
gsasl
gsettings-desktop-schemas
gsl
gsm
@ -139,7 +140,6 @@ gtk-update-icon-cache
gzip
hdparm
heirloom-mailx
help2man
hicolor-icon-theme
highlight
hplip
@ -209,7 +209,6 @@ libgl
libglade
libglapi
libgme
libgnome-keyring
libgpg-error
libgssglue
libice
@ -372,9 +371,6 @@ pcmciautils
pcre
perl
perl-error
perl-locale-gettext
perl-test-pod
perl-yaml-syck
pidgin
pinentry
pixman
@ -478,6 +474,7 @@ wireshark-gtk
wpa_supplicant
wxgtk
x264
xapian-core
xbitmaps
xcb-proto
xcb-util
@ -496,7 +493,6 @@ xfsprogs
xineramaproto
xkeyboard-config
xmlrpc-c
xmlto
xorg-bdftopcf
xorg-fonts-alias
xorg-fonts-encodings

26
.bashrc
View File

@ -1,6 +1,6 @@
################################################################################
## Shell Config -- Master File
## Date 2011-11-19
## Date 2012-07-02
################################################################################
##==============================================================================
@ -22,27 +22,15 @@ isShell()
fi
}
safeSource()
{
if [ -f "$1" ]; then
source "$1"
return 0
else
echo "Warning: $1 not found when sourcing!"
return 1
fi
}
##==============================================================================
## Sourcing
##==============================================================================
SHELLDIR="$HOME/.shell.d"
safeSource "${SHELLDIR}/main_rc" # Should be sourced first.
safeSource "${SHELLDIR}/options_bash"
safeSource "${SHELLDIR}/funs_rc"
safeSource "${SHELLDIR}/funs_bash"
safeSource "${SHELLDIR}/alias_rc"
safeSource "${SHELLDIR}/personal_rc"
source "${SHELLDIR}/main_rc" # Should be sourced first.
source "${SHELLDIR}/options_bash"
source "${SHELLDIR}/funs_rc"
source "${SHELLDIR}/funs_bash"
source "${SHELLDIR}/alias_rc"
source "${SHELLDIR}/personal_rc"

2
.emacs
View File

@ -115,7 +115,7 @@
;; Mutt support
(setq auto-mode-alist
(append
'(("mutt.*" . text-mode)
'(("mutt.*" . mail-mode)
)
auto-mode-alist)
)

View File

@ -1,4 +1,4 @@
;;-*-coding: emacs-mule;-*-
;;-*-coding: utf-8;-*-
(define-abbrev-table 'Buffer-menu-mode-abbrev-table '())
(define-abbrev-table 'apropos-mode-abbrev-table '())
@ -21,6 +21,8 @@
(define-abbrev-table 'global-abbrev-table '())
(define-abbrev-table 'help-mode-abbrev-table '())
(define-abbrev-table 'idl-mode-abbrev-table '())
(define-abbrev-table 'java-mode-abbrev-table '())
@ -29,32 +31,46 @@
(define-abbrev-table 'objc-mode-abbrev-table '())
(define-abbrev-table 'occur-edit-mode-abbrev-table '())
(define-abbrev-table 'occur-mode-abbrev-table '())
(define-abbrev-table 'outline-mode-abbrev-table '())
(define-abbrev-table 'pike-mode-abbrev-table '())
(define-abbrev-table 'process-menu-mode-abbrev-table '())
(define-abbrev-table 'prog-mode-abbrev-table '())
(define-abbrev-table 'select-tags-table-mode-abbrev-table '())
(define-abbrev-table 'sh-mode-abbrev-table '())
(define-abbrev-table 'snippet-mode-abbrev-table '())
(define-abbrev-table 'special-mode-abbrev-table '())
(define-abbrev-table 'text-mode-abbrev-table
'(
("Arch" "Arch~Linux" nil 1)
("Arch" "Arch Linux" nil 1)
("ac" "avec" nil 0)
("afaik" "as far as I know" nil 0)
("afaict" "as far as I can tell" nil 0)
("ajd" "aujourd'hui" nil 2)
("arch" "architecture" nil 1)
("autom" "automatique" nil 2)
("atm" "at the moment" nil 1)
("bcp" "beaucoup" nil 2)
("biblio" "biblioth<74>èque" nil 1)
("biblio" "bibliothèque" nil 1)
("btw" "by the way" nil 1)
("chai" "je ne sais" nil 1)
("config" "configuration" nil 1)
("configs" "configurations" nil 1)
("c<EFBFBD>àd" "c'est-<EFBFBD>à-dire" nil 1)
("càd" "c'est-à-dire" nil 1)
("dc" "donc" nil 1)
("dep" "d<EFBFBD>épendance" nil 1)
("deps" "d<EFBFBD>épendances" nil 1)
("dep" "dépendance" nil 1)
("deps" "dépendances" nil 1)
("dico" "Dictionnaire" nil 2)
("dispo" "disponible" nil 1)
("dispos" "disponibles" nil 1)
@ -64,6 +80,7 @@
("exo" "exercice" nil 1)
("ficheir" "fichier" nil 0)
("ficheirs" "fichiers" nil 0)
("fyi" "for your information" nil 0)
("gd" "grand" nil 3)
("infos" "informations" nil 1)
("latex" "LaTeX" nil 10)
@ -73,13 +90,13 @@
("lql" "lequel" nil 2)
("lqls" "lesquels" nil 1)
("mail" "e-mail" nil 1)
("mm" "m<EFBFBD>ême" nil 16)
("mm" "même" nil 16)
("mnt" "maintenant" nil 2)
("ms" "mais" nil 4)
("nb" "nombre" nil 0)
("ns" "nous" nil 1)
("pb" "probl<EFBFBD>ème" nil 4)
("pbs" "probl<EFBFBD>èmes" nil 1)
("pb" "problème" nil 4)
("pbs" "problèmes" nil 1)
("pcq" "parce que" nil 3)
("pgrm" "programme" nil 1)
("pgrms" "programmes" nil 1)
@ -88,7 +105,7 @@
("pq" "pourquoi" nil 2)
("pr" "pour" nil 3)
("ptt" "petit" nil 1)
("p<EFBFBD>ê" "peut-<EFBFBD>être" nil 2)
("pê" "peut-être" nil 2)
("qd" "quand" nil 4)
("qq" "quelque" nil 1)
("qqch" "quelque chose" nil 1)
@ -99,20 +116,22 @@
("ques" "question" nil 1)
("ss" "sous" nil 1)
("ssi" "si et seulement si" nil 1)
("stp" "s'il te pla<EFBFBD>ît" nil 1)
("svp" "s'il vous pla<EFBFBD>ît" nil 1)
("stp" "s'il te plaît" nil 1)
("svp" "s'il vous plaît" nil 1)
("teh" "the" nil 1)
("tex" "TeX" nil 2)
("tps" "temps" nil 4)
("tjrs" "toujours" nil 4)
("tps" "temps" nil 5)
("ts" "tous" nil 1)
("tt" "tout" nil 3)
("tte" "toute" nil 1)
("ttes" "toutes" nil 1)
("ya" "il y a" nil 6)
("yen" "il y en" nil 1)
("<EFBFBD>ê" "<EFBFBD>être" nil 1)
("ê" "être" nil 1)
))
(define-abbrev-table 'vc-git-log-view-mode-abbrev-table '())
(define-abbrev-table 'vc-svn-log-view-mode-abbrev-table '())

26
.zshrc
View File

@ -1,6 +1,6 @@
################################################################################
## Shell Config -- Master File
## Date 2011-11-19
## Date 2012-07-02
################################################################################
##==============================================================================
@ -23,28 +23,16 @@ isShell()
fi
}
safeSource()
{
if [ -f "$1" ]; then
source "$1"
return 0
else
echo "Warning: $1 not found when sourcing!"
return 1
fi
}
##==============================================================================
## Sourcing
##==============================================================================
SHELLDIR="$HOME/.shell.d"
safeSource "${SHELLDIR}/main_rc" # Should be sourced first.
safeSource "${SHELLDIR}/options_zsh"
safeSource "${SHELLDIR}/funs_rc"
safeSource "${SHELLDIR}/alias_rc"
safeSource "${SHELLDIR}/keys_zsh"
safeSource "${SHELLDIR}/personal_rc"
source "${SHELLDIR}/main_rc" # Should be sourced first.
source "${SHELLDIR}/options_zsh"
source "${SHELLDIR}/funs_rc"
source "${SHELLDIR}/alias_rc"
source "${SHELLDIR}/keys_zsh"
source "${SHELLDIR}/personal_rc"