diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2020-09-05 15:48:12 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-09-05 15:48:12 -0700 |
commit | f02238f53c8e7a879e48c244ed4552c18002bc5b (patch) | |
tree | f8f7710b8f51a3c40027ae05625669215db91e8d /bin | |
parent | 37f4dc20d7dfdecfe618477806bee241bf9ecc55 (diff) | |
download | dotfiles-f02238f53c8e7a879e48c244ed4552c18002bc5b.tar.gz |
integrate with xfce more fully
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/i3-startup-once | 36 | ||||
-rwxr-xr-x | bin/xflock4 | 5 |
2 files changed, 15 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 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 |