2 files changed, 37 insertions, 5 deletions

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index e1cf87b..5868ff9 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -18,6 +18,7 @@
                 #:use-module (ryan-packages wm)
                 #:use-module (ryan-packages virtualization)
                 #:use-module (ryan-packages linux)
+                #:use-module (ryan-packages login)
                 #:use-module (ryan-packages networking)
                 #:use-module (ryan-packages package-management)
                 #:use-module (rosenthal services networking)
@@ -205,6 +206,36 @@
                                          (list
                                            (pam-entry (control "include")
                                                       (module "login")))))))
+                   (simple-service 'ly-pam pam-root-service-type
+                                   (list
+                                     (pam-service
+                                       (name "ly")
+                                       (account
+                                         (list
+                                           (pam-entry (control "required")
+                                                      (module "pam_unix.so"))))
+                                       (auth
+                                         (list
+                                           (pam-entry (control "required")
+                                                      (module "pam_unix.so"))))
+                                       (password
+                                         (list
+                                           (pam-entry (control "required")
+                                                      (module "pam_unix.so")
+                                                      (arguments (list "sha512" "shadow")))))
+                                       (session
+                                         (list
+                                           (pam-entry (control "required")
+                                                      (module "/gnu/store/4lhhf88iz9pdr624z5hnq2avlk1ny4ga-elogind-255.17/lib/security/pam_elogind.so")
+                                                      (arguments (list "debug=yes")))
+                                           (pam-entry (control "required")
+                                                      (module "pam_env.so"))
+                                           (pam-entry (control "required")
+                                                      (module "pam_unix.so")))))))
+                   (service mingetty-service-type
+                           (mingetty-configuration
+                             (tty "tty7")
+                             (login-program #~(string-append #$ly "/bin/ly"))))
                    (service libvirt-service-type
                             (libvirt-configuration
                               (libvirt libvirt-ovmf)
@@ -217,6 +248,7 @@
                    ;           (using-pam? #t)))
                    (simple-service 'spice-polkit polkit-service-type (list spice-gtk))
                    (simple-service 'hwdb-creation etc-service-type (list `("udev-here-oneoneone" ,(plain-file "issue" "test\n"))))
+                   (simple-service 'ly-config etc-service-type (list `("ly/config.ini" , (local-file "/home/ryan/lyconfig.ini"))))
                    (service bluetooth-service-type
                             (bluetooth-configuration
                               (bluez bluez-ryan)
diff --git a/modules/ryan-packages/login.scm b/modules/ryan-packages/login.scm
index e3856a5..37bd2d8 100644
--- a/modules/ryan-packages/login.scm
+++ b/modules/ryan-packages/login.scm
@@ -16,18 +16,18 @@
                #:use-module (guix utils))
 
 (define ly-source
-  (let ((commit "1b9286166e2b49fb11823a0f02baa6c42e66fe61")
-        (revision "1")
+  (let ((commit "ddb24dfef5e397669c569f3c84e29729144ea3fa")
+        (revision "7")
         (name "ly")
-        (version "1.3.2"))
+        (version "ly-rev7"))
     (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://codeberg.org/fairyglade/ly")
+             (url "https://github.com/ryan77627/ly-fork")
              (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1dwx0ri61p16n1kpcv57g7xf3rgwysnfijw7i76b1l802a4qnk1z")))))
+        (base32 "09kialy8vi0pisym4ngy5qr4z2nvlkq55pziz5k189ahhpqrvsc6")))))
 
 (define ly-zig-cache
   (computed-file