home/default/.bashrc

@@ -1,8 +1,16 @@
 # if not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-# add environment vars
-. ~/.profile
+# hidpi potential fix
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+# for waybar
+export XDG_CURRENT_DESKTOP=Unity
+# dark gtk themes
+export GTK_THEME=Materia:dark
+
+# set neovim as default editor
+export VISUAL=nvim
+export EDITOR=nvim
 
 # add scripts folder to path
 export PATH="/home/default/scripts:$PATH"
@@ -10,6 +18,16 @@ export PATH="/home/default/scripts:$PATH"
 # add secret scripts folder to path
 export PATH="/home/default/syncthing/default/scripts:$PATH"
 
+# dotnet
+export MSBuildSDKsPath="/usr/share/dotnet/sdk/`dotnet --version`/Sdks/"
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export PATH="/home/default/.dotnet/tools:$PATH"
+
+# ime
+export GTK_IM_MODULE=ibus
+export QT_IM_MODULE=ibus
+export XMODIFIERS=@im=ibus
+
 # aliases
 alias v=nvim
 alias ls="ls --color=auto"

home/default/.config/sway/config

@@ -224,7 +224,6 @@ bindsym Ctrl+Alt+p exec ~/scripts/record-screen
 ### gaps
 gaps inner 25
 # smart_gaps on
-bindsym $mod+Shift+d border toggle
 
 # notifications
 bindsym $mod+m exec makoctl dismiss

home/default/.profile

@@ -1,24 +0,0 @@
-# qt5ct
-export QT_QPA_PLATFORMTHEME=qt5ct
-export QT_AUTO_SCREEN_SCALE_FACTOR=1
-
-# waybar
-export XDG_CURRENT_DESKTOP=Unity
-
-# gtk
-export GTK_THEME=Materia:dark
-
-# ibus
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus
-
-# set neovim as default editor
-export VISUAL=nvim
-export EDITOR=nvim
-
-# dotnet
-export MSBuildSDKsPath="/usr/share/dotnet/sdk/`dotnet --version`/Sdks/"
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export PATH="/home/default/.dotnet/tools:$PATH"
-

home/default/.xprofile

@@ -1 +0,0 @@
-/home/default/.profile

home/default/.xprofile

@@ -0,0 +1,3 @@
+export GTK_IM_MODULE=ibus
+export XMODIFIERS=@im=ibus
+export QT_IM_MODULE=ibus