summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bash_profile2
-rw-r--r--.config/X11/xinitrc35
2 files changed, 1 insertions, 36 deletions
diff --git a/.bash_profile b/.bash_profile
index 86a361b..424f4dd 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -27,5 +27,5 @@ export CM_SELECTIONS=clipboard
export CM_DIR=/tmp
export PF_INFO="ascii title os kernel uptime pkgs memory"
-[[ $(fgconsole 2>/dev/null) == 1 ]] && exec sx "$XDG_CONFIG_HOME/X11/xinitrc"
+[[ $(fgconsole 2>/dev/null) == 1 ]] && exec sx
[[ -f ~/.bashrc ]] && . ~/.bashrc
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
deleted file mode 100644
index 6d2f1f6..0000000
--- a/.config/X11/xinitrc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-userresources=$XDG_CONFIG_HOME/X11/.Xresources
-usermodmap=$XDG_CONFIG_HOME/X11/.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
-
-source $XDG_CONFIG_HOME/i3/init