guix: reinstall chaman, from scratch

diff --git a/.config/guix/system/chaman.scm b/.config/guix/system/chaman.scm
index 53ec86d..e40a11c 100644 (file)
--- a/.config/guix/system/chaman.scm
+++ b/.config/guix/system/chaman.scm
@@ -1,89 +1,56 @@
-(use-modules (gnu)
-             (gnu packages linux)
-             (srfi srfi-1))             ;for 'remove'
-(use-service-modules admin desktop mail networking pm ssh xorg)
+(use-modules (gnu))
+(use-service-modules desktop networking ssh xorg)

 
 (operating-system
 
 (operating-system

-  (host-name "chaman")
-  (locale "en_CA.utf8")
-  (timezone "America/Toronto")
-  (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 "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))
-  (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
-   (cons*
-    (service xfce-desktop-service-type)
-    (service openssh-service-type)
-    (set-xorg-configuration
-     (xorg-configuration
-      (keyboard-layout keyboard-layout)))
-    (dovecot-service #:config
-                     (dovecot-configuration
-                      ;; (log-path "/dev/stderr")
-                      (protocols (list (protocol-configuration
-                                        (name "imap"))))
-                      (ssl? "no")
-                      (listen '("127.0.0.1"))
-                      (disable-plaintext-auth? #f)
-                      (auth-mechanisms '("plain"))
-                      (postmaster-address "bandali@gnu.local")
-                      (mail-location "maildir:/home/bandali/mail/%d/%n/mail")
-                      (userdbs (list (userdb-configuration
-                                      (driver "static")
-                                      (args (list "uid=bandali" "gid=users" "home=/home/bandali/mail/%d/%n")))))
-                      (passdbs (list (passdb-configuration
-                                      (driver "passwd-file")
-                                      (args (list "/home/bandali/.config/dovecot/passwd")))))))
-    (service rottlog-service-type
-             (rottlog-configuration))
-    (service thermald-service-type)
-    (service tlp-service-type
-             (tlp-configuration
-              (cpu-boost-on-ac? #t)
-              (sound-power-save-on-bat 0)
-              (sound-power-save-controller? #f)
-              ;; (usb-blacklist "0e8f:00a8") ;for some reason doesn't seem to work
-              (usb-autosuspend? #f)))
-    (simple-service 'my-powertop-auto-tune activation-service-type
-                    #~(zero? (system* #$(file-append powertop "/sbin/powertop")
-                                      "--auto-tune")))
-    ;; (service slim-service-type
-    ;;          (slim-configuration
-    ;;           (display ":0")
-    ;;           (vt "vt7")))
-    ;; (service slim-service-type
-    ;;          (slim-configuration
-    ;;           (display ":1")
-    ;;           (vt "vt8")))
-    ;; (remove (lambda (service)
-    ;;           (eq? (service-kind service) gdm-service-type))
-    ;;         %desktop-services)
-    %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)))