Fix (gnu home-services state) and add feature-state

2 files changed, 28 insertions, 2 deletions

diff --git a/src/jd/features/state.scm b/src/jd/features/state.scm
new file mode 100644
index 0000000..ef8620b
--- /dev/null
+++ b/src/jd/features/state.scm
@@ -0,0 +1,25 @@
+(define-module (jd features state)
+  #:use-module (guix gexp)
+  #:use-module (ice-9 match)
+  #:use-module (gnu services)
+  #:use-module (gnu home-services state)
+  #:use-module (rde features))
+
+(define-public (feature-state states)
+  (define f-name 'state)
+
+  (define (get-home-services config)
+    (list
+     (simple-service
+      'user-state
+      home-state-service-type
+      (map
+       (match-lambda
+         (('git local remote) (state-git local remote))
+         (#t (error "State not found")))
+       states))))
+
+  (feature
+   (name f-name)
+   (values `((,f-name . #t)))
+   (home-services-getter get-home-services)))
diff --git a/src/jd/user.scm b/src/jd/user.scm
index 7a79e2c..ba32c01 100644
--- a/src/jd/user.scm
+++ b/src/jd/user.scm
@@ -25,6 +25,7 @@
   #:use-module (jd features mail)
   #:use-module (jd features networking)
   #:use-module (jd features nextcloud)
+  #:use-module (jd features state)
 
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd)
@@ -489,8 +490,8 @@
      #:gpg-primary-key "83AD9E56AE266488CA2F2598BACE123052C9E77A")
     (feature-security-token)
     (feature-password-store
-     #:password-store-directory "/home/jakub/.password-store"
-     #:remote-password-store-url "ssh://git@jdlugosz.com:passwords")
+     #:remote-password-store-url "git@jdlugosz.com:passwords")
+    (feature-state '((git "/data/jakub/notes" "git@jdlugosz.com:notes")))
     (feature-mail-settings
      #:mail-directory-fn (lambda (config)
                            (string-append (get-value 'home-directory config) "/Mail"))