podman, bat, and shell init changes

1 files changed, 18 insertions, 30 deletions

diff --git a/system.scm b/system.scm
index f18e432..5045138 100644
--- a/system.scm
+++ b/system.scm
@@ -11,6 +11,7 @@
 ;; used in this configuration.
 (use-modules (gnu)
 	     (gnu packages package-management) ; guix-for-channels
+	     (gnu system accounts);for 'subid-range'
 	     (gnu system setuid))
 
 (use-service-modules avahi
@@ -40,35 +41,15 @@
 
 (import (srfi 1)
 	(guix channels)
-	(guix inferior))
+	(guix inferior)
+	(guix packages))
 
-(define-values (rz/linux rz/linux-libre-headers rz/linux-kernel-modules)
-  (let* ((channels
-          (list	(channel
-		 (name 'nonguix)
-		 (url "https://gitlab.com/nonguix/nonguix")
-		 (commit "440720b7b2ca4789298f3150bc82bf1b5ed4b8c9")
-		 (introduction
-		  (make-channel-introduction
-		   "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
-		   (openpgp-fingerprint
-		    "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
-		(channel
-		 (name 'guix)
-		 (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")
-	    (first (lookup-inferior-packages inferior "linux-libre-headers"))
-	    ;; TODO FIX
-	    (list (specification->package "v4l2loopback-linux-module")
-		  ))))
+(define-values (rz/linux
+		rz/linux-libre-headers
+		rz/linux-kernel-modules)
+  (values linux
+	  (specification->package "linux-libre-headers")
+	  (list (specification->package "v4l2loopback-linux-module"))))
 
 ;; TODO FIX
 ;; (define dslr-webcam-config
@@ -102,7 +83,8 @@
                 (comment "Robby Zambito")
                 (group "users")
                 (home-directory "/home/robby")
-                (supplementary-groups '("wheel"
+                (supplementary-groups '("cgroup"
+					"wheel"
 					"netdev"
 					"audio"
 					"video"
@@ -131,6 +113,7 @@
 						   "ntfs-3g"
 						   "pipewire"
 						   ;; "purple-mattermost"
+						   "podman-compose"
 						   "ripgrep"
 ;; TODO fix
 						   ;; "rocm-cmake"
@@ -180,7 +163,12 @@
 	   (service dbus-root-service-type)
 	   ;; (service containerd-service-type)
 	   ;; (service docker-service-type)
-	   (service rootless-podman-service-type)
+	   (service rootless-podman-service-type
+		    (rootless-podman-configuration
+                     (subgids
+                      (list (subid-range (name "robby"))))
+                     (subuids
+                      (list (subid-range (name "robby"))))))
 	   (service elogind-service-type)
 	   ;; (service sddm-service-type
 	   ;; 	    (sddm-configuration