more guix laptop configs

guix/config.scm

@@ -9,14 +9,21 @@
 
 ;; Indicate which modules to import to access the variables
 ;; used in this configuration.
-(use-modules (gnu))
-(use-modules (gnu packages xorg))
+(use-modules (gnu)
+	     (gnu packages xorg)
+	     (gnu packages shells)
+	     (gnu packages linux)
+	     (gnu packages networking)
+	     (gnu packages glib)
+	     (gnu services dbus))
 (use-service-modules cups desktop networking ssh xorg)
+(use-package-modules audio)
 
 (operating-system
   (locale "en_US.utf8")
   (timezone "America/New_York")
-  (keyboard-layout (keyboard-layout "us"))
+  (keyboard-layout (keyboard-layout "us" 
+				    #:options '("ctrl:nocaps"))) ; swapcaps to swap
   (host-name "x220")
 
   ;; The list of user accounts ('root' is implicit).
@@ -24,8 +31,9 @@
                   (name "green")
                   (comment "Green")
                   (group "users")
+		  (shell (file-append fish "/bin/fish"))
                   (home-directory "/home/green")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
+                  (supplementary-groups '("wheel" "netdev" "audio" "video" )))
                 %base-user-accounts))
 
   ;; Packages installed system-wide.  Users can also install packages
@@ -37,7 +45,13 @@
 	(specification->package "nss-certs")
 	xorg-server
 	xinit
-	setxkbmap)
+	setxkbmap
+	fish
+	pipewire
+	wireplumber
+	blueman
+	bluez
+	dbus)
       %base-packages))
 
   ;; Below is the list of system services.  To search for available
@@ -48,18 +62,22 @@
                  (service ntp-service-type)
                  (service gpm-service-type)
                  (service slim-service-type)
+		 (service bluetooth-service-type)
+		 (service dbus-root-service-type)
                  (service cups-service-type))
 
            ;; This is the default list of services we
            ;; are appending to.
            %base-services))
+
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))
-                (keyboard-layout keyboard-layout)))
+		 (keyboard-layout keyboard-layout)))
+
   (mapped-devices (list (mapped-device
                           (source (uuid
-                                   "c17293fe-4c21-4425-b74a-f074c6f011d2"))
+                                   "2eeecbe8-d213-4773-a431-15757915ee39"))
                           (target "cryptroot")
                           (type luks-device-mapping))))
 
@@ -68,7 +86,7 @@
   ;; by running 'blkid' in a terminal.
   (file-systems (cons* (file-system
                          (mount-point "/boot/efi")
-                         (device (uuid "9324-790E"
+                         (device (uuid "0A77-ACFA"
                                        'fat32))
                          (type "vfat"))
                        (file-system