diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
| commit | 8ff950d098146bc929504b062bcc6ccd5a2cb6ed (patch) | |
| tree | e5d73cf1997b28bbaa24a693f5d8c2abb45be313 /.config/symlinks | |
| parent | 9d689e7d224b5c1ea3ab3018998135979f19c5a9 (diff) | |
| parent | b0cdbb3da2c2b36d3c65b00db4eaf5a0d29c2cd6 (diff) | |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.config/bash/rc.sh
.config/login.sh
.config/ssh/config
.config/wmii/include.sh
Diffstat (limited to '.config/symlinks')
| -rw-r--r-- | .config/symlinks | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/.config/symlinks b/.config/symlinks index 3d87984..dfd06d4 100644 --- a/.config/symlinks +++ b/.config/symlinks @@ -1,35 +1,53 @@ +# target link + +# Generic +.config/login.sh .profile + +# X11 .config/X11/defaults .Xdefaults .config/X11/clientrc .xinitrc .config/X11/serverrc .xserverrc .config/X11/login .xsession +# Bash .config/bash/rc.sh .bashrc .config/bash/login.sh .bash_login .config/bash/logout.sh .bash_logout +# Files plucked out of multi-purpose directories +.config/ssh/config .ssh/config +.config/gpg/gpg.conf .gnupg/gpg.conf + +# Individual config files +.config/conkerorrc .conkerorrc +.config/hgrc .hgrc +.config/hgk .hgk +.config/irbrc .irbrc +.config/linphonerc .linphonerc +.config/selected_editor .selected_editor + +.cache/offlineimap .offlineimap +.config/offlineimaprc .offlineimaprc + +# Directories +.cache/maildirproc/ .maildirproc +.config/icons/ .icons .config/arduino/ .arduino .config/bazaar/ .bazaar .config/cpan/ .cpan .config/emacs/ .emacs.d -.config/gimp-2.6/ .gimp-2.6 -.config/gimp-2.8/ .gimp-2.8 -.config/maildirproc/ .maildirproc -.config/mozilla/ .mozilla # +.config/mozilla/ .mozilla # .config/mplayer/ .mplayer .config/nanorc .nanorc -.config/netbeans/ .netbeans .config/purple/ .purple -.config/ssh/ .ssh # .config/subversion/ .subversion -.config/wmii/ .wmii - -.config/conkerorrc .conkerorrc -.config/hgrc .hgrc -.config/linphonerc .linphonerc -.config/offlineimaprc .offlineimaprc +.config/wmii/ .wmii # +.config/wmii-hg/ .wmii-hg +# KDE .config/ .kde/share/apps .config/ .kde/share/config - .kde/ .kde4 + +# Alias for conkeror .mozilla/ .conkeror.mozdev.org |