X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b94830d9593ca8c243fef1bc0b29eb751f935cde..e8aee51b053d23b195f361a738f67c1ec4b1417f:/setup

diff --git a/setup b/setup
index e0cf105..b9f72b9 100755
--- a/setup
+++ b/setup
@@ -10,7 +10,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://ftp.distorted.org.uk/pub/mdw/profile}
+: ${REPO=https://ftp.distorted.org.uk/pub/mdw/profile}
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
 
@@ -134,6 +134,8 @@ dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el ercrc.el
   vimrc mg zile lesskey
+  parallel-config:.parallel/config
+  ipython_config.py:.ipython/profile_default/ipython_config.py
   ditz-config
   mailrc signature muttrc
   cgrc tigrc
@@ -152,7 +154,7 @@ dotfiles="
   swank.lisp
   mdw-build.conf:.config/mdw-build.conf
   w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
-  dircolors colordiffrc screenrc cvsrc indent.pro"
+  dircolors colordiffrc screenrc tmux.conf cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
   xinitrc xsession xmodmap vncrc vncsession
   fonts.conf
@@ -162,7 +164,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
@@ -183,6 +188,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
@@ -191,7 +198,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
@@ -225,17 +232,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
@@ -306,7 +303,7 @@ echo "	all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs23 emacs21 emacs; do
+for i in emacs23 emacs24 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break