attempt to archive xfce+i3 setup

Now back using i3's own lightdm session on X11 workstations.

See also 955c3c09d78cdef2be60a68268759aa21e85f3c9.

11 files changed, 18 insertions, 128 deletions

diff --git a/.config/autostart/Caffeine indicator.desktop b/.config/autostart/Caffeine indicator.desktop
deleted file mode 100644
index d1f25bdd..00000000
--- a/.config/autostart/Caffeine indicator.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100644
index 355c4709..00000000
--- a/.config/autostart/Evolution.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100644
index 17a92002..00000000
--- a/.config/autostart/Workrave.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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/light-locker.desktop b/.config/autostart/light-locker.desktop
deleted file mode 100644
index 56730672..00000000
--- a/.config/autostart/light-locker.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-
diff --git a/.config/autostart/redshift-gtk.desktop b/.config/autostart/redshift-gtk.desktop
deleted file mode 100644
index aab22349..00000000
--- a/.config/autostart/redshift-gtk.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[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
deleted file mode 100644
index 56730672..00000000
--- a/.config/autostart/xscreensaver.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-
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/.config/systemd/user/i3-rotate-wallpaper.service b/.config/systemd/user/i3-rotate-wallpaper.service
deleted file mode 100644
index 2d805782..00000000
--- a/.config/systemd/user/i3-rotate-wallpaper.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Rotate i3 wallpaper
-
-[Service]
-Type=oneshot
-ExecStart=%h/bin/i3-rotate-wallpaper
diff --git a/.config/systemd/user/i3-rotate-wallpaper.timer b/.config/systemd/user/i3-rotate-wallpaper.timer
deleted file mode 100644
index 55c0f820..00000000
--- a/.config/systemd/user/i3-rotate-wallpaper.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run i3-rotate-wallpaper daily
-
-[Timer]
-OnCalendar=daily
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/.config/xfce4/helpers.rc b/.config/xfce4/helpers.rc
deleted file mode 100644
index d5b3d574..00000000
--- a/.config/xfce4/helpers.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-WebBrowser=firefox
-MailReader=mutt
-TerminalEmulator=xfce4-terminal
diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
deleted file mode 100644
index 4821f30c..00000000
--- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
-  <property name="splash" type="empty">
-    <property name="Engine" type="string" value=""/>
-    <property name="engines" type="empty">
-      <property name="simple" type="empty">
-        <property name="Font" type="empty"/>
-        <property name="BgColor" type="empty"/>
-        <property name="FgColor" type="empty"/>
-        <property name="Image" type="empty"/>
-      </property>
-    </property>
-  </property>
-  <property name="general" type="empty">
-    <property name="FailsafeSessionName" type="empty"/>
-    <property name="SessionName" type="string" value="Default"/>
-    <property name="SaveOnExit" type="bool" value="false"/>
-  </property>
-  <property name="sessions" type="empty">
-    <property name="Failsafe" type="empty">
-      <property name="IsFailsafe" type="empty"/>
-      <property name="Count" type="empty"/>
-      <property name="Client0_Command" type="array">
-        <value type="string" value="xfsettingsd"/>
-      </property>
-      <property name="Client0_PerScreen" type="empty"/>
-      <property name="Client1_Command" type="array">
-        <value type="string" value="i3"/>
-      </property>
-      <property name="Client1_PerScreen" type="empty"/>
-      <property name="Client2_Command" type="array">
-        <value type="string" value="true"/>
-      </property>
-      <property name="Client2_PerScreen" type="empty"/>
-      <property name="Client3_Command" type="empty"/>
-      <property name="Client3_PerScreen" type="empty"/>
-      <property name="Client4_Command" type="array">
-        <value type="string" value="true"/>
-      </property>
-      <property name="Client4_PerScreen" type="empty"/>
-    </property>
-  </property>
-  <property name="compat" type="empty">
-    <property name="LaunchGNOME" type="bool" value="true"/>
-  </property>
-</channel>