summaryrefslogtreecommitdiff
path: root/bin/i3-startup-once
diff options
context:
space:
mode:
Diffstat (limited to 'bin/i3-startup-once')
-rwxr-xr-xbin/i3-startup-once36
1 files changed, 10 insertions, 26 deletions
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