summaryrefslogtreecommitdiffstats
path: root/Xorg/xinitrc
diff options
context:
space:
mode:
Diffstat (limited to 'Xorg/xinitrc')
-rw-r--r--Xorg/xinitrc37
1 files changed, 13 insertions, 24 deletions
diff --git a/Xorg/xinitrc b/Xorg/xinitrc
index bb056a5..da6c95b 100644
--- a/Xorg/xinitrc
+++ b/Xorg/xinitrc
@@ -13,15 +13,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
if [ -f $sysresources ]; then
-
-
-
-
-
-
-
xrdb -merge $sysresources
-
fi
if [ -f $sysmodmap ]; then
@@ -29,30 +21,24 @@ if [ -f $sysmodmap ]; then
fi
if [ -f "$userresources" ]; then
-
-
-
-
-
-
-
xrdb -merge "$userresources"
-
fi
if [ -f "$usermodmap" ]; then
xmodmap "$usermodmap"
fi
-# start some nice programs
+# Load necessary X11 configuration
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
- [ -x "$f" ] && . "$f"
- done
- unset f
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+ [ -x "$f" ] && . "$f"
+ done
+ unset f
fi
+# start some nice programs
+
#twm &
#xclock -geometry 50x50-1+1 &
#xterm -geometry 80x50+494+51 &
@@ -60,14 +46,17 @@ fi
#exec xterm -geometry 80x66+0+0 -name login
-# My stuff
+# Setup and start Desktop Environment
# ======================================================================
-# fcitx
+# fcitx (CLJ and emoji input method)
export GTK_IM_MODULE=fcitx
export QT_IM_MODULE=fcitx
export XMODIFIERS=@im=fcitx
-# KDE Plasma
+# xbindkeys (keyboard shortcuts)
+xbindkeys
+
+# KDE Plasma (DE)
export DESKTOP_SESSION=plasma
exec startplasma-x11