7 files changed, 2 insertions, 77 deletions
diff --git a/system/etc/X11/xorg.conf.d/20-intel.conf b/system/etc/X11/xorg.conf.d/20-intel.conf
deleted file mode 100644
index c448076..0000000
--- a/system/etc/X11/xorg.conf.d/20-intel.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
-   Identifier  "Intel Graphics"
-   Driver      "intel"
-   Option      "DRI"    "3"
-EndSection
diff --git a/system/etc/X11/xorg.conf.d/30-composite.conf b/system/etc/X11/xorg.conf.d/30-composite.conf
deleted file mode 100644
index d5912cd..0000000
--- a/system/etc/X11/xorg.conf.d/30-composite.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-Section "Extensions"
-	Option "Composite" "Enable"
-EndSection
diff --git a/system/etc/X11/xorg.conf.d/50-joystick.conf b/system/etc/X11/xorg.conf.d/50-joystick.conf
deleted file mode 100644
index 1765eb8..0000000
--- a/system/etc/X11/xorg.conf.d/50-joystick.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Section "InputClass"
-        Identifier "joystick catchall"
-        MatchIsJoystick "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "joystick"
-        Option "StartKeysEnabled" "False"       #Disable mouse
-        Option "StartMouseEnabled" "False"      #support
-EndSection
diff --git a/system/etc/X11/xorg.conf.d/50-synaptics.conf b/system/etc/X11/xorg.conf.d/50-synaptics.conf
deleted file mode 100644
index 13f4571..0000000
--- a/system/etc/X11/xorg.conf.d/50-synaptics.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Example xorg.conf.d snippet that assigns the touchpad driver
-# to all touchpads. See xorg.conf.d(5) for more information on
-# InputClass.
-# Additional options may be added in the form of
-#   Option "OptionName" "value"
-#
-Section "InputClass"
-	Identifier "touchpad catchall"
-	Driver "synaptics"
-	MatchIsTouchpad "on"
-	Option "TapButton1" "1"
-	Option "TapButton2" "3"
-	Option "TapButton3" "2"
-	Option "VertTwoFingerScroll" "on"
-	Option "HorizTwoFingerScroll" "on"
-	Option "synclient AccelFactor" "0.1"
-# This option is recommend on all Linux systems using evdev, but cannot be
-# enabled by default. See the following link for details:
-# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
-	MatchDevicePath "/dev/input/event*"
-EndSection
-
-Section "InputClass"
-	Identifier "touchpad ignore duplicates"
-	MatchIsTouchpad "on"
-	MatchOS "Linux"
-	MatchDevicePath "/dev/input/mouse*"
-	Option "Ignore" "on"
-EndSection
-
-# This option enables the bottom right corner to be a right button on clickpads
-# and the right and middle top areas to be right / middle buttons on clickpads
-# with a top button area.
-# This option is only interpreted by clickpads.
-Section "InputClass"
-	Identifier "Default clickpad buttons"
-	MatchDriver "synaptics"
-	Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
-	Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%"
-EndSection
diff --git a/system/etc/X11/xorg.conf.d/90-custom-kbd.conf b/system/etc/X11/xorg.conf.d/90-custom-kbd.conf
deleted file mode 100644
index 72f1dba..0000000
--- a/system/etc/X11/xorg.conf.d/90-custom-kbd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-    Identifier "keyboard defaults"
-    MatchIsKeyboard "on"
-
-    Option "XKbOptions" "caps:escape"
-EndSection
diff --git a/system/etc/init.d/killi3 b/system/etc/init.d/killi3
deleted file mode 100755
index 1fa83aa..0000000
--- a/system/etc/init.d/killi3
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before killprocs
-}
-
-start() {
-	for socket in `find /run/user/*/i3 -name ipc-socket*`; do
-		i3-msg -s $socket exit
-	done
-}
diff --git a/system/etc/pm/sleep.d/10lock b/system/etc/pm/sleep.d/10lock
index da7c018..4f67652 100755
--- a/system/etc/pm/sleep.d/10lock
+++ b/system/etc/pm/sleep.d/10lock
@@ -4,8 +4,8 @@
 
 case "$1" in
 	hibernate|suspend)
-		for socket in `find /run/user/*/i3 -name ipc-socket*`; do
-			i3-msg -s $socket "exec i3lock -d -c 000000"
+		for socket in `find /tmp/i3-* -name ipc-socket*`; do
+			i3-msg -s $socket "exec i3lock -c 000000"
 		done
 	;;
 	*) exit $NA