update theme

xconfig.org

@@ -63,29 +63,25 @@ Xcursor.theme: Breeze
 Xcursor.size:  0
 #+END_SRC
 
-* =~/.xinitrc=
+* =xinitrc=
 :PROPERTIES:
-:header-args:  :tangle ~/.xinitrc
+:header-args:  :tangle ~/.config/X11/xinitrc
 :header-args+: :comments both :mkdirp yes
 :header-args+: :shebang "#!/bin/sh"
 :CUSTOM_ID: xinitrc
 :END:
 
+Use the cache directory instead of the default =$HOME/.xsession-errors=.
 #+begin_src bash
-dbus-update-activation-environment --systemd DISPLAY
-#+end_src
-
-Fix for Matlab.
-#+begin_src bash
-# export _JAVA_AWT_WM_NONREPARENTING=1
+ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors"
 #+end_src
 
 Set =DISPLAY= for =dunst= when started with =systemd=.
 #+begin_src bash
-# systemctl --user import-environment DISPLAY
+systemctl --user import-environment DISPLAY
 #+end_src
 
-Merge in defaults and keymaps
+Merge the defaults:
 #+BEGIN_SRC bash
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -109,10 +105,14 @@ if [ -f "$usermodmap" ]; then
 fi
 #+END_SRC
 
-Start =gnome-keyring-daemon=.
+Run some default scripts:
 #+begin_src bash
-eval $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-export SSH_AUTH_SOCK
+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
 #+end_src
 
 #+begin_src bash
@@ -133,9 +133,6 @@ exec i3
 
 Keyboard Options:
 #+begin_src bash
-# Set repetition keyboard rate
-xset r rate 200 40 &
-
 # Set International US keyboard layout
 setxkbmap -layout us -variant intl -option caps:escape &
 #+end_src
@@ -157,7 +154,7 @@ xautolock -locker "~/.local/bin/lockscreen" -detectsleep -time 30 -notify 60 -no
 
 # Redshift
 pgrep -xu "$USER" redshift >/dev/null || \
-    redshift &
+    redshift -l 48.8582:2.3387 &
 
 # Run Picom (compositor)
 picom --daemon &
@@ -170,6 +167,9 @@ blueman-applet &
 
 # Udiskie - Automatic USB mount
 udiskie --notify --automount --tray &
+
+# Japanese input
+fcitx -d &
 #+end_src
 
 Manually start =mopidy= as it seems to not start automatically: