From f6b0e630428978c69e11b1167d19f5a8bfc047f2 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date: Sat, 18 Apr 2015 13:50:14 +0200
Subject: [PATCH] xinitrc - replace with systemd stuffs

---
 .../user/default.target.wants/dunst.service   |  1 +
 .../user/default.target.wants/feh.service     |  1 +
 .../default.target.wants/redshift.service     |  1 +
 .../default.target.wants/xautolock.service    |  1 +
 .../user/default.target.wants/xcape.service   |  1 +
 .../user/default.target.wants/xset.service    |  1 +
 config/systemd/user/dunst.service             | 10 +++++
 config/systemd/user/feh.service               | 11 +++++
 config/systemd/user/redshift.service          | 10 +++++
 config/systemd/user/xautolock.service         | 10 +++++
 config/systemd/user/xcape.service             | 10 +++++
 config/systemd/user/xset.service              | 10 +++++
 xinitrc                                       | 45 -------------------
 13 files changed, 67 insertions(+), 45 deletions(-)
 create mode 120000 config/systemd/user/default.target.wants/dunst.service
 create mode 120000 config/systemd/user/default.target.wants/feh.service
 create mode 120000 config/systemd/user/default.target.wants/redshift.service
 create mode 120000 config/systemd/user/default.target.wants/xautolock.service
 create mode 120000 config/systemd/user/default.target.wants/xcape.service
 create mode 120000 config/systemd/user/default.target.wants/xset.service
 create mode 100644 config/systemd/user/dunst.service
 create mode 100644 config/systemd/user/feh.service
 create mode 100644 config/systemd/user/redshift.service
 create mode 100644 config/systemd/user/xautolock.service
 create mode 100644 config/systemd/user/xcape.service
 create mode 100644 config/systemd/user/xset.service
 delete mode 100644 xinitrc

diff --git a/config/systemd/user/default.target.wants/dunst.service b/config/systemd/user/default.target.wants/dunst.service
new file mode 120000
index 0000000..f7541d4
--- /dev/null
+++ b/config/systemd/user/default.target.wants/dunst.service
@@ -0,0 +1 @@
+/home/felix/dotfiles/config/systemd/user/dunst.service
\ No newline at end of file
diff --git a/config/systemd/user/default.target.wants/feh.service b/config/systemd/user/default.target.wants/feh.service
new file mode 120000
index 0000000..c60c3f1
--- /dev/null
+++ b/config/systemd/user/default.target.wants/feh.service
@@ -0,0 +1 @@
+/home/felix/dotfiles/config/systemd/user/feh.service
\ No newline at end of file
diff --git a/config/systemd/user/default.target.wants/redshift.service b/config/systemd/user/default.target.wants/redshift.service
new file mode 120000
index 0000000..bdba747
--- /dev/null
+++ b/config/systemd/user/default.target.wants/redshift.service
@@ -0,0 +1 @@
+/home/felix/dotfiles/config/systemd/user/redshift.service
\ No newline at end of file
diff --git a/config/systemd/user/default.target.wants/xautolock.service b/config/systemd/user/default.target.wants/xautolock.service
new file mode 120000
index 0000000..8629e49
--- /dev/null
+++ b/config/systemd/user/default.target.wants/xautolock.service
@@ -0,0 +1 @@
+/home/felix/dotfiles/config/systemd/user/xautolock.service
\ No newline at end of file
diff --git a/config/systemd/user/default.target.wants/xcape.service b/config/systemd/user/default.target.wants/xcape.service
new file mode 120000
index 0000000..f1688ff
--- /dev/null
+++ b/config/systemd/user/default.target.wants/xcape.service
@@ -0,0 +1 @@
+/home/felix/dotfiles/config/systemd/user/xcape.service
\ No newline at end of file
diff --git a/config/systemd/user/default.target.wants/xset.service b/config/systemd/user/default.target.wants/xset.service
new file mode 120000
index 0000000..b79a0c9
--- /dev/null
+++ b/config/systemd/user/default.target.wants/xset.service
@@ -0,0 +1 @@
+/home/felix/dotfiles/config/systemd/user/xset.service
\ No newline at end of file
diff --git a/config/systemd/user/dunst.service b/config/systemd/user/dunst.service
new file mode 100644
index 0000000..7a8bdea
--- /dev/null
+++ b/config/systemd/user/dunst.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Dunst Notification Daemon
+After=display-manager.service
+Wants=display-manager.service
+
+[Service]
+ExecStart=/usr/bin/dunst
+
+[Install]
+WantedBy=default.target
diff --git a/config/systemd/user/feh.service b/config/systemd/user/feh.service
new file mode 100644
index 0000000..0ce4191
--- /dev/null
+++ b/config/systemd/user/feh.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Feh Background Image Loader
+After=display-manager.service
+Wants=display-manager.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/feh --bg-scale '/home/felix/Pictures/lain.png'
+
+[Install]
+WantedBy=default.target
diff --git a/config/systemd/user/redshift.service b/config/systemd/user/redshift.service
new file mode 100644
index 0000000..89ebb10
--- /dev/null
+++ b/config/systemd/user/redshift.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Redshift
+After=display-manager.service
+Wants=display-manager.service
+
+[Service]
+ExecStart=/usr/bin/redshift
+
+[Install]
+WantedBy=default.target
diff --git a/config/systemd/user/xautolock.service b/config/systemd/user/xautolock.service
new file mode 100644
index 0000000..1111877
--- /dev/null
+++ b/config/systemd/user/xautolock.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=X Autolocker
+After=display-manager.service
+Wants=display-manager.service
+
+[Service]
+ExecStart=/usr/bin/xautolock -time 1 -locker xsecurelock
+
+[Install]
+WantedBy=default.target
diff --git a/config/systemd/user/xcape.service b/config/systemd/user/xcape.service
new file mode 100644
index 0000000..390b568
--- /dev/null
+++ b/config/systemd/user/xcape.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=XCape Modifier Key Modifier
+After=display-manager.service
+Wants=display-manager.service
+
+[Service]
+ExecStart=/usr/bin/xcape -d -t 100 -e 'Super_L=Scroll_Lock;Shift_L=Escape'
+
+[Install]
+WantedBy=default.target
diff --git a/config/systemd/user/xset.service b/config/systemd/user/xset.service
new file mode 100644
index 0000000..0f33410
--- /dev/null
+++ b/config/systemd/user/xset.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Set screen timeout properties
+After=display-manager.service
+Wants=display-manager.service
+
+[Service]
+ExecStart=/usr/bin/xset dpms 0 0 50 s off
+
+[Install]
+WantedBy=default.target
diff --git a/xinitrc b/xinitrc
deleted file mode 100644
index b414025..0000000
--- a/xinitrc
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-# For now, start stuff here
-redshift &
-dunst &
-xcape -t 100 -e 'Super_L=Scroll_Lock;Shift_L=Escape'
-feh  --bg-scale '/home/felix/Pictures/lain.png' &
-# screen locking
-xset dpms 0 0 50 &
-xset s off &
-xautolock -time 1 -locker xsecurelock &
-
-# Start herbstluftwm in locked mode. Is unlocked after autostart.
-exec xmonad