From cc3dfadcfc9ead39e81def71e9efbdda5f0254c1 Mon Sep 17 00:00:00 2001
From: Stef Dunlap <stef@kindrobot.ca>
Date: Thu, 23 Feb 2023 10:13:54 -0500
Subject: [PATCH] changes

---
 conf/awesome_workstation.nix |  6 ++++++
 flake.nix                    |  1 -
 home/awesome.nix             |  4 +++-
 home/doom.d/config.el        | 18 +++++++++---------
 justfile                     |  3 +++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/conf/awesome_workstation.nix b/conf/awesome_workstation.nix
index a228039..82c36bf 100644
--- a/conf/awesome_workstation.nix
+++ b/conf/awesome_workstation.nix
@@ -11,6 +11,9 @@
     ];
   };
   services.tumbler.enable = true;
+  # services.gnome.gnome-keyring.enable = true;
+  programs.seahorse.enable = true;
+  security.pam.services.kindrobot.enableGnomeKeyring = true;
   programs.gnupg.agent.pinentryFlavor = "qt";
   programs.slock.enable = true;
   environment.systemPackages = with pkgs; [
@@ -36,5 +39,8 @@
     xfce.ristretto
     zathura
     haskellPackages.greenclip
+    gnome.gnome-keyring
+    gcr
+    xfce.xfce4-terminal
   ];
 }
diff --git a/flake.nix b/flake.nix
index 7fc5848..0b9356c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,7 +57,6 @@
             nixpkgs.config.allowUnfreePredicate = (pkg: true);
           })
           ./conf/awesome_workstation.nix
-	  ./conf/sway.nix
           ./box/framework2.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
diff --git a/home/awesome.nix b/home/awesome.nix
index fcf7fb2..ccd71d7 100644
--- a/home/awesome.nix
+++ b/home/awesome.nix
@@ -4,6 +4,8 @@
   home.file.xinitrc = {
     target = ".xinitrc";
     text = ''
+      eval $(gnome-keyring-daemon --start --components=pkcs11,secrets)
+      dbus-update-activation-environment --systemd DISPLAY
       picom &
       greenclip daemon &
       pasystray &
@@ -13,7 +15,7 @@
       sleep 6 && kdeconnect-indicator &
       sleep 10 && nextcloud &
 
-      awesome
+      exec awesome
     '';
   };
   home.packages = with pkgs; [
diff --git a/home/doom.d/config.el b/home/doom.d/config.el
index c18dc7f..03ad4c9 100644
--- a/home/doom.d/config.el
+++ b/home/doom.d/config.el
@@ -54,7 +54,7 @@
   '((mu4e-sent-folder       . "/stef/Sent")
     (mu4e-drafts-folder     . "/stef/Drafts")
     (mu4e-trash-folder      . "/stef/Trash")
-    (mu4e-refile-folder     . "/stef/Archives/2022")
+    (mu4e-refile-folder     . "/stef/Archives/2023")
     (mu4e-maildir-shortcuts . (("/stef/INBOX" . ?i)
                                ("/stef/Drafts"         . ?d)
                                ("/stef/Sent" . ?s)))
@@ -67,7 +67,7 @@
   '((mu4e-sent-folder       . "/hello/Sent")
     (mu4e-drafts-folder     . "/hello/Drafts")
     (mu4e-trash-folder      . "/hello/Trash")
-    (mu4e-refile-folder     . "/hello/Archives/2022")
+    (mu4e-refile-folder     . "/hello/Archives/2023")
     (mu4e-maildir-shortcuts . (("/hello/INBOX" . ?i)
                                ("/hello/Drafts"         . ?d)
                                ("/hello/Sent" . ?s)))
@@ -80,7 +80,7 @@
   '((mu4e-sent-folder       . "/team/Sent")
     (mu4e-drafts-folder     . "/team/Drafts")
     (mu4e-trash-folder      . "/team/Trash")
-    (mu4e-refile-folder     . "/team/Archives/2022")
+    (mu4e-refile-folder     . "/team/Archives/2023")
     (mu4e-maildir-shortcuts . (("/team/INBOX" . ?i)
                                ("/team/Drafts"         . ?d)
                                ("/team/Sent" . ?s)))
@@ -93,12 +93,12 @@
   '((mu4e-sent-folder       . "/gmail/Sent")
     (mu4e-drafts-folder     . "/gmail/Drafts")
     (mu4e-trash-folder      . "/gmail/Trash")
-    (mu4e-refile-folder     . "/gmail/Archives/2022")
-    (mu4e-maildir-shortcuts . (("/team/INBOX" . ?i)
-                               ("/team/Drafts"         . ?d)
-                               ("/team/Sent" . ?s)))
-    (smtpmail-smtp-user     . "kindrobot@tilde.team")
-    (user-mail-address      . "kindrobot@tilde.team")
+    (mu4e-refile-folder     . "/gmail/Archives/2023")
+    (mu4e-maildir-shortcuts . (("/gmail/INBOX" . ?i)
+                               ("/gmail/Drafts"         . ?d)
+                               ("/gmail/Sent" . ?s)))
+    (smtpmail-smtp-user     . "apocryphalauthor@gmail.com")
+    (user-mail-address      . "apocryphalauthor@gmail.com")
     (user-full-name         . "Stef Dunlap")
     (mu4e-compose-signature . "Stef Dunlap (she/her)"))
   t)
diff --git a/justfile b/justfile
index 2ddf431..b36abda 100644
--- a/justfile
+++ b/justfile
@@ -15,6 +15,9 @@ rebuild-emacs: rebuild
     $HOME/.emacs.d/bin/doom sync
     systemctl --user restart emacs
 
+restart-emacs:
+    systemctl --user restart emacs
+
 upgrade:
     nix flake update
     sudo nixos-rebuild switch --flake .