From 917d2bfac08e5337d885399ef66028c099ef05ab Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@protonmail.com>
Date: Sat, 17 Aug 2024 22:43:06 +0200
Subject: [PATCH] feat: make wm better self-container

---
 home/dotfiles/dwl/print.sh          |  4 ++--
 home/modules/ruther/home/dwl/wm.scm | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/home/dotfiles/dwl/print.sh b/home/dotfiles/dwl/print.sh
index 6d5839a..eb8c3df 100755
--- a/home/dotfiles/dwl/print.sh
+++ b/home/dotfiles/dwl/print.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/usr/bin/env -S guix shell slurp grim wl-clipboard -- bash
 
 out="$HOME/screens/$(date +%Y/%Y%m%d_%H%M%S).png"
 
@@ -8,6 +8,6 @@ while getopts o:s arg; do case $arg in
                             ?|*) echo "usage: shot [-s] [-o out]" >&2; exit 1 ;;
                           esac; done
 
-grim ''${sel:+ -g "$sel"} "$out"
+grim ${sel:+ -g "$sel"} "$out"
 echo "$out"
 wl-copy -t image/png < "$out"
diff --git a/home/modules/ruther/home/dwl/wm.scm b/home/modules/ruther/home/dwl/wm.scm
index 0499121..c265496 100644
--- a/home/modules/ruther/home/dwl/wm.scm
+++ b/home/modules/ruther/home/dwl/wm.scm
@@ -57,22 +57,19 @@
                     #~(modify-phases #$original-phases
                         (add-after 'unpack 'add-config
                           (lambda _
-                            (copy-file #$(local-file "config.h") "config.h"))))))))))
+                            (copy-file #$(local-file "config.h") "config.h")
+                            (substitute* "config.h"
+                              (("\"foot\"") (string-append #$foot "/bin/foot"))
+                              (("\"rofi\"") (string-append #$rofi-wayland "/bin/rofi"))
+                              (("\"passmenu\"") (string-append #$password-store-wl "/bin/passmenu"))
+                              (("\"emacsclient\"") (string-append #$emacs-pgtk "/bin/emacsclient"))))))))))))
 
 ;; Packages I use when in the WM, it's dependent on those.
 (define wm-packages
   (specifications->manifest
-   '("waybar-mine"
-     "rofi-wayland"
-     "brillo"
+   '("brillo"
      "wlr-randr"
      "dwlmsg"
-     "wlopm"
-
-     "grim"
-     "slurp"
-
-     "swayidle"
 
      "password-store-wl"
 
-- 
2.48.1