From b3d381bfc57feb75f44b62c2c1ed8a313caa9be4 Mon Sep 17 00:00:00 2001
From: Guangxiong Lin <hi@gxlin.org>
Date: Wed, 15 Dec 2021 21:43:26 +0800
Subject: Update autostart

---
 .env          | 8 ++++++++
 .xinitrc      | 2 --
 bin/autostart | 7 -------
 bin/startdwm  | 1 +
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index a41f106..f91f835 100644
--- a/.env
+++ b/.env
@@ -12,3 +12,11 @@ export FZF_DEFAULT_COMMAND='find . -type f'
 if [ -f /usr/bin/fd ];then
     export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git'
 fi
+
+if type fcitx5 > /dev/null; then
+    export GTK_IM_MODULE=fcitx
+    export QT_IM_MODULE=fcitx
+    export XMODIFIERS=@im=fcitx
+    export INPUT_METHOD=fcitx
+    export SDL_IM_MODULE=fcitx
+fi
diff --git a/.xinitrc b/.xinitrc
index 7e53c46..43c545a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -38,8 +38,6 @@ fi
 # xterm -geometry 80x20+494-0 &
 # exec xterm -geometry 80x66+0+0 -name login
 
-source autostart
-
 session=${1:-dwm}
 case $session in
     dwm)
diff --git a/bin/autostart b/bin/autostart
index 0ea29ee..c6382f1 100755
--- a/bin/autostart
+++ b/bin/autostart
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
 
-export GTK_IM_MODULE=fcitx
-export QT_IM_MODULE=fcitx
-export XMODIFIERS=@im=fcitx
-export INPUT_METHOD=fcitx
-export SDL_IM_MODULE=fcitx
-
 [ -f /usr/bin/fcitx5 ] && fcitx5 -d
-
 [ -f ~/.fehbg ] && ~/.fehbg &
diff --git a/bin/startdwm b/bin/startdwm
index afa74f1..da570ff 100755
--- a/bin/startdwm
+++ b/bin/startdwm
@@ -11,6 +11,7 @@ while true; do
 done &
 
 picom -b
+autostart
 
 csum=""
 new_csum=$(sha1sum $(which dwm))
-- 
cgit v1.2.3