summaryrefslogtreecommitdiff
path: root/.bashrc
diff options
context:
space:
mode:
Diffstat (limited to '.bashrc')
-rw-r--r--.bashrc16
1 files changed, 16 insertions, 0 deletions
diff --git a/.bashrc b/.bashrc
index e08c20b..092a80d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -3,7 +3,15 @@ stty -ixon
#export BROWSER="firefox-developer-edition"
export BROWSER="qutebrowser"
export MOZ_DBUS_REMOTE=1
+<<<<<<< HEAD
#export BROWSER="vivaldi-snapshot --use-gl=egl"
+=======
+#export BROWSER="qutebrowser"
+alias vivaldi-snapshot="vivaldi-snapshot --use-gl=egl"
+alias chromium="GDK_BACKEND=x11 && chromium"
+export BROWSER="firefox-developer-edition"
+#export BROWSER="chromium"
+>>>>>>> dbb33e4bfbf7b9e7fe3f3a38cc501bc3d3aa4732
export EDITOR="nvim"
# keep dictionaries in ~/bin/
export STARDICT_DATA_DIR="$HOME/bin/dict/"
@@ -14,11 +22,19 @@ export PATH=/usr/local/bin:$PATH
export PATH=$PATH:$HOME/bin
export PATH=$PATH:$HOME/bin/bash-scripts
export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin
+<<<<<<< HEAD
export QT_QPA_PLATFORM=wayland
export QT_PLATFORM_THEME=qt5ct
export QT_QPA_PLATFORMTHEME=qt5ct
export XDG_SESSION_TYPE=wayland
export GDK_BACKEND=wayland
+=======
+#export QT_QPA_PLATFORM=wayland
+#export QT_PLATFORM_THEME=qt5ct
+#export QT_QPA_PLATFORMTHEME=qt5ct
+#export XDG_SESSION_TYPE=wayland
+#export GDK_BACKEND=wayland
+>>>>>>> dbb33e4bfbf7b9e7fe3f3a38cc501bc3d3aa4732
# Alias definitions
if [ -f ~/.aliases ]; then