From 4db81bbde7adfdd511321db6a098199d4c76a7d4 Mon Sep 17 00:00:00 2001
From: Aleksandr Lebedev <alex.lebedev2003@icloud.com>
Date: Sun, 9 Nov 2025 22:25:37 +0100
Subject: [PATCH] Update + not working secretsd service

---
 guix-config/channels-lock.scm          |  2 +-
 guix-config/home/services/secretsd.scm | 40 ++++++++++++++++++++++++++
 guix-config/home/workstation.scm       |  2 ++
 guix-config/system/base-system.scm     | 12 ++++----
 4 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 guix-config/home/services/secretsd.scm

diff --git a/guix-config/channels-lock.scm b/guix-config/channels-lock.scm
index fc2bf0f..3c7f364 100644
--- a/guix-config/channels-lock.scm
+++ b/guix-config/channels-lock.scm
@@ -3,7 +3,7 @@
         (url "https://git.guix.gnu.org/guix.git")
         (branch "master")
         (commit
-          "4bfe5cdf144183df08e7ac0e1c1acb7366e24bcf")
+          "0c28553113176cc498b622c5fc831c4b6ae844a0")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
diff --git a/guix-config/home/services/secretsd.scm b/guix-config/home/services/secretsd.scm
new file mode 100644
index 0000000..ae3f70b
--- /dev/null
+++ b/guix-config/home/services/secretsd.scm
@@ -0,0 +1,40 @@
+(define-module (guix-config home services secretsd)
+  #:use-module (gnu home services)
+  #:use-module (gnu home services shepherd)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages password-utils)
+  #:use-module (gnu services)
+  #:use-module (gnu services shepherd)
+  #:use-module (guix gexp)
+  #:use-module (guix records)
+  #:export (home-secretsd-service-type))
+
+(define (home-secretsd-shepherd-service config)
+  (list
+   (shepherd-service
+    (documentation "Run secretsd - secret service.")
+    (provision '(secretsd))
+    (start #~(lambda _
+	       (mkdir-p (string-append (getenv "HOME")
+                                       "/.local/share/nullroute.lt/secretsd"))
+	       (make-forkexec-constructor
+		(list
+		 #$(file-append secretsd "/bin/secretsd") "-v")
+               #:log-file (string-append (getenv "HOME")
+                                     "/.local/var/log/secretsd.log"))))
+    (stop #~(make-kill-destructor)))))
+
+(define home-secretsd-service-type
+  (service-type
+   (name 'home-secretsd)
+   (extensions
+    (list (service-extension home-shepherd-service-type
+                             home-secretsd-shepherd-service)
+          (service-extension home-profile-service-type
+                             (lambda (config)
+                               (list dbus
+                                     secretsd)))))
+   (description "Install secretsd, a secret service.  This service runs secretsd on start")
+   (default-value '())))
diff --git a/guix-config/home/workstation.scm b/guix-config/home/workstation.scm
index cd5a4f8..55daa34 100644
--- a/guix-config/home/workstation.scm
+++ b/guix-config/home/workstation.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu home services sound)
   #:use-module (gnu home services desktop)
   #:use-module (guix-config home services emacs)
+  #:use-module (guix-config home services secretsd)
   #:use-module (gnu home services niri))
 
 (home-environment
@@ -81,6 +82,7 @@
 		 (service home-dotfiles-service-type
                           (home-dotfiles-configuration
                            (directories '("../../files"))))
+		 (service home-secretsd-service-type)
 		; (service home-emacs-service-type
 		;	  (home-emacs-configuration
 		;	   (emacs emacs-pgtk)
diff --git a/guix-config/system/base-system.scm b/guix-config/system/base-system.scm
index 84c66d5..0f38542 100644
--- a/guix-config/system/base-system.scm
+++ b/guix-config/system/base-system.scm
@@ -10,7 +10,10 @@
 
 (define %my-desktop-services
   (modify-services %desktop-services
-                   (delete gdm-service-type)
+                   (gdm-service-type config =>
+				     (gdm-configuration
+				      (inherit config)
+				      (wayland? #t)))
 		   (elogind-service-type config => 
 				     (elogind-configuration 
 				      (inherit config)
@@ -63,12 +66,7 @@
 			    (list cups-filters epson-inkjet-printer-escpr hplip-minimal))))
 		 (service bluetooth-service-type)
 		 (service power-profiles-daemon-service-type)
-		 (simple-service 'my-polkit-wheel polkit-service-type (list my-polkit-wheel))
-                 (set-xorg-configuration
-                  (xorg-configuration (keyboard-layout keyboard-layout))))
-
-           ;; This is the default list of services we
-           ;; are appending to.
+		 (simple-service 'my-polkit-wheel polkit-service-type (list my-polkit-wheel)))
            %my-desktop-services))
   (bootloader (bootloader-configuration
                  (bootloader grub-bootloader)