pulled and rebased

This commit is contained in:
Solomon Laing 2022-06-21 17:23:22 +09:30
parent 8e65a3b7e3
commit 27cb2b02b4
4 changed files with 11 additions and 4 deletions

View File

@ -3,3 +3,4 @@ source /usr/share/mutt-wizard/mutt-wizard.muttrc
source /home/solomon/.config/mutt/accounts/solomon@inkletblot.com.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 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 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"

View File

@ -134,3 +134,8 @@ LICENSE=:\
# startx myself if I'm not using a login manager anyway. # startx myself if I'm not using a login manager anyway.
# Start graphical server on user's current tty if not already running. # 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" #[ "$(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

View File

@ -18,6 +18,10 @@ if [ "$HOST" == "archmetabox" ] ; then
xrandr --auto xrandr --auto
fi 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? # My default is still xmonad, maybe dwm in future?
session=${1:-xmonad} session=${1:-xmonad}

View File

@ -576,6 +576,7 @@ myStartupHook = do
spawnOnce "kdeconnect-indicator &" spawnOnce "kdeconnect-indicator &"
spawnOnce "dunst &" -- notification daemon spawnOnce "dunst &" -- notification daemon
spawnOnce "nm-applet" spawnOnce "nm-applet"
spawnOnce "protonmail-bridge"
-- Startup Applications -- Startup Applications
spawnOnce "nextcloud &" spawnOnce "nextcloud &"
@ -586,10 +587,6 @@ myStartupHook = do
-- Start trayer last -- 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 &" 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() main :: IO()