From 788b559b33f84c644f3ae8b2c997b1820a8da740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Wed, 5 Jun 2019 19:16:57 +0200
Subject: i3: replace xim with ibus

---
 config/i3/config                  | 4 +---
 config/i3/scripts/keyboard_layout | 2 --
 config/i3blocks/config            | 5 -----
 xinitrc                           | 6 +++++-
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100755 config/i3/scripts/keyboard_layout

diff --git a/config/i3/config b/config/i3/config
index 9f4b707..592dc9e 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -162,9 +162,6 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
-# Switch keyboard layout
-bindsym Mod1+space exec --no-startup-id ~/.config/i3/scripts/keyboard_switch
-
 # Pulse audio control
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% && pkill -RTMIN+10 i3blocks
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -RTMIN+10 i3blocks
@@ -195,6 +192,7 @@ bar {
 # Start daemons
 exec --no-startup-id dunst
 exec --no-startup-id xss-lock -- myi3lock
+exec --no-startup-id ibus-daemon -drx
 # Set background
 exec --no-startup-id i3background
 # Start pidgin
diff --git a/config/i3/scripts/keyboard_layout b/config/i3/scripts/keyboard_layout
deleted file mode 100755
index 90b82e4..0000000
--- a/config/i3/scripts/keyboard_layout
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-setxkbmap -query | awk '/layout/{print $2}'
diff --git a/config/i3blocks/config b/config/i3blocks/config
index 0ec9161..85da162 100644
--- a/config/i3blocks/config
+++ b/config/i3blocks/config
@@ -38,11 +38,6 @@ command=~/.config/i3blocks/scripts/mpd
 interval=5
 instance=remote
 
-[keymap]
-command=~/.config/i3/scripts/keyboard_layout
-interval=once
-signal=11
-
 # Volume indicator
 #
 # The first parameter sets the step (and units to display)
diff --git a/xinitrc b/xinitrc
index b3de531..042fdc9 100644
--- a/xinitrc
+++ b/xinitrc
@@ -4,9 +4,13 @@ setxkbmap -option compose:menu
 numlockx
 xset -b # disable beeping
 
+# Use GTK theme for QT applications
 export QT_QPA_PLATFORMTHEME=gtk2
 export QT_STYLE_OVERRIDE='gtk2'
-export GTK_IM_MODULE=xim
+# use IBus for keyboard inputs
+export GTK_IM_MODULE=ibus
+export XMODIFIERS=@im=ibus
+export QT_IM_MODULE=ibus
 # Fix fullscreen game offscreen
 export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0
 # To fix missing textures on intel
-- 
cgit v1.2.3