From 27cb2b02b413864fd3ae127fe2dcbbd33dfd3b14 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Tue, 21 Jun 2022 17:23:22 +0930
Subject: [PATCH] pulled and rebased

---
 .config/mutt/muttrc   | 1 +
 .config/shell/profile | 5 +++++
 .config/x11/xinitrc   | 4 ++++
 .xmonad/xmonad.hs     | 5 +----
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index ada71ab..1cc2ca5 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -3,3 +3,4 @@ source /usr/share/mutt-wizard/mutt-wizard.muttrc
 source /home/solomon/.config/mutt/accounts/solomon@inkletblot.com.muttrc
 macro index,pager i1 '<sync-mailbox><enter-command>source /home/solomon/.config/mutt/accounts/solomon@inkletblot.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to solomon@inkletblot.com"
 macro index,pager i2 '<sync-mailbox><enter-command>source /home/solomon/.config/mutt/accounts/Solomonlaing@protonmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to Solomonlaing@protonmail.com"
+macro index,pager i3 '<sync-mailbox><enter-command>source /home/solomon/.config/mutt/accounts/solomon.laing@hfoh.com.au.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to solomon.laing@hfoh.com.au"
diff --git a/.config/shell/profile b/.config/shell/profile
index 3de6f6c..60aa4df 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -134,3 +134,8 @@ LICENSE=:\
 # startx myself if I'm not using a login manager anyway.
 # Start graphical server on user's current tty if not already running.
 #[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
+
+if [ -n "$DESKTOP_SESSION" ];then
+    eval $(gnome-keyring-daemon --start)
+    export SSH_AUTH_SOCK
+fi
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index fa4d412..a6bed7e 100755
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -18,6 +18,10 @@ if [ "$HOST" == "archmetabox" ] ; then
 	xrandr --auto
 fi
 
+# start gnome keyring to, used to be done by login manager.
+eval $(gnome-keyring-daemon --start)
+export SSH_AUTH_SOCK
+
 # My default is still xmonad, maybe dwm in future?
 session=${1:-xmonad}
 
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 4e3e6cb..571b7d3 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -576,6 +576,7 @@ myStartupHook = do
     spawnOnce "kdeconnect-indicator &"
     spawnOnce "dunst &" -- notification daemon
     spawnOnce "nm-applet"
+    spawnOnce "protonmail-bridge"
 
     -- Startup Applications
     spawnOnce "nextcloud &"
@@ -586,10 +587,6 @@ myStartupHook = do
     -- Start trayer last
     spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x282a36  --height 20 &"
 
-    -- Laptop things
-    if isLaptop
-        then spawnOnce "powerkit"
-    else spawnOnce ""
 ------------------------------------------------------------------------
 
 main :: IO()