Merge home/system packages (temp?), use system home service

1 files changed, 49 insertions, 40 deletions

diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index e2ff0be..d0af866 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -4,63 +4,72 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (vali)
-  #:use-module (ymir)
+  #:use-module (base)
+  #:use-module (base1)
+  #: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 (gpg)
   #:use-module (guix gexp)
-  #:use-module (xdg)
+  #:use-module (mpd)
   #:use-module (shell)
   #:use-module (ssh)
-  #:use-module (gpg)
+  #:use-module (xdg)
   #:use-module (xserver)
-  #:use-module (base))
-
-
-(define system
-  (operating-system
-    (inherit ymir)
-    (host-name "vali")
-
-    (mapped-devices (list (mapped-device
-                           (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c"))
-                           (target "hidden")
-                           (type luks-device-mapping))))
-
-    (file-systems (cons* (file-system
-                           (mount-point "/boot/efi")
-                           (device (uuid
-                                    "8A13-7018"
-                                    '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
-                                    "69a3593b-12bd-40ad-a932-007674a8cfe8"
-                                    'ext4))
-                           (type "ext4")) %base-file-systems))))
+  #:use-module (ymir))
 
 
 (define home
   (home-environment
-   (packages
-    `(,@desktop-packages
-      ,@program-packages))
-
    (services
     `(,@xdg-service
       ,@shell-service
       ,@ssh-service
       ,@gpg-service
-      ,@base-services
+      ,@bd-base-services
       ,@xorg-services))))
 
 
-(if (getenv "RUNNING_GUIX_HOME") home system)
+(operating-system
+  (inherit ymir)
+  (host-name "vali")
+
+  ;; (all packages are system wide)
+  (packages
+   `(,@bd-base-system-packages
+     ,@bd-desktop-system-packages
+     ,@bd-mpd-package))
+
+  (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 "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c"))
+                         (target "hidden")
+                         (type luks-device-mapping))))
+
+  (file-systems (cons* (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid
+                                  "8A13-7018"
+                                  '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
+                                  "69a3593b-12bd-40ad-a932-007674a8cfe8"
+                                  'ext4))
+                         (type "ext4")) %base-file-systems)))