From 3a3906399d3b10c0b76ec1141edcb8e0450ce611 Mon Sep 17 00:00:00 2001
From: mir <mirmarq428@gmail.com>
Date: Fri, 11 Oct 2024 19:37:47 -0800
Subject: [PATCH] re-indent and fix spelling

---
 channels.scm |  5 ++--
 system.scm   | 72 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/channels.scm b/channels.scm
index a7d85a0..29b8007 100644
--- a/channels.scm
+++ b/channels.scm
@@ -17,7 +17,7 @@
             (openpgp-fingerprint
               "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
       (channel
-	(name 'michael_atlas)
+	(name 'michal_atlas)
 	(url "https://git.sr.ht/~michal_atlas/guix-channel")
 	(branch "master")
 	;;(introduction
@@ -26,4 +26,5 @@
 	;;    (openpgp-fingerprint
 	;;      "")
 	;;    ))
-	))
+	)
+)
diff --git a/system.scm b/system.scm
index 996ca46..82b9405 100644
--- a/system.scm
+++ b/system.scm
@@ -29,14 +29,15 @@
   (keyboard-layout (keyboard-layout "us"))
   (host-name "starscream")
 
+
   ;; The list of user accounts ('root' is implicit).
   (users (cons* (user-account
-                  (name "mir")
-                  (comment "Miranda Marquez")
-                  (group "users")
-                  (home-directory "/home/mir")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                %base-user-accounts))
+		  (name "mir")
+		  (comment "Miranda Marquez")
+		  (group "users")
+		  (home-directory "/home/mir")
+		  (supplementary-groups '("wheel" "netdev" "audio" "video")))
+		%base-user-accounts))
 
   ;; Packages installed system-wide.  Users can also install packages
   ;; under their own account: use 'guix search KEYWORD' to search
@@ -77,36 +78,45 @@
 				     )))
       (list (service gnome-desktop-service-type)
 
-                 ;; record as a second argument to 'service' below.
-                 (service openssh-service-type)
-                 (service cups-service-type)
-                 (set-xorg-configuration
-                  (xorg-configuration (keyboard-layout keyboard-layout))))
+	    ;; To configure OpenSSH, pass an 'openssh-configuration'
+	    ;; record as a second argument to 'service' below.
+	    (service openssh-service-type)
+	    (service cups-service-type)
+	    (set-xorg-configuration
+	      (xorg-configuration (keyboard-layout keyboard-layout)))
 
-           ;; This is the default list of services we
-           ;; are appending to.
-           %desktop-services))
+	    )
+      ;; This is the default list of services we
+      ;; are appending to.
+      ;%desktop-services ; already modified above?
+      ))
   (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets (list "/boot/efi"))
-                (keyboard-layout keyboard-layout)))
+		(bootloader grub-efi-bootloader)
+		(targets (list "/boot/efi"))
+		(keyboard-layout keyboard-layout)))
   (swap-devices (list (swap-space
-                        (target (uuid
-                                 "dc1220de-fbc4-4008-86d1-5c9b152cc32c")))))
+			(target 
+			 ; (uuid
+			 ;   "dc1220de-fbc4-4008-86d1-5c9b152cc32c")
+			 (file-system-label "swap")
+				))))
 
   ;; The list of file systems that get "mounted".  The unique
   ;; file system identifiers there ("UUIDs") can be obtained
   ;; by running 'blkid' in a terminal.
   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid ;"67E3-17ED"
-					"FBB5-2030"
-                                       'fat32))
-                         (type "vfat"))
-                       (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  ;"39ec24ba-7c1f-49ff-9af6-57ace91cfba5"
-					"25b6c953-f92e-47df-baf0-6a80bccba45f"
-                                  'ext4))
-                         (type "ext4")) %base-file-systems)))
+			 (mount-point "/boot/efi")
+			 (device (uuid ;"67E3-17ED"
+				   "FBB5-2030"
+				   'fat32))
+			 (type "vfat"))
+		       (file-system
+			 (mount-point "/")
+			 (device
+			   (file-system-label "guix-root")
+			   ;(uuid
+			   ;  "25b6c953-f92e-47df-baf0-6a80bccba45f" 
+			   ;  'ext4)
+			   )
+			 (type "ext4")) %base-file-systems)))
+