From 223f3ed6b17fbdfbc22931cc5b51b8dbe37bb45b Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Fri, 8 Dec 2023 12:56:00 +0100
Subject: [PATCH] .

---
 .dir-locals                 |  3 --
 .dir-locals.el              |  3 ++
 config.org                  |  1 -
 home/gnupg/gpg-agent.conf   |  4 ---
 home/home-configuration.scm | 62 ++++++++++++++++++-------------------
 5 files changed, 34 insertions(+), 39 deletions(-)
 delete mode 100644 .dir-locals
 create mode 100644 .dir-locals.el
 delete mode 100644 home/gnupg/gpg-agent.conf

diff --git a/.dir-locals b/.dir-locals
deleted file mode 100644
index ffcfb16..0000000
--- a/.dir-locals
+++ /dev/null
@@ -1,3 +0,0 @@
-((scheme-mode . ((geiser-scheme-implementation . 'guile)))
- (org-mode . ((geiser-scheme-implementation . 'guile)
-              (org-confirm-babel-evaluate . nil))))
\ No newline at end of file
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..743926d
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,3 @@
+((nil . ((geiser-scheme-implementation . guile)
+         (geiser-guile-binary . ("guix" "repl"))))
+ (org-mode . ((org-confirm-babel-evaluate . nil))))
diff --git a/config.org b/config.org
index 4054cea..0668e95 100644
--- a/config.org
+++ b/config.org
@@ -1,4 +1,3 @@
-# -*- geiser-scheme-implementation: guile -*-
 #+TITLE: GUIX System Configuration
 #+AUTHOR: Daniel Ziltener
 #+PROPERTY: scheme-implementation guile
diff --git a/home/gnupg/gpg-agent.conf b/home/gnupg/gpg-agent.conf
deleted file mode 100644
index 515323b..0000000
--- a/home/gnupg/gpg-agent.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-grab
-pinentry-program /home/zilti/.guix-home/profile/bin/pinentry-qt
-allow-emacs-pinentry
-allow-loopback-pinentry
diff --git a/home/home-configuration.scm b/home/home-configuration.scm
index f1087f5..32558f3 100644
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@@ -14,9 +14,9 @@
  (gnu home)
  (gnu home services)
  (gnu home services desktop)
- #;(gnu home services gnupg)
+ (gnu home services gnupg)
  (gnu home services guix)
- #;(gnu home services mail)
+ (gnu home services mail)
  (gnu home services mcron)
  (gnu home services pm)
  (gnu home services shells)
@@ -58,26 +58,26 @@
  (services
   (list
    (service home-shepherd-service-type)
-   #;(service home-msmtp-service-type
-   (home-msmtp-configuration            ;
-   (accounts                            ;
-   (list                                ;
-   (msmtp-account                       ;
-   (name "LMail")                       ;
-   (configuration                       ;
-   (msmtp-configuration                 ;
-   (host "lyrion.ch")                   ;
-   (port 587)                           ;
-   (user "dziltener")                   ;
-   (password-eval "pass Privat/Mailaccount | head -n 1")))) ;
-   (msmtp-account                       ;
-   (name "Red Sky")                     ;
-   (configuration                       ;
-   (msmtp-configuration                 ;
-   (host "gmail.com")                   ;
-   (port 587)                           ;
-   (user "dz@redsky.io")                ;
-   (password-eval "pass Privat/RedSkyGMail"))))))))
+   (service home-msmtp-service-type
+            (home-msmtp-configuration
+             (accounts
+              (list
+               (msmtp-account
+                (name "LMail")
+                (configuration
+                 (msmtp-configuration
+                  (host "lyrion.ch")
+                  (port 587)
+                  (user "dziltener")
+                  (password-eval "pass Privat/Mailaccount | head -n 1"))))
+               (msmtp-account
+                (name "Red Sky")
+                (configuration
+                 (msmtp-configuration
+                  (host "gmail.com")
+                  (port 587)
+                  (user "dz@redsky.io")
+                  (password-eval "pass Privat/RedSkyGMail"))))))))
    (simple-service 'ziltis-environment-variable-service
                    home-environment-variables-service-type
                    `(("PATH"               . "$PATH:~/.local/bin")
@@ -93,7 +93,7 @@
                      ("CHICKEN_INSTALL_PREFIX"     . "$HOME/.local")))
    (simple-service 'ziltis-home-files-service
                    home-files-service-type
-                   `((".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))))
+                   `(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))))
    (simple-service 'ziltis-xdg-configuration-files-service
                    home-xdg-configuration-files-service-type
                    `(("sway/config" ,(local-file "./sway/sway"))
@@ -152,13 +152,13 @@
                 (user "git")
                 (port 7920)
                 (identity-file "~/.ssh/personal_ed"))))))
-   #;(service home-gpg-agent-service-type
-   (home-gpg-agent-configuration        ;
-   (pinentry-program                    ;
-   (file-append pinentry-qt "/bin/pinentry-qt")) ;
-   (ssh-support? #t)                    ;
-   (default-cache-ttl 7200)             ;
-   (default-cache-ttl-ssh 7200)         ;
-   (extra-content "allow-emacs-pinentry\nallow-loopback-pinentry")))
+   (service home-gpg-agent-service-type
+            (home-gpg-agent-configuration
+             (pinentry-program
+              (file-append pinentry-qt "/bin/pinentry-qt"))
+             (ssh-support? #t)
+             (default-cache-ttl 7200)
+             (default-cache-ttl-ssh 7200)
+             (extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry")))
    (service home-dbus-service-type)
    )))