Reconfigure hati.scm to work with new directory structure

1 files changed, 50 insertions, 47 deletions

diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm
index 8124afa..f1802cb 100644
--- a/.config/guix/hati.scm
+++ b/.config/guix/hati.scm
@@ -4,63 +4,66 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (hati)
-  #:use-module (ymir)
+  #:use-module (base)
+  #:use-module (desktop)
   #:use-module (gnu)
   #:use-module (gnu home)
-  #:use-module (gnu packages)
   #:use-module (gnu home services)
+  #:use-module (gnu packages)
   #:use-module (gnu services)
+  #:use-module (gnu services guix)
   #:use-module (guix gexp)
-  #:use-module (xdg)
-  #:use-module (shell)
-  #:use-module (ssh)
-  #:use-module (gpg)
-  #:use-module (xserver)
-  #:use-module (base))
-
+  #:use-module (mpd)
+  #:use-module (ymir))
 
-(define system
-  (operating-system
-   (inherit ymir)
-   (host-name "hati")
 
-   (mapped-devices (list (mapped-device
-                          (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563"))
-                          (target "hidden")
-                          (type luks-device-mapping))))
+(define home
+  (home-environment
+   (services
+    `(,@bd-base-home-services
+      ,@bd-desktop-home-services))))
 
-   (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid
-                                  "1448-51AE"
-                                  'fat32))
-                         (type "vfat"))
-                        (file-system
-                         (mount-point "/home/bdunahu/Personal")
-                         (device "/dev/mapper/hidden")
-                         (type "ext4")
-                         (dependencies mapped-devices))
-                        (file-system
-                         (mount-point "/")
-                         (device (uuid
-                                  "df334be4-5828-45b4-842a-9a8d97cfa40a"
-                                  'ext4))
-                         (type "ext4")) %base-file-systems))))
 
+(operating-system
+ (inherit ymir)
+ (host-name "hati")
 
-(define home
-  (home-environment
-   (packages
-    `(,@desktop-packages
-      ,@program-packages))
+ ;; (all packages are system wide)
+ (packages
+  `(,@bd-base-system-packages
+    ,@bd-desktop-system-packages
+    ,@bd-mpd-package
+    ,@(map specification->package
+           '(
+             "xf86-video-nouveau"
+             ))))
 
-   (services
-    `(,@xdg-service
-      ,@shell-service
-      ,@ssh-service
-      ,@gpg-service
-      ,@base-services
-      ,@xorg-services))))
+ (services
+  `(,@bd-base-system-services
+    ,@bd-desktop-system-services
+    ,@bd-mpd-service
+    ,(service guix-home-service-type
+              `(("bdunahu" ,home)))))
 
+ (mapped-devices (list (mapped-device
+                        (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563"))
+                        (target "hidden")
+                        (type luks-device-mapping))))
 
-(if (getenv "RUNNING_GUIX_HOME") home system)
+ (file-systems (cons* (file-system
+                       (mount-point "/boot/efi")
+                       (device (uuid
+                                "1448-51AE"
+                                'fat32))
+                       (type "vfat"))
+                      (file-system
+                       (mount-point "/home/bdunahu/Personal")
+                       (device "/dev/mapper/hidden")
+                       (type "ext4")
+                       (dependencies mapped-devices))
+                      (file-system
+                       (mount-point "/")
+                       (device (uuid
+                                "df334be4-5828-45b4-842a-9a8d97cfa40a"
+                                'ext4))
+                       (type "ext4")) %base-file-systems)))