Move dwm packages to their own file

6 files changed, 139 insertions, 103 deletions

diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm
index 04251b1..4967bde 100644
--- a/.config/guix/hati.scm
+++ b/.config/guix/hati.scm
@@ -14,8 +14,9 @@
   #:use-module (gnu services guix)
   #:use-module (guix gexp)
   #:use-module (modules base)
+  #:use-module (modules dwm)
+  #:use-module (modules utils)
   #:use-module (modules xorg)
-  #:use-module (modules mpd)
   #:use-module (modules ymir))
 
 
@@ -24,49 +25,51 @@
    (services
     `(,@bd-base-home-services
       ,@bd-desktop-home-services
+      ,@bd-dwm-home-services
       ,(service home-syncthing-service-type)))))
 
 
 (operating-system
- (inherit ymir)
- (host-name "hati")
+  (inherit ymir)
+  (host-name "hati")
 
- ;; (all packages are system wide)
- (packages
-  `(,@bd-base-system-packages
-    ,@bd-desktop-system-packages
-    ,@bd-mpd-package
+  ;; (all packages are system wide)
+  (packages
+   `(,@bd-base-system-packages
+     ,@bd-desktop-system-packages
+     ,@bd-dwm-system-packages
+     ,@bd-mpd-package
 
-    ;; machine-specific packages
-    ,@(list
-       xf86-video-nouveau)))
+     ;; machine-specific packages
+     ,@(list
+        xf86-video-nouveau)))
 
- (services
-  `(,@bd-base-system-services
-    ,@bd-desktop-system-services
-    ,@bd-mpd-service
-    ,(service guix-home-service-type
-              `((,username ,home)))))
+  (services
+   `(,@bd-base-system-services
+     ,@bd-desktop-system-services
+     ,@bd-mpd-service
+     ,(service guix-home-service-type
+               `((,username ,home)))))
 
- (mapped-devices (list (mapped-device
-                        (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563"))
-                        (target "hidden")
-                        (type luks-device-mapping))))
+  (mapped-devices (list (mapped-device
+                         (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563"))
+                         (target "hidden")
+                         (type luks-device-mapping))))
 
- (file-systems (cons* (file-system
-                       (mount-point "/boot/efi")
-                       (device (uuid
-                                "1448-51AE"
-                                'fat32))
-                       (type "vfat"))
-                      (file-system
-                       (mount-point "/home")
-                       (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)))
+  (file-systems (cons* (file-system
+                         (mount-point "/boot/efi")
+                         (device (uuid
+                                  "1448-51AE"
+                                  'fat32))
+                         (type "vfat"))
+                       (file-system
+                         (mount-point "/home")
+                         (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)))
diff --git a/.config/guix/kvasir.scm b/.config/guix/kvasir.scm
index 0ee5737..9f1f065 100644
--- a/.config/guix/kvasir.scm
+++ b/.config/guix/kvasir.scm
@@ -4,11 +4,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (kvasir)
-  #:use-module (base)
-  #:use-module (desktop)
   #:use-module (gnu)
   #:use-module (gnu home)
   #:use-module (gnu home services)
+  #:use-module (gnu home services dotfiles)
   #:use-module (gnu image)
   #:use-module (gnu packages)
   #:use-module (gnu packages linux)
@@ -16,14 +15,19 @@
   #:use-module (gnu services guix)
   #:use-module (gnu system image)
   #:use-module (guix gexp)
-  #:use-module (ymir))
+  #:use-module (modules base)
+  #:use-module (modules xorg)
+  #:use-module (modules ymir))
 
 
 (define home
   (home-environment
    (services
     `(,@bd-base-home-services
-      ,@bd-desktop-home-services))))
+      ,@bd-desktop-home-services
+      ,(service home-dotfiles-service-type
+                (home-dotfiles-configuration
+                 (directories '("/home/bdunahu/.dotfiles"))))))))
 
 
 (define system
diff --git a/.config/guix/modules/dwm.scm b/.config/guix/modules/dwm.scm
new file mode 100644
index 0000000..e73e127
--- /dev/null
+++ b/.config/guix/modules/dwm.scm
@@ -0,0 +1,40 @@
+(define-module (modules dwm)
+  #:use-module (gnu)
+  #:use-module (gnu home services)
+  #:use-module (gnu home services desktop)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:export (bd-dwm-system-packages
+            bd-dwm-home-services))
+
+(use-package-modules
+ image-viewers ;; sxiv
+ suckless ;; dwm
+ xdisorg ;; xdotool
+ xorg ;; xprop
+ )
+
+(define bd-dwm
+  (package
+    (inherit dwm)
+    (name "bdunahu-dwm")
+    (inputs (modify-inputs (package-inputs dwm)))
+    (source (local-file "dwm" #:recursive? #t))))
+
+(define bd-dwm-system-packages
+  (list
+   bd-dwm
+   sxiv
+   xdotool
+   xprop
+   ))
+
+(define bd-dwm-home-services
+  (list
+   (simple-service 'dotfiles
+                   home-files-service-type
+                   `((".Xresources"
+                      ,(plain-file "Xresources" "
+Sxiv.background: #000000
+Sxiv.foreground: #00C0FF
+"))))))
diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm
index cc9bdbc..7cfa312 100644
--- a/.config/guix/modules/xorg.scm
+++ b/.config/guix/modules/xorg.scm
@@ -12,7 +12,8 @@
   #:use-module (guix packages)
   #:export (bd-desktop-system-packages
             bd-desktop-system-services
-            bd-desktop-home-services))
+            bd-desktop-home-services
+            ))
 
 (use-service-modules audio desktop networking
                      sound xorg)
@@ -20,21 +21,14 @@
 (use-package-modules
  compton ;; picom
  emacs ;; emacs
- gnome ;; libnotify,
- image-viewers ;; sxiv, feh
+ gnome ;; libnotify
+ image-viewers ;; feh
  pulseaudio ;; pavucontrol, pulseaudio,
- suckless ;; dmenu,
- xorg ;; xprop, xf86-input-libinput, xf86-video-fbdev, xinit...
- xdisorg ;; xdotool
+ suckless ;; dmenu
+ xorg ;; xf86-input-libinput, xf86-video-fbdev, xinit...
+ xdisorg ;; xrdb
  )
 
-(define dwm-package
-  (package
-   (inherit dwm)
-   (name "bdunahu-dwm")
-   (inputs (modify-inputs (package-inputs dwm)))
-   (source (local-file "dwm" #:recursive? #t))))
-
 (define bd-desktop-system-packages
   (list
    dmenu
@@ -43,12 +37,8 @@
    pavucontrol
    picom
    pulseaudio
-   sxiv
-   xprop
 
-   dwm-package
    feh
-   xdotool
    xf86-input-libinput
    xf86-video-fbdev
    xinit
@@ -76,12 +66,7 @@
   (list
    (simple-service 'dotfiles
                    home-files-service-type
-                   `((".Xresources"
-                      ,(plain-file "Xresources" "
-Sxiv.background: #000000
-Sxiv.foreground: #00C0FF
-"))
-                     (".Xmodmap"
+                   `((".Xmodmap"
                       ,(plain-file "Xmodmap" "
 clear      lock
 clear   control
diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm
index 82411c0..a1ef44b 100644
--- a/.config/guix/vali.scm
+++ b/.config/guix/vali.scm
@@ -14,6 +14,7 @@
   #:use-module (gnu services guix)
   #:use-module (guix gexp)
   #:use-module (modules base)
+  #:use-module (modules dwm)
   #:use-module (modules utils)
   #:use-module (modules xorg)
   #:use-module (modules ymir))
@@ -24,50 +25,52 @@
    (services
     `(,@bd-base-home-services
       ,@bd-desktop-home-services
+      ,@bd-dwm-home-services
       ,(service home-syncthing-service-type)))))
 
 
 (operating-system
- (inherit ymir)
- (host-name "vali")
+  (inherit ymir)
+  (host-name "vali")
 
- ;; (all packages are system wide)
- (packages
-  `(,@bd-base-system-packages
-    ,@bd-desktop-system-packages
-    ,@bd-mpd-package
-    ;; ,@bd-games-packages
+  ;; (all packages are system wide)
+  (packages
+   `(,@bd-base-system-packages
+     ,@bd-desktop-system-packages
+     ,@bd-dwm-system-packages
+     ,@bd-mpd-package
+     ,@bd-games-packages
 
-    ;; machine-specific packages
-    ,@(list
-       brightnessctl)))
+     ;; machine-specific packages
+     ,@(list
+	brightnessctl)))
 
- (services
-  `(,@bd-base-system-services
-    ;; ,@bd-desktop-system-services
-    ,@bd-mpd-service
-    ,(service guix-home-service-type
-              `((,username ,home)))))
+  (services
+   `(,@bd-base-system-services
+     ,@bd-desktop-system-services
+     ,@bd-mpd-service
+     ,(service guix-home-service-type
+               `((,username ,home)))))
 
- (mapped-devices (list (mapped-device
-                        (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c"))
-                        (target "hidden")
-                        (type luks-device-mapping))))
+  (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")
-                       (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)))
+  (file-systems (cons* (file-system
+			 (mount-point "/boot/efi")
+			 (device (uuid
+                                  "8A13-7018"
+                                  'fat32))
+			 (type "vfat"))
+                       (file-system
+			 (mount-point "/home")
+			 (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)))
diff --git a/.gitignore b/.gitignore
index 035ef24..0e7232d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /.config/emacs/eshell/
 /.config/emacs/modules/bd--mail.el
 /.config/emacs/gnus-home/
+/.local/bin/