Merge branch 'master' of ssh://dundun.ddns.net:222/sheldonmlee/dotfiles

.bash_profile

@@ -7,6 +7,10 @@
 # custom scripts and programs
 PATH="$HOME/.local/bin:$PATH"
 PATH="$HOME/.config/scripts/bin:$PATH"
+PATH="/var/lib/flatpak/exports/bin:$PATH"
+
+# flatpak desktop files
+XDG_DATA_DIRS="/var/lib/flatpak/exports/share:$XDG_DATA_DIRS"
 
 if grep "arch-laptop" /etc/hostname &> /dev/null ; then
 	export IS_LAPTOP=1
@@ -15,6 +19,10 @@ fi
 # for java applicatons
 export _JAVA_AWT_WM_NONREPARENTING=1
 
+export XMODIFIERS="@im=fcitx"
+export QT_IM_MODULE=fcitx
+export GTK_IM_MODULE=fcitx
+
 if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then
 	if [[ ! -z "$IS_LAPTOP" ]]; then
 		WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card0 sway

.config/gtk-3.0/settings.ini

@@ -1,4 +1,4 @@
 [Settings]
 gtk-icon-theme-name=kora
 gtk-theme-name=Materia-dark-compact
-gtk-cursor-theme-name=default
+gtk-cursor-theme-name=Bibata-Original-Classic

.config/nvim/init.vim

@@ -37,8 +37,13 @@ autocmd vimenter * ++nested colorscheme gruvbox
 set encoding=utf8
 set fileencoding=utf8
 
+" Remapping
+noremap <C-Space> :Files<Enter>
+
 " plugins
 call plug#begin('~/.local/share/nvim/site/plugged')
 Plug 'lervag/vimtex'
 Plug 'morhetz/gruvbox'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
 call plug#end()

.config/scripts/fcitx/install-rime-cantonese.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+# Script to install rime-cantonese based on https://github.com/rime/rime-cantonese/wiki/FreeBSD-%E5%AE%89%E8%A3%9D%E6%95%99%E7%A8%8B
+rimedir="$HOME/.local/share/fcitx5/rime"
+clonedir="$rimedir/repos"
+
+if [[ "$1" == "uninstall" ]] || [[ "$1" == "-u" ]]; then
+	rm -rf "$clonedir"
+	find "$rimedir" -type l -delete
+else
+	mkdir -p "$rimedir/opencc"
+	mkdir -p "$clonedir"
+
+	cd "$rimedir"
+	clonebasename="$(basename $clonedir)"
+	git clone https://github.com/rime/rime-cantonese.git "$clonedir/rime-cantonese"
+	for file in $(find "$clonebasename/rime-cantonese" -type f -name '*.yaml'); do ln -sf "$file"; done
+	for file in $(find "$clonebasename/rime-cantonese/opencc" -type f); do ln -sf "../$file" "opencc"; done
+
+	git clone https://github.com/CanCLID/rime-loengfan.git "$clonedir/rime-loengfan"
+	for file in $(find "$clonebasename/rime-cantonese" -type f -name '*.yaml'); do ln -sf "$file"; done
+fi

.gtkrc-2.0

@@ -1,3 +0,0 @@
-gtk-theme-name="Materia-dark-compact"
-gtk-icon-theme-name="kora"
-gtk-cursor-theme-name=" default "

.nnn_bookmarks

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# bookmarks
-export NNN_BMS='z:/mnt/InternalSSD/lin;x:/mnt/InternalSSD/win;c:/mnt/InternalHDD'
-# use trashcan
-export NNN_TRASH=1