integrate with xfce more fully

11 files changed, 85 insertions, 29 deletions

diff --git a/.config/autostart/Caffeine indicator.desktop b/.config/autostart/Caffeine indicator.desktop
new file mode 100644
index 00000000..d1f25bdd
--- /dev/null
+++ b/.config/autostart/Caffeine indicator.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Caffeine indicator
+Comment=
+Exec=caffeine-indicator
+OnlyShowIn=XFCE;
+StartupNotify=false
+Terminal=false
+Hidden=false
+
diff --git a/.config/autostart/Evolution.desktop b/.config/autostart/Evolution.desktop
new file mode 100644
index 00000000..355c4709
--- /dev/null
+++ b/.config/autostart/Evolution.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Evolution
+Comment=
+Exec=evolution
+OnlyShowIn=XFCE;
+StartupNotify=false
+Terminal=false
+Hidden=false
+
diff --git a/.config/autostart/Workrave.desktop b/.config/autostart/Workrave.desktop
new file mode 100644
index 00000000..17a92002
--- /dev/null
+++ b/.config/autostart/Workrave.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Workrave
+Comment=
+Exec=workrave
+OnlyShowIn=XFCE;
+StartupNotify=false
+Terminal=false
+Hidden=false
+
diff --git a/.config/autostart/gnome-keyring-ssh.desktop b/.config/autostart/gnome-keyring-ssh.desktop
new file mode 100644
index 00000000..b61a84bb
--- /dev/null
+++ b/.config/autostart/gnome-keyring-ssh.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
+OnlyShowIn=GNOME;Unity;MATE;
+X-GNOME-Autostart-Phase=PreDisplayServer
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.28.2
+Hidden=true
+X-GNOME-Autostart-enabled=false
diff --git a/.config/autostart/light-locker.desktop b/.config/autostart/light-locker.desktop
new file mode 100644
index 00000000..56730672
--- /dev/null
+++ b/.config/autostart/light-locker.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
diff --git a/.config/autostart/redshift-gtk.desktop b/.config/autostart/redshift-gtk.desktop
new file mode 100644
index 00000000..aab22349
--- /dev/null
+++ b/.config/autostart/redshift-gtk.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Redshift
+GenericName=Color temperature adjustment
+Comment=Color temperature adjustment tool
+Exec=redshift-gtk
+Icon=redshift
+Terminal=false
+Type=Application
+Categories=Utility;
+StartupNotify=true
+Hidden=false
+X-GNOME-Autostart-enabled=false
diff --git a/.config/autostart/xscreensaver.desktop b/.config/autostart/xscreensaver.desktop
new file mode 100644
index 00000000..56730672
--- /dev/null
+++ b/.config/autostart/xscreensaver.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
diff --git a/.config/i3/config b/.config/i3/config
index 76f936ef..1f6aa3db 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -484,6 +484,8 @@ exec_always --no-startup-id ~/src/dotfiles/bin/i3-startup-always
 # do-it-once settings and startup script
 exec --no-startup-id ~/src/dotfiles/bin/i3-startup-once
 
+exec --no-startup-id ~/src/dotfiles/bin/i3-startup-i3lock
+
 popup_during_fullscreen leave_fullscreen
 
 # windows that should always float
diff --git a/.dmrc b/.dmrc
deleted file mode 100644
index f3528db7..00000000
--- a/.dmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop]
-Language=en_GB.utf8
-Session=xfce
diff --git a/bin/i3-startup-once b/bin/i3-startup-once
index 90332ce8..09f1afa1 100755
--- a/bin/i3-startup-once
+++ b/bin/i3-startup-once
@@ -1,17 +1,18 @@
 #!/bin/sh
 
-# TODO if stick with running i3 inside xfce, might want to conditionalise much
-# of the following on DESKTOP_SESSION equalling "i3", and rely on xfce to
-# start things up
+# idea is that on physical hardware running X we use the XFCE desktop session
+# from the display manager, and then rely on ~/.config/autostart to start
+# things up.  then when running a graphical session in a virtual machine, say,
+# we use the i3 desktop session from the display manager, and that stuff (most
+# of which only makes sense on real hardware) doesn't get started up
 
-. $HOME/.shenv
-
-# ---- screen locking
+# so, ~/.dmrc shouldn't be checked into dotfiles repo -- use configuration
+# management to set the default session in lightdm.conf
 
-# don't lock in develacc, because that's just annoying, and the
-# session is protected by main screen locker
+# this script remains for fixups when i3 launches; ideally it will eventually
+# not be needed
 
-in-develacc || i3-startup-i3lock
+. $HOME/.shenv
 
 # ---- xrandr on specific hosts
 
@@ -20,14 +21,6 @@ if [ "$(hostname -f)" = "develacc.iris.silentflame.com" ]; then
     xrandr --output Virtual-1 --mode 1366x768
 fi
 
-# ---- GTK
-
-gnome-settings-daemon &
-
-# ---- brightness keys
-
-xfce4-power-manager &
-
 # ---- input methods
 
 if ! in-develacc; then
@@ -39,17 +32,8 @@ fi
 # ---- startup applications
 
 if ! in-develacc; then
-    nm-applet &
-
     # the systemd user unit for mpd can fail because it doesn't get
     # XDG_RUNTIME_DIR set, so disable it and start ourselves
     systemctl --user mask mpd ||:
     pgrep -u "$USER" mpd || mpd &
-
-    evolution &
-    caffeine-indicator &
-    workrave &
-    redshift-gtk &              # co-ords from config file
 fi
-
-emacsclient -a "" -nc
diff --git a/bin/xflock4 b/bin/xflock4
new file mode 100755
index 00000000..9bfad4c5
--- /dev/null
+++ b/bin/xflock4
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# override /usr/bin/xflock4 to use i3lock via xss-lock
+
+loginctl lock-session