2 files changed, 7 insertions, 57 deletions
diff --git a/guix/jd/desktops/berserker.scm b/guix/jd/desktops/berserker.scm
index 37e7adc..3d6b0df 100755
--- a/guix/jd/desktops/berserker.scm
+++ b/guix/jd/desktops/berserker.scm
@@ -1,45 +1,17 @@
 (define-module (jd desktops berserker)
  #:use-module (jd desktops base)
  #:use-module (jd packages linux)
+  #:use-module (jd utils)
  #:use-module (gnu)
  #:use-module (gnu home))
-(define home
+(define-public home
  (home-environment
   (services %jd-base-home-services)))
-(define system
+(define-public system
  (operating-system
   (inherit odin-non-free)
   (kernel-loadable-modules (list xmm7360-pci))
-   (host-name "berserker")
+   (host-name "berserker")))
-   
-  (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))))
-  (file-systems (cons* (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "66396ba1-bda9-46bd-ab26-5edc46b437d6"
-                                  'ext4))
-                         (type "ext4"))
-                       (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)
diff --git a/guix/jd/desktops/mimir.scm b/guix/jd/desktops/mimir.scm
index 7d9823d..e5db0b7 100644
--- a/guix/jd/desktops/mimir.scm
+++ b/guix/jd/desktops/mimir.scm
@@ -3,34 +3,12 @@
  #:use-module (gnu)
  #:use-module (gnu home))
-(define home
+(define-public home
  (home-environment
   (services %jd-base-home-services)))
-(define system
+(define-public system
  (operating-system
   (inherit odin-non-free)
-   (host-name "mimir")
+   (host-name "mimir")))
-   (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets (list "/boot/efi"))))
-   (swap-devices (list (swap-space
-                        (target (uuid
-                                 "5402ec34-85b8-4716-9c37-3d38c452ef98")))))
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "1A88-DB36"
-                                       'fat32))
-                         (type "vfat"))
-                        (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "640c44ea-125f-4410-a8de-3ec0fb3656c4"
-                                  'ext4))
-                         (type "ext4")) %base-file-systems))))
-(if (getenv "JD_HOME") home system)

diff --git a/guix/jd/desktops/berserker.scm b/guix/jd/desktops/berserker.scm index 37e7adc..3d6b0df 100755 --- a/guix/jd/desktops/berserker.scm +++ b/guix/jd/desktops/berserker.scm
@@ -1,45 +1,17 @@
1	(define-module (jd desktops berserker)	1	(define-module (jd desktops berserker)
2	#:use-module (jd desktops base)	2	#:use-module (jd desktops base)
3	#:use-module (jd packages linux)	3	#:use-module (jd packages linux)
		4	#:use-module (jd utils)
4	#:use-module (gnu)	5	#:use-module (gnu)
5	#:use-module (gnu home))	6	#:use-module (gnu home))
6		7
7	(define home	8	(define-public home
8	(home-environment	9	(home-environment
9	(services %jd-base-home-services)))	10	(services %jd-base-home-services)))
10		11
11	(define system	12	(define-public system
12	(operating-system	13	(operating-system
13	(inherit odin-non-free)	14	(inherit odin-non-free)
14	(kernel-loadable-modules (list xmm7360-pci))	15	(kernel-loadable-modules (list xmm7360-pci))
15	(host-name "berserker")	16	(host-name "berserker")))
16		17
17
18	(bootloader (bootloader-configuration
19	(bootloader grub-efi-bootloader)
20	(targets (list "/boot/efi"))))
21	(mapped-devices (list (mapped-device
22	(source (uuid
23	"1f2b1bf2-89fe-4e2c-8b40-c460572bb776"))
24	(target "crypthome")
25	(type luks-device-mapping))))
26
27	(file-systems (cons* (file-system
28	(mount-point "/")
29	(device (uuid
30	"66396ba1-bda9-46bd-ab26-5edc46b437d6"
31	'ext4))
32	(type "ext4"))
33	(file-system
34	(mount-point "/boot/efi")
35	(device (uuid "482A-B117"
36	'fat32))
37	(type "vfat"))
38	(file-system
39	(mount-point "/home")
40	(device "/dev/mapper/crypthome")
41	(type "ext4")
42	(dependencies mapped-devices)) %base-file-systems))))
43
44
45	(if (getenv "JD_HOME") home system)


diff --git a/guix/jd/desktops/mimir.scm b/guix/jd/desktops/mimir.scm index 7d9823d..e5db0b7 100644 --- a/guix/jd/desktops/mimir.scm +++ b/guix/jd/desktops/mimir.scm
@@ -3,34 +3,12 @@
3	#:use-module (gnu)	3	#:use-module (gnu)
4	#:use-module (gnu home))	4	#:use-module (gnu home))
5		5
6	(define home	6	(define-public home
7	(home-environment	7	(home-environment
8	(services %jd-base-home-services)))	8	(services %jd-base-home-services)))
9		9
10	(define system	10	(define-public system
11	(operating-system	11	(operating-system
12	(inherit odin-non-free)	12	(inherit odin-non-free)
13	(host-name "mimir")	13	(host-name "mimir")))
14
15	(bootloader (bootloader-configuration
16	(bootloader grub-efi-bootloader)
17	(targets (list "/boot/efi"))))
18
19	(swap-devices (list (swap-space
20	(target (uuid
21	"5402ec34-85b8-4716-9c37-3d38c452ef98")))))
22
23	(file-systems (cons* (file-system
24	(mount-point "/boot/efi")
25	(device (uuid "1A88-DB36"
26	'fat32))
27	(type "vfat"))
28	(file-system
29	(mount-point "/")
30	(device (uuid
31	"640c44ea-125f-4410-a8de-3ec0fb3656c4"
32	'ext4))
33	(type "ext4")) %base-file-systems))))
34
35	(if (getenv "JD_HOME") home system)
36		14