diff --git a/gnu/home/services/secrets.scm b/gnu/home/services/secrets.scm
new file mode 100644
index 00000000000..686876fa91a
--- /dev/null
+++ b/gnu/home/services/secrets.scm
@@ -0,0 +1,125 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Lilah Tascheter <lilah@lunabee.space>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu home services secrets)
+  #:use-module (gnu home services)
+  #:use-module (gnu home services shepherd)
+  #:use-module (gnu packages password-utils)
+  #:use-module (gnu services)
+  #:use-module (gnu services configuration)
+  #:use-module (gnu services shepherd)
+  #:use-module (guix gexp)
+  #:use-module (srfi srfi-1)
+  #:export (wrap-himitsu-prompter
+            home-himitsu-configuration
+            home-himitsu-service-type))
+
+;;
+;; himitsu
+;;
+
+(define (wrap-himitsu-prompter prompter)
+  "Wraps a prompter to autodetect DISPLAY and WAYLAND_DISPLAY, necessary since
+shepherd typically starts before a graphical session."
+  (program-file "himitsu-wrapped-prompter"
+    #~(begin (use-modules (ice-9 ftw) (ice-9 match) (srfi srfi-26))
+        (unless (or (getenv "DISPLAY") (getenv "WAYLAND_DISPLAY"))
+          (for-each (lambda (dir pat cont)
+                      (match (scandir dir (cut regexp-exec pat <>) string<?)
+                        ((file . _) (cont file)) (_ #f)))
+            (list "/tmp/.X11-unix" (or (getenv "XDG_RUNTIME_DIR")
+                                     (string-append "/run/user/" (getuid))))
+            (map make-regexp '("^X[0-9]+$" "^wayland-[0-9]+$"))
+            (list (lambda (f)
+                    (setenv "DISPLAY" (string-append ":" (string-drop f 1))))
+                  (cut setenv "WAYLAND_DISPLAY" <>))))
+        (apply execl #$prompter #$prompter (cdr (command-line))))))
+
+(define-maybe string (prefix himitsu-))
+
+(define (string-or-gexp? s)
+  (or (string? s) (gexp? s)))
+
+(define list-of-strings-or-gexps? (list-of string-or-gexp?))
+
+(define (himitsu-serialize-string label val)
+  #~(format #f "~a=~a~%" '#$label #$val))
+
+(define himitsu-serialize-file-like himitsu-serialize-string)
+
+(define (himitsu-serialize-list-of-strings-or-gexps label vals)
+  #~(string-join (list #$@vals) "\n" 'suffix))
+
+(define-configuration home-himitsu-configuration
+  (package (file-like himitsu) "himitsu package to use." empty-serializer)
+  (notify-reuse maybe-string "Command run to notify the user upon use of a
+secret it was already authorized to use. Limited shell expansion available.")
+  (prompter (file-like (wrap-himitsu-prompter
+                         (file-append hiprompt-gtk "/bin/hiprompt-gtk")))
+"himitsu prompter to use to request user authorization for secret access.")
+  (extra-options (list-of-strings-or-gexps '()) "A list of extra options, one
+per line, to put verbatim into the config file.")
+  (prefix himitsu-))
+
+(define (himitsu-serialize config)
+  (mixed-text-file "himitsu.ini" "[himitsud]\n"
+    (serialize-configuration config home-himitsu-configuration-fields)))
+
+(define (himitsu-shepherd-service config)
+  (define start
+    #~(lambda _
+        (let ((data (or (getenv "XDG_DATA_HOME")
+                        (string-append user-homedir "/.local/share"))))
+          (if (directory-exists? (string-append data "/himitsu"))
+            (fork+exec-command
+              (list #$(let ((pkg (home-himitsu-configuration-package config)))
+                        (file-append pkg "/bin/himitsud"))
+                    "-C" #$(himitsu-serialize config))
+              #:log-file (string-append %user-log-dir "/himitsu.log"))
+            (error "Himitsu store must exist before the service can run! Try \
+running 'himitsu-store -i' first?")))))
+  (list (shepherd-service
+          (documentation "Run the Himitsu secret service manager.")
+          (provision '(himitsud))
+          (modules (cons* '(shepherd support) %default-modules))
+          (start start)
+          (stop #~(make-kill-destructor)))))
+
+;; we need to install the file or else himitsu-store will gen it
+(define (himitsu-xdg-configuration-service config)
+  `(("himitsu/config.ini" ,(himitsu-serialize config))))
+
+(define home-himitsu-service-type
+  (service-type
+    (name 'himitsu)
+    (extensions
+      (list (service-extension home-shepherd-service-type
+                               himitsu-shepherd-service)
+            (service-extension home-xdg-configuration-files-service-type
+                               himitsu-xdg-configuration-service)
+            (service-extension home-profile-service-type
+                               (const (list himitsu)))))
+    (compose concatenate)
+    (extend (lambda (config exts)
+              (let ((opts (home-himitsu-configuration-extra-options config)))
+                (home-himitsu-configuration
+                  (inherit config)
+                  (extra-options (append exts opts))))))
+    (default-value (home-himitsu-configuration))
+    (description "Run the Himitsu secret storage manager upon login. You
+should create the Himitsu database in advance.")))
diff --git a/gnu/local.mk b/gnu/local.mk
index cf4d8c407ba..56afdd981b0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -122,6 +122,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/home/services/music.scm			\
   %D%/home/services/niri.scm			\
   %D%/home/services/pm.scm			\
+  %D%/home/services/secrets.scm			\
   %D%/home/services/shells.scm			\
   %D%/home/services/shepherd.scm		\
   %D%/home/services/sound.scm			\