1 files changed, 32 insertions, 37 deletions
diff --git a/.config/guix/kvasir.scm b/.config/guix/kvasir.scm
index 1667f46..3260a28 100644
--- a/.config/guix/kvasir.scm
+++ b/.config/guix/kvasir.scm
@@ -3,7 +3,7 @@
 ;; OS declaration for 'kvasir', a bootable usb.    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (vali)
+(define-module (kvasir)
   #:use-module (ymir)
   #:use-module (gnu)
   #:use-module (gnu home)
@@ -23,39 +23,34 @@
 
 (define system
   (operating-system
-   (inherit ymir)
-   (host-name "kvasir")
-
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid
-                                  "8A13-7018"
-                                  'fat32))
-                         (type "vfat"))
-                        (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "69a3593b-12bd-40ad-a932-007674a8cfe8"))
-                         (type "ext4")) %base-file-systems))))
-
-(define MiB (expt 2 20))
-(define GiB (expt 2 30))
-
-(image
- (format 'disk-image)
- (operating-system system)
- (partitions
-  (list
-   (partition
-    (size (* 40 MiB))
-    (offset (* 1024 1024))
-    (label "GNU-ESP")
-    (file-system "vfat")
-    (flags '(esp))
-    (initializer (gexp initialize-efi-partition)))
-   (partition
-    (size (* 28 GiB))
-    (label root-label)
-    (file-system "ext4")
-    (flags '(boot))
-    (initializer (gexp initialize-root-partition))))))
+    (inherit ymir)
+    (host-name "kvasir")
+
+    (file-systems (cons* (file-system
+                           (mount-point "/boot/efi")
+                           (device (uuid
+                                    "8A13-7018"
+                                    'fat32))
+                           (type "vfat"))
+                         (file-system
+                           (mount-point "/")
+                           (device (uuid
+                                    "69a3593b-12bd-40ad-a932-007674a8cfe8"))
+                           (type "ext4")) %base-file-systems))))
+
+(define home
+  (home-environment
+   (packages
+    `(,@desktop-packages
+      ,@program-packages))
+
+   (services
+    `(,@xdg-service
+      ,@shell-service
+      ,@ssh-service
+      ,@gpg-service
+      ,@base-services
+      ,@xmodmap-service))))
+
+
+(if (getenv "RUNNING_GUIX_HOME") home system)