From 45a6e760ebc4438ff05f1a689518e50b4567fe93 Mon Sep 17 00:00:00 2001
From: Mehdi Sadeghi <mehdi@mehdix.org>
Date: Fri, 31 Mar 2023 19:18:14 +0200
Subject: Export GOPATH and some cleanup

Moreover, make sure KDE is not running in xinitrc before exec
---
 .bashrc                         |  5 +++++
 .config/alacritty/alacritty.yml | 28 ----------------------------
 .config/blue032.profile         |  0
 .config/electron-flags.conf     |  2 --
 .env                            |  1 +
 .gnupg/gpg-agent.conf           |  2 +-
 .profile                        |  3 ++-
 .xinitrc                        |  2 +-
 8 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 .config/alacritty/alacritty.yml
 delete mode 100644 .config/blue032.profile
 delete mode 100644 .config/electron-flags.conf

diff --git a/.bashrc b/.bashrc
index c4439e7..f23a6f2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,6 +1,11 @@
 # .bashrc
 echo .bashrc begin
 
+# Make a history backup since history is lost sometimes
+BACKUPS=~/Backups/$(date +%Y)/bash_hist/
+[[ ! -d $BACKUPS ]] && mkdir -p $BACKUPS
+cp ~/.bash_history $BACKUPS/$(date +%s)
+
 # Load ENV file (shared with POSIX shell)
 [ $0 != sh ] && [ -n "${ENV:=$HOME/.env}" ] && . "$ENV"
 
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
deleted file mode 100644
index c7a6f88..0000000
--- a/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Colors (iTerm 2 default theme)
-colors:
-  # Default colors
-  primary:
-    background: '#101421'
-    foreground: '#fffbf6'
-
- # Normal colors
-  normal:
-    black:   '#2e2e2e'
-    red:     '#eb4129'
-    green:   '#abe047'
-    yellow:  '#f6c744'
-    blue:    '#47a0f3'
-    magenta: '#7b5cb0'
-    cyan:    '#64dbed'
-    white:   '#e5e9f0'
-
- # Bright colors
-  bright:
-    black:   '#565656'
-    red:     '#ec5357'
-    green:   '#c0e17d'
-    yellow:  '#f9da6a'
-    blue:    '#49a4f8'
-    magenta: '#a47de9'
-    cyan:    '#99faf2'
-    white:   '#ffffff'
diff --git a/.config/blue032.profile b/.config/blue032.profile
deleted file mode 100644
index e69de29..0000000
diff --git a/.config/electron-flags.conf b/.config/electron-flags.conf
deleted file mode 100644
index 51bdd86..0000000
--- a/.config/electron-flags.conf
+++ /dev/null
@@ -1,2 +0,0 @@
---enable-features=UseOzonePlatform
---ozone-platform=wayland
diff --git a/.env b/.env
index 5f187f8..0e38fd0 100644
--- a/.env
+++ b/.env
@@ -52,6 +52,7 @@ PATH=$HOME/.cargo/bin:$PATH
 GOPATH="$HOME/.local/share/go"
 PATH=$GOPATH/bin:$PATH
 export PATH
+export GOPATH
 export LANGUAGE=en
 export BROWSER=w3m
 
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 23b4c0d..9df3011 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1 +1 @@
-pinentry-program /usr/bin/pinentry-dmenu
+#pinentry-program /usr/bin/pinentry-dmenu
diff --git a/.profile b/.profile
index 51412e0..ba156f1 100644
--- a/.profile
+++ b/.profile
@@ -7,7 +7,8 @@ export LANGUAGE=en
 export LC_ALL=en_US.UTF-8
 export EDITOR=vim
 
-export GDK_BACKEND=wayland
+# Try wayland for GTK apps first, allow x11 fallback
+export GDK_BACKEND=wayland,x11
 
 export MAKEFLAGS=-j`lscpu | grep '^CPU(s):' | awk -F' ' '{ print $2 }'`
 export CFLAGS="-O2 -pipe -march=native"
diff --git a/.xinitrc b/.xinitrc
index 5f8cce7..9bb728e 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,6 +3,6 @@ case $(tty | cut -b9-) in
 	(2) exec xfce4-session;;
 	(4) exec i3;;
 	(5) exec openbox-session;;
-	(6) export DESKTOP_SESSION=plasma; exec startplasma-x11;;
+	(6) [ "$DESKTOP_SESSION" = plasma ] && (export DESKTOP_SESSION=plasma; exec startplasma-x11);;
 	(7) exec openbox-session;;
 esac
-- 
cgit v1.2.3