guix: reinstall chaman, from scratch

[~bandali/configs] / .config / guix / system / chaman.scm

diff --git a/.config/guix/system/chaman.scm b/.config/guix/system/chaman.scm
index 390b65f..e40a11c 100644 (file)
--- a/.config/guix/system/chaman.scm
+++ b/.config/guix/system/chaman.scm
@@ -1,50 +1,56 @@
-;; This is an operating system configuration generated
-;; by the graphical installer.
-
 (use-modules (gnu))
 (use-service-modules desktop networking ssh xorg)
 
 (operating-system
-  (locale "en_CA.utf8")
-  (timezone "America/Toronto")
-  (keyboard-layout
-    (keyboard-layout "us" "altgr-intl"))
-  (bootloader
-    (bootloader-configuration
-      (bootloader grub-bootloader)
-      (target "/dev/sda")
-      (keyboard-layout keyboard-layout)))
-  (mapped-devices
-    (list (mapped-device
-            (source
-              (uuid "3d9d579d-3626-4fb2-9c16-beae804f1cf9"))
-            (target "groot")
-            (type luks-device-mapping))))
-  (file-systems
-    (cons* (file-system
-             (mount-point "/")
-             (device "/dev/mapper/groot")
-             (type "ext4")
-             (dependencies mapped-devices))
-           %base-file-systems))
-  (host-name "chaman")
-  (users (cons* (user-account
-                  (name "bandali")
-                  (comment "")
-                  (group "users")
-                  (home-directory "/home/bandali")
-                  (supplementary-groups
-                    '("wheel" "netdev" "audio" "video")))
-                %base-user-accounts))
-  (packages
-    (append
-      (list (specification->package "nss-certs"))
-      %base-packages))
-  (services
-    (append
-      (list (service xfce-desktop-service-type)
-            (service openssh-service-type)
-            (set-xorg-configuration
-              (xorg-configuration
-                (keyboard-layout keyboard-layout))))
-      %desktop-services)))
+ (host-name "chaman")
+ (locale "en_CA.utf8")
+ (timezone "Canada/Eastern")
+ (keyboard-layout
+  (keyboard-layout "us" "basic"))
+ (bootloader
+  (bootloader-configuration
+   (bootloader grub-bootloader)
+   (target "/dev/sda")
+   (keyboard-layout keyboard-layout)))
+ (mapped-devices
+  (list (mapped-device
+         (source
+          (uuid "9a96bc64-ab47-49f9-aae0-d7ddeabc4011"))
+         (target "groot")
+         (type luks-device-mapping))
+        (mapped-device
+         (source
+          (uuid "8cb5bde9-fe13-4490-87a1-caf3e1a2ee52"))
+         (target "data")
+         (type luks-device-mapping))))
+ (file-systems
+  (cons* (file-system
+          (mount-point "/")
+          (device "/dev/mapper/groot")
+          (type "ext4")
+          (dependencies mapped-devices))
+         (file-system
+          (mount-point "/data")
+          (device "/dev/mapper/data")
+          (type "ext4")
+          (dependencies mapped-devices))
+         %base-file-systems))
+ (users
+  (cons* (user-account
+          (name "bandali")
+          (group "users")
+          (home-directory "/home/bandali")
+          (supplementary-groups
+           '("wheel" "netdev" "audio" "video")))
+         %base-user-accounts))
+ (packages
+  (append
+   (list (specification->package "nss-certs"))
+   %base-packages))
+ (services
+  (append
+   (list (service xfce-desktop-service-type)
+         (set-xorg-configuration
+          (xorg-configuration
+           (keyboard-layout keyboard-layout))))
+   %desktop-services)))