Change dotfiles structure, and add guix-channels declaration.

1 files changed, 21 insertions, 15 deletions

diff --git a/guix/jd/desktops/berserker.scm b/guix/jd/desktops/berserker.scm
index ed673db..37e7adc 100755
--- a/guix/jd/desktops/berserker.scm
+++ b/guix/jd/desktops/berserker.scm
@@ -1,5 +1,6 @@
 (define-module (jd desktops berserker)
   #:use-module (jd desktops base)
+  #:use-module (jd packages linux)
   #:use-module (gnu)
   #:use-module (gnu home))
 
@@ -10,30 +11,35 @@
 (define system
   (operating-system
    (inherit odin-non-free)
+   (kernel-loadable-modules (list xmm7360-pci))
    (host-name "berserker")
 
-   (bootloader (bootloader-configuration
+   
+  (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))))
+  (mapped-devices (list (mapped-device
+                          (source (uuid
+                                   "1f2b1bf2-89fe-4e2c-8b40-c460572bb776"))
+                          (target "crypthome")
+                          (type luks-device-mapping))))
 
-   (swap-devices (list (swap-space
-                        (target (uuid
-                                 "70ee2477-66ff-4856-aebf-8a77053c4462")))))
-
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "BE9B-69F0"
-                                       'fat32))
-                         (type "vfat"))
-
-                        (file-system
+  (file-systems (cons* (file-system
                          (mount-point "/")
                          (device (uuid
-                                  "d8783299-c180-4ca3-9c56-9826797f928d"
+                                  "66396ba1-bda9-46bd-ab26-5edc46b437d6"
                                   'ext4))
                          (type "ext4"))
-
-                        %base-file-systems))))
+                       (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "482A-B117"
+                                       'fat32))
+                         (type "vfat"))
+                       (file-system
+                         (mount-point "/home")
+                         (device "/dev/mapper/crypthome")
+                         (type "ext4")
+                         (dependencies mapped-devices)) %base-file-systems))))
 
 
 (if (getenv "JD_HOME") home system)