Changed shell preferences, org capture templates, fixed vali.scm

1 files changed, 46 insertions, 38 deletions

diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index 2ace3b9..edcb62f 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -16,47 +16,55 @@
   #:use-module (shell)
   #:use-module (ssh)
   #:use-module (gpg)
+  #:use-module (bat)
+  #:use-module (xmodmap)
   #:use-module (base))
 
 
-(operating-system
- (inherit ymir)
- (host-name "vali")
-
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid
-                                "8A13-7018"
-                                'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/home/bdunahu/Personal")
-                       (device (uuid
-                                "020b73df-3991-4271-9d3f-dba00ad260ec"
-                                'ext4))
-                       (type "ext4"))
-                      (file-system
-                       (mount-point "/")
-                       (device (uuid
-                                "69a3593b-12bd-40ad-a932-007674a8cfe8"
-                                'ext4))
-                       (type "ext4")) %base-file-systems)))
-
-
-(home-environment
- (packages
-  `(,@desktop-packages
-    ,@program-packages
-    ,@emacs-packages))
-
- (services
-  `(,@xdg-service
-    ,@shell-service
-    ,@ssh-service
-    ,@gpg-service
-    ,@base-services
-    ,@bat-service
-    ,@xmodmap-service)))
+(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))))
+
+
+(define home
+  (home-environment
+   (packages
+    `(,@desktop-packages
+      ,@program-packages
+      ,@emacs-packages))
+
+   (services
+    `(,@xdg-service
+      ,@shell-service
+      ,@ssh-service
+      ,@gpg-service
+      ,@base-services
+      ,@bat-service
+      ,@xmodmap-service))))
 
 
 (if (getenv "RUNNING_GUIX_HOME") home system)