some changes

1 files changed, 76 insertions, 7 deletions

diff --git a/system.scm b/system.scm
index b59b150..968bbed 100644
--- a/system.scm
+++ b/system.scm
@@ -10,6 +10,7 @@
 ;; Indicate which modules to import to access the variables
 ;; used in this configuration.
 (use-modules (gnu)
+	     (gnu packages package-management) ; guix-for-channels
 	     (gnu system setuid))
 
 (use-service-modules avahi
@@ -20,6 +21,7 @@
 		     linux ; for kernel-module-loader-service-type
 		     messaging
 		     networking
+		     sddm
 		     sound
 		     spice
 		     ssh
@@ -44,11 +46,21 @@
           (list	(channel
 		 (name 'nonguix)
 		 (url "https://gitlab.com/nonguix/nonguix")
-		 (commit "440720b7b2ca4789298f3150bc82bf1b5ed4b8c9"))
+		 (commit "440720b7b2ca4789298f3150bc82bf1b5ed4b8c9")
+		 (introduction
+		  (make-channel-introduction
+		   "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+		   (openpgp-fingerprint
+		    "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
 		(channel
 		 (name 'guix)
-		 (url "https://git.savannah.gnu.org/git/guix.git")
-		 (commit "d37b467631d5b0e965ea933b8bda8448993580e9"))))
+		 (url "https://codeberg.org/guix/guix.git")
+		 (commit "d37b467631d5b0e965ea933b8bda8448993580e9")
+		 (introduction
+		  (make-channel-introduction
+		   "9edb3f66fd807b096b48283debdcddccfea34bad"
+		   (openpgp-fingerprint
+		    "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))))
 	 (inferior (inferior-for-channels channels))
 	 (kernel-version "6.2.2"))
     (values (specification->package "linux")
@@ -89,12 +101,23 @@
                 (comment "Robby Zambito")
                 (group "users")
                 (home-directory "/home/robby")
-                (supplementary-groups '("wheel" "netdev" "audio" "video" "dialout" "libvirt" "kvm" "spice" "plugdev" "lp" "docker")))
+                (supplementary-groups '("wheel"
+					"netdev"
+					"audio"
+					"video"
+					"dialout"
+					"libvirt"
+					"kvm"
+					"spice"
+					"plugdev"
+					"lp"
+					"docker")))
                %base-user-accounts))
  (packages (append (specifications->packages (list "amdgpu-firmware"
 						   "bluez"
 						   "bluez-alsa"
 						   "dbus"
+						   "docker-compose"
 						   "emacs"
 						   "ffmpeg"
 						   "gvfs"
@@ -156,12 +179,18 @@
 	   (service containerd-service-type)
 	   (service docker-service-type)
 	   (service elogind-service-type)
+	   ;; (service sddm-service-type
+	   ;; 	    (sddm-configuration
+	   ;; 	     (display-server "wayland")))
+	   ;; (service gdm-service-type
+	   ;; 	    (gdm-configuration
+	   ;; 	     (wayland? #t)))
 	   (service geoclue-service-type)
 	   (simple-service 'add-extra-hosts
                           hosts-service-type
                           (list (host "10.69.0.1" "stream.robbyzambito.me")
 				;; (host "10.42.0.1" "robbyzambito.me")
-				(host "10.69.0.1" "git.robbyzambito.me")
+				;; (host "10.69.0.1" "git.robbyzambito.me")
 				(host "192.168.98.25" "file.pinfosec.dev")
 				(host "144.202.13.55" "mattermost.pinfosec.dev")))
 	   (service libvirt-service-type
@@ -201,6 +230,7 @@
                      (program (file-append (specification->package "swaylock") "/bin/swaylock"))
                      (using-pam? #t)
                      (using-setuid? #f)))
+	   ;; (service seatd-service-type)
            (service tor-service-type)
 	   (service udisks-service-type)
 	   (udev-rules-service 'steam-devices steam-devices-udev-rules)
@@ -220,10 +250,49 @@
 	   ;; (simple-service 'v4l2loopback-config etc-service-type
 	   ;; 		   (list `("modprobe.d/dslr-webcam.conf"
 	   ;; 			   ,dslr-webcam-config)))
-           (service wpa-supplicant-service-type))
+           (service wpa-supplicant-service-type)
+	   (service greetd-service-type
+		    (greetd-configuration
+		      (greeter-supplementary-groups (list "video" "input" "users"))
+		      (terminals
+		       (list
+			;; we can make any terminal active by default
+			(greetd-terminal-configuration
+			  (extra-shepherd-requirement '(elogind))
+			  (terminal-vt "1")
+			  (terminal-switch #t)
+			  (default-session-command
+			    (greetd-wlgreet-sway-session)))
+			(greetd-terminal-configuration (terminal-vt "2"))
+			(greetd-terminal-configuration (terminal-vt "3"))
+			(greetd-terminal-configuration (terminal-vt "4"))
+			(greetd-terminal-configuration (terminal-vt "5"))
+			(greetd-terminal-configuration (terminal-vt "6")))))))
           ;; This is the default list of services we
           ;; are appending to.
-          %base-services))
+          (let ((my-channels (cons (channel
+				    (name 'guix)
+				    (url "https://codeberg.org/guix/guix.git")
+				    (branch "master")
+				    (introduction
+				     (make-channel-introduction
+				      "9edb3f66fd807b096b48283debdcddccfea34bad"
+				      (openpgp-fingerprint
+				       "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
+				   %default-channels)))
+	    
+	    (modify-services
+	     %base-services
+	     (guix-service-type
+	      config => (guix-configuration
+			 (inherit config)
+			 (channels my-channels)
+			 (guix (guix-for-channels my-channels))))
+	     ;; greetd-service-type provides "greetd" PAM service
+             (delete login-service-type)
+             ;; and can be used in place of mingetty-service-type
+             (delete mingetty-service-type)))
+	  ))
  (bootloader (bootloader-configuration
               (bootloader grub-efi-bootloader)
               (targets (list "/boot/efi"))