summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-03-29 11:47:10 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-03-30 11:41:58 -0700
commit02f29bd32b28fcc5636d9030f70013320cdf63b3 (patch)
tree561a8abb977b662222db4937b6f99d25884608e5
parentaddb330167ce1c35f911c6030e0467646fd23e49 (diff)
downloaddotfiles-02f29bd32b28fcc5636d9030f70013320cdf63b3.tar.gz
attempt to archive xfce+i3 setup
Now back using i3's own lightdm session on X11 workstations. See also 955c3c09d78cdef2be60a68268759aa21e85f3c9.
-rw-r--r--.config/i3/config26
-rw-r--r--archive/.config/autostart.old/autostart/gnome-keyring-gpg.desktop (renamed from archive/.config/autostart/autostart/gnome-keyring-gpg.desktop)0
-rw-r--r--archive/.config/autostart.old/autostart/gnome-keyring-pkcs11.desktop (renamed from archive/.config/autostart/autostart/gnome-keyring-pkcs11.desktop)0
-rw-r--r--archive/.config/autostart.old/autostart/gnome-keyring-secrets.desktop (renamed from archive/.config/autostart/autostart/gnome-keyring-secrets.desktop)0
-rw-r--r--archive/.config/autostart.old/autostart/gnome-keyring-ssh.desktop (renamed from archive/.config/autostart/autostart/gnome-keyring-ssh.desktop)0
-rw-r--r--archive/.config/autostart.old/autostart/light-locker.desktop (renamed from .config/autostart/light-locker.desktop)0
-rw-r--r--archive/.config/autostart.old/autostart/redshift-gtk.desktop (renamed from archive/.config/autostart/autostart/redshift-gtk.desktop)0
-rw-r--r--archive/.config/autostart.old/xstartup.desktop (renamed from archive/.config/autostart/xstartup.desktop)0
-rw-r--r--archive/.config/autostart.xfce+i3/Caffeine indicator.desktop (renamed from .config/autostart/Caffeine indicator.desktop)0
-rw-r--r--archive/.config/autostart.xfce+i3/Evolution.desktop (renamed from .config/autostart/Evolution.desktop)0
-rw-r--r--archive/.config/autostart.xfce+i3/Workrave.desktop (renamed from .config/autostart/Workrave.desktop)0
-rw-r--r--archive/.config/autostart.xfce+i3/light-locker.desktop (renamed from archive/.config/autostart/autostart/light-locker.desktop)0
-rw-r--r--archive/.config/autostart.xfce+i3/redshift-gtk.desktop (renamed from .config/autostart/redshift-gtk.desktop)0
-rw-r--r--archive/.config/autostart.xfce+i3/xscreensaver.desktop (renamed from .config/autostart/xscreensaver.desktop)0
-rw-r--r--archive/.config/systemd/user/i3-rotate-wallpaper.service (renamed from .config/systemd/user/i3-rotate-wallpaper.service)0
-rw-r--r--archive/.config/systemd/user/i3-rotate-wallpaper.timer (renamed from .config/systemd/user/i3-rotate-wallpaper.timer)0
-rw-r--r--archive/.config/xfce4/helpers.rc (renamed from .config/xfce4/helpers.rc)0
-rw-r--r--archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xfce+i3.xml (renamed from .config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml)0
-rw-r--r--archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xfce.xml (renamed from archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml)0
-rwxr-xr-xarchive/bin/i3-quit (renamed from bin/i3-quit)0
-rwxr-xr-xarchive/bin/i3-rotate-wallpaper (renamed from bin/i3-rotate-wallpaper)0
-rwxr-xr-xarchive/bin/i3-startup-i3lock (renamed from bin/i3-startup-i3lock)0
-rwxr-xr-xarchive/bin/i3-startup-i3lock-inner (renamed from bin/i3-startup-i3lock-inner)0
-rwxr-xr-xarchive/bin/i3-startup-once (renamed from bin/i3-startup-once)0
-rwxr-xr-xarchive/bin/i3-startup-xtrlock (renamed from bin/i3-startup-xtrlock)0
-rwxr-xr-xarchive/bin/i3-startup-xtrlock-inner-lock (renamed from bin/i3-startup-xtrlock-inner-lock)0
-rwxr-xr-xarchive/bin/xflock4 (renamed from bin/xflock4)0
-rwxr-xr-xarchive/bin/xmouse-away-from-edge (renamed from bin/xmouse-away-from-edge)0
28 files changed, 18 insertions, 8 deletions
diff --git a/.config/i3/config b/.config/i3/config
index 3034f859..ec01697d 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -215,7 +215,9 @@ mode "C-i-" {
# used to upgrade i3)
bindsym Ctrl+Shift+r restart, mode "default"
# exit i3 (logs you out of your X session)
- bindsym Ctrl+Shift+e exec i3-quit, mode "default"
+ bindsym Ctrl+Shift+e exec "i3-nagbar -t warning \
+ -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' \
+ -b 'Yes, exit i3' 'i3-msg exit'", mode "default"
bindsym g mode "C-i g-"
@@ -312,8 +314,8 @@ mode "C-i g-" {
bindsym g exec thunar , mode "default"
# launch xrandr graphical config
- # bindsym x exec arandr , mode "default"
- bindsym x exec xfce4-display-settings , mode "default"
+ bindsym x exec arandr , mode "default"
+ # bindsym x exec xfce4-display-settings , mode "default"
# # get a new VT from lightdm
# bindsym g exec dm-tool switch-to-greeter , mode "default"
@@ -336,13 +338,21 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10%
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
-# idempotent settings script
-exec_always --no-startup-id ~/src/dotfiles/bin/i3-startup-always
+exec --no-startup-id update-emacs-daemon-environment
+exec --no-startup-id xss-lock --transfer-sleep-lock -- \
+ i3lock --nofork --ignore-empty-password --color=FFFFF6
+
+exec --no-startup-id nm-applet
+exec --no-startup-id caffeine-indicator
-# do-it-once settings and startup script
-exec --no-startup-id ~/src/dotfiles/bin/i3-startup-once
+# relies on existence of ~/.config/redshift.conf with latitude and longitude
+exec --no-startup-id redshift-gtk
-exec --no-startup-id ~/src/dotfiles/bin/i3-startup-i3lock
+# for brightness control
+exec --no-startup-id xfce4-power-manager
+
+# idempotent settings and tweaks script
+exec_always --no-startup-id ~/src/dotfiles/bin/i3-startup-always
popup_during_fullscreen leave_fullscreen
diff --git a/archive/.config/autostart/autostart/gnome-keyring-gpg.desktop b/archive/.config/autostart.old/autostart/gnome-keyring-gpg.desktop
index 3f90ac7a..3f90ac7a 100644
--- a/archive/.config/autostart/autostart/gnome-keyring-gpg.desktop
+++ b/archive/.config/autostart.old/autostart/gnome-keyring-gpg.desktop
diff --git a/archive/.config/autostart/autostart/gnome-keyring-pkcs11.desktop b/archive/.config/autostart.old/autostart/gnome-keyring-pkcs11.desktop
index 3f90ac7a..3f90ac7a 100644
--- a/archive/.config/autostart/autostart/gnome-keyring-pkcs11.desktop
+++ b/archive/.config/autostart.old/autostart/gnome-keyring-pkcs11.desktop
diff --git a/archive/.config/autostart/autostart/gnome-keyring-secrets.desktop b/archive/.config/autostart.old/autostart/gnome-keyring-secrets.desktop
index 3f90ac7a..3f90ac7a 100644
--- a/archive/.config/autostart/autostart/gnome-keyring-secrets.desktop
+++ b/archive/.config/autostart.old/autostart/gnome-keyring-secrets.desktop
diff --git a/archive/.config/autostart/autostart/gnome-keyring-ssh.desktop b/archive/.config/autostart.old/autostart/gnome-keyring-ssh.desktop
index 3f90ac7a..3f90ac7a 100644
--- a/archive/.config/autostart/autostart/gnome-keyring-ssh.desktop
+++ b/archive/.config/autostart.old/autostart/gnome-keyring-ssh.desktop
diff --git a/.config/autostart/light-locker.desktop b/archive/.config/autostart.old/autostart/light-locker.desktop
index 56730672..56730672 100644
--- a/.config/autostart/light-locker.desktop
+++ b/archive/.config/autostart.old/autostart/light-locker.desktop
diff --git a/archive/.config/autostart/autostart/redshift-gtk.desktop b/archive/.config/autostart.old/autostart/redshift-gtk.desktop
index 59ceb28c..59ceb28c 100644
--- a/archive/.config/autostart/autostart/redshift-gtk.desktop
+++ b/archive/.config/autostart.old/autostart/redshift-gtk.desktop
diff --git a/archive/.config/autostart/xstartup.desktop b/archive/.config/autostart.old/xstartup.desktop
index 3038df87..3038df87 100644
--- a/archive/.config/autostart/xstartup.desktop
+++ b/archive/.config/autostart.old/xstartup.desktop
diff --git a/.config/autostart/Caffeine indicator.desktop b/archive/.config/autostart.xfce+i3/Caffeine indicator.desktop
index d1f25bdd..d1f25bdd 100644
--- a/.config/autostart/Caffeine indicator.desktop
+++ b/archive/.config/autostart.xfce+i3/Caffeine indicator.desktop
diff --git a/.config/autostart/Evolution.desktop b/archive/.config/autostart.xfce+i3/Evolution.desktop
index 355c4709..355c4709 100644
--- a/.config/autostart/Evolution.desktop
+++ b/archive/.config/autostart.xfce+i3/Evolution.desktop
diff --git a/.config/autostart/Workrave.desktop b/archive/.config/autostart.xfce+i3/Workrave.desktop
index 17a92002..17a92002 100644
--- a/.config/autostart/Workrave.desktop
+++ b/archive/.config/autostart.xfce+i3/Workrave.desktop
diff --git a/archive/.config/autostart/autostart/light-locker.desktop b/archive/.config/autostart.xfce+i3/light-locker.desktop
index 56730672..56730672 100644
--- a/archive/.config/autostart/autostart/light-locker.desktop
+++ b/archive/.config/autostart.xfce+i3/light-locker.desktop
diff --git a/.config/autostart/redshift-gtk.desktop b/archive/.config/autostart.xfce+i3/redshift-gtk.desktop
index aab22349..aab22349 100644
--- a/.config/autostart/redshift-gtk.desktop
+++ b/archive/.config/autostart.xfce+i3/redshift-gtk.desktop
diff --git a/.config/autostart/xscreensaver.desktop b/archive/.config/autostart.xfce+i3/xscreensaver.desktop
index 56730672..56730672 100644
--- a/.config/autostart/xscreensaver.desktop
+++ b/archive/.config/autostart.xfce+i3/xscreensaver.desktop
diff --git a/.config/systemd/user/i3-rotate-wallpaper.service b/archive/.config/systemd/user/i3-rotate-wallpaper.service
index 2d805782..2d805782 100644
--- a/.config/systemd/user/i3-rotate-wallpaper.service
+++ b/archive/.config/systemd/user/i3-rotate-wallpaper.service
diff --git a/.config/systemd/user/i3-rotate-wallpaper.timer b/archive/.config/systemd/user/i3-rotate-wallpaper.timer
index 55c0f820..55c0f820 100644
--- a/.config/systemd/user/i3-rotate-wallpaper.timer
+++ b/archive/.config/systemd/user/i3-rotate-wallpaper.timer
diff --git a/.config/xfce4/helpers.rc b/archive/.config/xfce4/helpers.rc
index d5b3d574..d5b3d574 100644
--- a/.config/xfce4/helpers.rc
+++ b/archive/.config/xfce4/helpers.rc
diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xfce+i3.xml
index 4821f30c..4821f30c 100644
--- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xfce+i3.xml
diff --git a/archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xfce.xml
index bee460f3..bee460f3 100644
--- a/archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/archive/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xfce.xml
diff --git a/bin/i3-quit b/archive/bin/i3-quit
index b9bd09f9..b9bd09f9 100755
--- a/bin/i3-quit
+++ b/archive/bin/i3-quit
diff --git a/bin/i3-rotate-wallpaper b/archive/bin/i3-rotate-wallpaper
index b31bf91f..b31bf91f 100755
--- a/bin/i3-rotate-wallpaper
+++ b/archive/bin/i3-rotate-wallpaper
diff --git a/bin/i3-startup-i3lock b/archive/bin/i3-startup-i3lock
index 000861ea..000861ea 100755
--- a/bin/i3-startup-i3lock
+++ b/archive/bin/i3-startup-i3lock
diff --git a/bin/i3-startup-i3lock-inner b/archive/bin/i3-startup-i3lock-inner
index 02c59c90..02c59c90 100755
--- a/bin/i3-startup-i3lock-inner
+++ b/archive/bin/i3-startup-i3lock-inner
diff --git a/bin/i3-startup-once b/archive/bin/i3-startup-once
index ce0a3075..ce0a3075 100755
--- a/bin/i3-startup-once
+++ b/archive/bin/i3-startup-once
diff --git a/bin/i3-startup-xtrlock b/archive/bin/i3-startup-xtrlock
index 2bf6daff..2bf6daff 100755
--- a/bin/i3-startup-xtrlock
+++ b/archive/bin/i3-startup-xtrlock
diff --git a/bin/i3-startup-xtrlock-inner-lock b/archive/bin/i3-startup-xtrlock-inner-lock
index 3721d4c0..3721d4c0 100755
--- a/bin/i3-startup-xtrlock-inner-lock
+++ b/archive/bin/i3-startup-xtrlock-inner-lock
diff --git a/bin/xflock4 b/archive/bin/xflock4
index 9bfad4c5..9bfad4c5 100755
--- a/bin/xflock4
+++ b/archive/bin/xflock4
diff --git a/bin/xmouse-away-from-edge b/archive/bin/xmouse-away-from-edge
index 8ddf8aaa..8ddf8aaa 100755
--- a/bin/xmouse-away-from-edge
+++ b/archive/bin/xmouse-away-from-edge