From 23e37329c6578a339c954e2b6f2a367ed7d74a4a Mon Sep 17 00:00:00 2001
From: shibao <shibao@bubbletea.dev>
Date: Thu, 13 Jan 2022 13:34:46 -0500
Subject: [PATCH] move env vars to .profile

---
 home/default/.bashrc   | 22 ++--------------------
 home/default/.profile  | 21 +++++++++++++++++++++
 home/default/.xprofile |  4 +---
 3 files changed, 24 insertions(+), 23 deletions(-)
 mode change 100644 => 120000 home/default/.xprofile

diff --git a/home/default/.bashrc b/home/default/.bashrc
index 88d4123..96c37fd 100644
--- a/home/default/.bashrc
+++ b/home/default/.bashrc
@@ -1,16 +1,8 @@
 # if not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-# 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 environment vars
+. ~/.profile
 
 # add scripts folder to path
 export PATH="/home/default/scripts:$PATH"
@@ -18,16 +10,6 @@ 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"
diff --git a/home/default/.profile b/home/default/.profile
index 12b1c62..5528df1 100644
--- a/home/default/.profile
+++ b/home/default/.profile
@@ -1,3 +1,24 @@
+# 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"
+
diff --git a/home/default/.xprofile b/home/default/.xprofile
deleted file mode 100644
index 12b1c62..0000000
--- a/home/default/.xprofile
+++ /dev/null
@@ -1,3 +0,0 @@
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus
diff --git a/home/default/.xprofile b/home/default/.xprofile
new file mode 120000
index 0000000..7d50210
--- /dev/null
+++ b/home/default/.xprofile
@@ -0,0 +1 @@
+/home/default/.profile
\ No newline at end of file