X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/580ac7ce11353166bdfa83283e6b51f282135dfe..ecde2a36fd2952a2c7943b784f09ed339b4e6ff4:/setup

diff --git a/setup b/setup
index c4eb953..f7a0d9e 100755
--- a/setup
+++ b/setup
@@ -131,11 +131,16 @@ fi
 
 ## Symlink the various dotfiles into place
 dotfiles="
-  bash_profile bash_logout bashrc inputrc bash_completion
+  profile shell-rc shell-logout
+  bash-profile:.bash_profile
+  bash-completion:.bash_completion bashrc inputrc
+  shrc
+  zprofile zshrc zshenv
   emacs emacs-calc vm gnus.el ercrc.el
-  vimrc mg zile lesskey
+  vimrc mg zile lesskey infokey sqliterc
   parallel-config:.parallel/config
-  ipython_config.py:.ipython/profile_default/ipython_config.py
+  ipython-config.py:.ipython/profile_default/ipython_config.py
+  ipython-key-bindings.py:.ipython/profile_default/startup/50-key-bindings.py
   ditz-config
   mailrc signature muttrc
   cgrc tigrc
@@ -164,7 +169,10 @@ dotfiles="
   eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
   e-keybindings.cfg:.enlightenment/keybindings.cfg
   evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg
-  e16-bindings:.e16/bindings.cfg"
+  e16-bindings:.e16/bindings.cfg
+  gtkrc-2.0
+  gtk3.css:.config/gtk-3.0/gtk.css
+  gtk3-settings.ini:.config/gtk-3.0/settings.ini"
 echo "Installing dotfiles..."
 for d in $dotfiles; do
   target=.$d
@@ -185,6 +193,8 @@ cppfiles=""
 [ "$xstuff" ] && cppfiles="$cppfiles
   Xdefaults"
 echo "Hacking files with C preprocessor..."
+defs="-DHOME=$HOME -DPROFILE=$here"
+defs="$defs -DEMACSWD=$(bin/mdw-conf emacs-width 77)"
 for c in $cppfiles; do
   target=.$c
   case $c in
@@ -193,7 +203,7 @@ for c in $cppfiles; do
   ft=$HOME$sub/$target
   dir=${ft%/*}
   mkdir -p $dir
-  cpp -P dot/$c -o $ft.new
+  cpp -P $defs dot/$c -o $ft.new
   mv $ft.new $ft
   echo "  $target"
 done
@@ -227,17 +237,7 @@ done
 echo "  all done."
 
 ## Symlink backgrounds.
-backgrounds="
-  bsg-supper.jpg
-  harley-quinn.jpg
-  hypatia.jpg
-  jue-peek.jpg
-  lilith.jpg
-  lovelace.jpg
-  medusa.jpg
-  noodly.jpg
-  rayne.jpg
-"
+backgrounds=$(cd bg && echo *)
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -271,6 +271,7 @@ scripts="
   run-with-shell-env
   start-ssh-agent
   start-ssh-pageant
+  add-ssh-keys
   svnwrap
   guest-console
   hyperspec"
@@ -308,7 +309,7 @@ echo "	all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs23 emacs24 emacs22 emacs21 emacs; do
+for i in emacs24 emacs23 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break