.

1 files changed, 66 insertions, 62 deletions

diff --git a/os/config.scm b/os/config.scm
index 07db39f..758b25a 100644
--- a/os/config.scm
+++ b/os/config.scm
@@ -10,77 +10,81 @@
 ;; Indicate which modules to import to access the variables
 ;; used in this configuration.
 (use-modules (gnu)
+	     (srfi srfi-1)
 	     (nongnu packages linux)
 	     (nongnu system linux-initrd))
 (use-service-modules cups desktop networking ssh xorg nix)
 (use-package-modules package-management)
 
 (operating-system
-  (kernel linux)
-  (initrd microcode-initrd)
-  (firmware (list linux-firmware))
-  (locale "en_US.utf8")
-  (timezone "Asia/Nicosia")
-  (keyboard-layout (keyboard-layout "us" "colemak" #:options '("ctrl:nocaps")))
-  (host-name "guix")
+ (kernel linux)
+ (initrd microcode-initrd)
+ (firmware (list linux-firmware))
+ (locale "en_US.utf8")
+ (timezone "Asia/Nicosia")
+ (keyboard-layout (keyboard-layout "us" "colemak" #:options '("ctrl:nocaps")))
+ (host-name "guix")
 
-  ;; The list of user accounts ('root' is implicit).
-  (users (cons* (user-account
-                  (name "mccd")
-                  (comment "Marc")
-                  (group "users")
-                  (home-directory "/home/mccd")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                %base-user-accounts))
+ ;; The list of user accounts ('root' is implicit).
+ (users (cons* (user-account
+                (name "mccd")
+                (comment "Marc")
+                (group "users")
+                (home-directory "/home/mccd")
+                (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
-  ;; for packages and 'guix install PACKAGE' to install a package.
-  (packages (append (list (specification->package "emacs")
-                          (specification->package "emacs-exwm")
-                          (specification->package "nix")
-                          (specification->package "xf86-input-libinput")
-			  (specification->package "xf86-video-fbdev")
-			  (specification->package "xf86-video-nouveau")
-                          (specification->package "guile")
-			  (specification->package "texinfo")
-	                  (specification->package "man-db")
-			  (specification->package "man-pages")
-			  (specification->package "mandoc")
-                          (specification->package
-                           "emacs-desktop-environment")) %base-packages))
+ ;; Packages installed system-wide.  Users can also install packages
+ ;; under their own account: use 'guix search KEYWORD' to search
+ ;; for packages and 'guix install PACKAGE' to install a package.
+ (packages (append (list (specification->package "emacs")
+                         (specification->package "emacs-exwm")
+                         (specification->package "nix")
+                         (specification->package "xf86-input-libinput")
+			 (specification->package "xf86-video-fbdev")
+			 (specification->package "xf86-video-nouveau")
+                         (specification->package "guile")
+			 (specification->package "texinfo")
+	                 (specification->package "man-db")
+			 (specification->package "man-pages")
+			 (specification->package "adwaita-icon-theme")
+			 (specification->package "gsettings-desktop-schemas")			 
+			 (specification->package "mandoc")
+                         (specification->package
+                          "emacs-desktop-environment")) %base-packages))
 
-  ;; Below is the list of system services.  To search for available
-  ;; services, run 'guix system search KEYWORD' in a terminal.
-  (services
-   (append (list (service cups-service-type)
-		 (service nix-service-type)
-		 (simple-service 'block-distracting-sites
-				 hosts-service-type
-				 (list
-				  (host "127.0.0.1" "omni.se"
-					'("omni.se" "omni.se"))
-				  (host "127.0.0.1" "svt.se"
-					'("svt.se" "svt.se"))
-				  (host "127.0.0.1" "reddit.com/r/sweden"
-					'("reddit.com/r/sweden" "reddit.com/r/sweden"))
-				  (host "127.0.0.1" "reddit.com/r/decodingthegurus"
-					'("reddit.com/r/decodingthegurus" "reddit.com/r/decodingthegurus"))
-				  (host "127.0.0.1" "news.ycombinator.com"
-					'("news.ycombinator.com" "news.ycombinator.com"))
-				  (host "127.0.0.1" "lobste.rs"
-					'("lobste.rs" "lobste.rs"))))
-                 (set-xorg-configuration
-                  (xorg-configuration (keyboard-layout keyboard-layout))))
-	   (modify-services %desktop-services
-		   (guix-service-type config => (guix-configuration
-						 (inherit config)
-						 (substitute-urls
-						  (append (list "https://substitutes.nonguix.org")
-							  %default-substitute-urls))
-						 (authorized-keys
-						  (append (list (local-file "./signing-key.pub"))
-							  %default-authorized-guix-keys)))))))
+ ;; Below is the list of system services.  To search for available
+ ;; services, run 'guix system search KEYWORD' in a terminal.
+ (services
+  (append (list (service cups-service-type)
+		(service nix-service-type)
+		(service startx-command-service-type
+			 (xorg-configuration (keyboard-layout keyboard-layout)))
+		(simple-service 'block-distracting-sites
+				hosts-service-type
+				(list
+				 (host "127.0.0.1" "omni.se"
+				       '("omni.se" "omni.se"))
+				 (host "127.0.0.1" "svt.se"
+				       '("svt.se" "svt.se"))
+				 (host "127.0.0.1" "reddit.com/r/sweden"
+				       '("reddit.com/r/sweden" "reddit.com/r/sweden"))
+				 (host "127.0.0.1" "reddit.com/r/decodingthegurus"
+				       '("reddit.com/r/decodingthegurus" "reddit.com/r/decodingthegurus"))
+				 (host "127.0.0.1" "news.ycombinator.com"
+				       '("news.ycombinator.com" "news.ycombinator.com"))
+				 (host "127.0.0.1" "lobste.rs"
+				       '("lobste.rs" "lobste.rs")))))
+	  (modify-services %desktop-services
+			   (delete gdm-service-type)
+			   (guix-service-type config => (guix-configuration
+							 (inherit config)
+							 (substitute-urls
+							  (append (list "https://substitutes.nonguix.org")
+								  %default-substitute-urls))
+							 (authorized-keys
+							  (append (list (local-file "./signing-key.pub"))
+								  %default-authorized-guix-keys)))))))
 
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)