1 files changed, 27 insertions, 26 deletions

diff --git a/guix/jd/desktops/mimir.scm b/guix/jd/desktops/mimir.scm
index 185df08..742f8c5 100644
--- a/guix/jd/desktops/mimir.scm
+++ b/guix/jd/desktops/mimir.scm
@@ -1,35 +1,36 @@
 (define-module (jd desktops mimir)
   #:use-module (jd desktops base)
   #:use-module (gnu)
-  #:use-module (gnu services desktop))
+  #:use-module (gnu home))
 
+(define home
+  (home-environment
+   (services %jd-base-home-services)))
 
-(operating-system
- (inherit odin-non-free)
- (host-name "mimir")
+(define system
+  (operating-system
+   (inherit odin-non-free)
+   (host-name "mimir")
 
- (services (cons
-            (service xfce-desktop-service-type)
-            %jd-base-services))
- 
- (bootloader (bootloader-configuration
-              (bootloader grub-efi-bootloader)
-              (targets (list "/boot/efi"))))
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets (list "/boot/efi"))))
 
- 
- (swap-devices (list (swap-space
-                      (target (uuid
-                               "658793cb-d374-426e-bcd5-00d032b003a0")))))
+   (swap-devices (list (swap-space
+                        (target (uuid
+                                 "658793cb-d374-426e-bcd5-00d032b003a0")))))
 
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid "64D8-134F"
-                                     'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/")
-                       (device (uuid
-                                "1f9304b0-5623-4248-ab66-534b5ac85876"
-                                'ext4))
-                       (type "ext4")) %base-file-systems)))
+   (file-systems (cons* (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid "64D8-134F"
+                                       'fat32))
+                         (type "vfat"))
+                        (file-system
+                         (mount-point "/")
+                         (device (uuid
+                                  "1f9304b0-5623-4248-ab66-534b5ac85876"
+                                  'ext4))
+                         (type "ext4")) %base-file-systems))))
+
+(if (getenv "JD_HOME") home system)