Merge remote-tracking branch 'crybaby'

* crybaby:
  dot/bashrc: Fix `rootly' to make a shell on demand.
  dot/emacs: Use `sudo' for local editing.
  Gnome hacking: Introduce a custom session file.

diff --git a/dot/bashrc b/dot/bashrc
index c39392ababdea585117cc3e78637141aca732b1a..69af4a1d07af68a5d928cf69c577e3b2fd01706f 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -98,7 +98,10 @@ alias cx='chmod a+x'
 alias which="command -v"
 alias rc="rc -l"
 alias ssync="rsync -e ssh"
-alias rootly=$__MDW_ROOTLY
+rootly () {
+  case $# in 0) set -- "${SHELL-/bin/sh}" ;; esac
+  $__MDW_ROOTLY "$@"
+}
 alias r=rootly
 alias re="rootly $EDITOR"
 alias pstree="pstree -hl"

diff --git a/dot/emacs b/dot/emacs
index b278d9a613040a45f1e5ffbd20a3e5ea89333785..8832f3f71b41d3e9d95e8ea57c217dd1f3aa8397 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -602,8 +602,9 @@
      (setq tramp-default-method "ssh")
      (setq tramp-default-method-alist
           `(("\\`\\(localhost\\|\\)\\'" ""
-             ,(cond ((executable-find "become") "become")
-                    ((executable-find "really") "really")
+             ,(cond ((executable-find "really") "really")
+                    ((executable-find "become") "become")
+                    ((executable-find "sudo") "sudo")
                     (t "su")))))))
 
 ;;;--------------------------------------------------------------------------

diff --git a/dot/mdw.session b/dot/mdw.session
new file mode 100644 (file)
index 0000000..f301215
--- /dev/null
+++ b/dot/mdw.session
@@ -0,0 +1,5 @@
+[GNOME Session]
+Name=[mdw]'s not crap session
+Required=panel;
+Required-panel=gnome-panel
+DefaultApps=gnome-settings-daemon;

diff --git a/dot/xinitrc b/dot/xinitrc
index 4f691872271d341b378834deb0e0952f53298c0b..8fce589db011b56d1213649c07b13c3b44b79d24 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -151,8 +151,18 @@ start-window-manager () {
 start-clients-local () { :; }
 
 start-clients () {
+
   ## Gnome session.
-  case $vnc in no) run bginit gnome-session ;; esac
+  case "$vnc,$(gnome-session --version 2>&1)" in
+    no,gnome-session\ 2.3[2-9].* | \
+    no,gnome-session\ 2.4[0-9].* | \
+    no,gnome-session\ 2.[1-9][0-9][0-9]*)
+      run bginit gnome-session --session mdw
+      ;;
+    no,*)
+      run bginit gnome-session
+      ;;
+  esac
 
   ## Local clients.
   start-clients-local

diff --git a/setup b/setup
index 6e1cfed8f38f76c82c28d6cb35bfcc670e2abbca..307e3d001055584d6907f1e3493d62b95a4d8229 100755 (executable)
--- a/setup
+++ b/setup
@@ -151,6 +151,7 @@ dotfiles="
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
+  mdw.session:.config/gnome-session/sessions/mdw.session
   eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
   e-keybindings.cfg:.enlightenment/keybindings.cfg
   evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg