From 39aa2a66b50f6b7403123fd4cd8a9f5ab22ea70e Mon Sep 17 00:00:00 2001
From: Mitsuo Tokumori <rtokumori@pucp.edu.pe>
Date: Wed, 31 Aug 2022 03:24:06 -0500
Subject: Add Xorg configuration for fcitx

---
 README.adoc  |  6 +++++
 Xorg/xinitrc | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 bashrc       |  4 ----
 3 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 Xorg/xinitrc

diff --git a/README.adoc b/README.adoc
index e69e950..1bd6ab7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -6,6 +6,11 @@ Mitsuo
 My configuration settings and config files for various programs.
 
 
+== TODO
+
+* Create script that compares installed vs repository dotfiles
+
+
 == Usage
 
 To run installation script do 
@@ -32,6 +37,7 @@ Bash:: Vim input, aliases, XDG variables, git prompt
 Git:: https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup[
       Name, email, difftool]
 Ideavimrc:: Some config for Vim plugin for IntelliJ and Pycharm
+Xorg:: Enviroment for Xorg.  Set fcitx env. var., start KDE Plasma
 
 // TODO: finish this list
 
diff --git a/Xorg/xinitrc b/Xorg/xinitrc
new file mode 100644
index 0000000..bb056a5
--- /dev/null
+++ b/Xorg/xinitrc
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Copied from /etc/X11/xinit/xinitrc
+# 
+# Start X with `$ xstart`
+
+
+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
+
+#twm &
+#xclock -geometry 50x50-1+1 &
+#xterm -geometry 80x50+494+51 &
+#xterm -geometry 80x20+494-0 &
+#exec xterm -geometry 80x66+0+0 -name login
+
+
+# My stuff
+# ======================================================================
+
+# fcitx
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS=@im=fcitx
+
+# KDE Plasma
+export DESKTOP_SESSION=plasma
+exec startplasma-x11
diff --git a/bashrc b/bashrc
index df80a86..5cc5a3a 100644
--- a/bashrc
+++ b/bashrc
@@ -104,10 +104,6 @@ export GPG=TTY=$(tty)
 # tmux
 export TERM="xterm-256color"
 
-# fcitx
-GTK_IM_MODULE=fcitx
-QT_IM_MODULE=fcitx
-XMODIFIERS=@im=fcitx
 
 
 # Optional
-- 
cgit v1.2.3