From 9363fb88cf63813f6025e830020954ca4fd09b29 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Thu, 14 Apr 2022 01:39:25 -0700
Subject: Add herbstluftwm configuration with xsession extension

The herbstluftwm configuration isn't complete yet, it's only the package so far,
but it does extend the xsession service to include a line in xsession to execute
the window manager in a bit of a hacky way.

This also adds a ‘mixed-executable-file’ function which is the same as the
‘mixed-text-file’ except that it also sets the executable bit for the computed
file.
---
 oni/home/services/xsession.scm | 43 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

(limited to 'oni/home/services/xsession.scm')

diff --git a/oni/home/services/xsession.scm b/oni/home/services/xsession.scm
index 308106e..c6f06e7 100644
--- a/oni/home/services/xsession.scm
+++ b/oni/home/services/xsession.scm
@@ -4,20 +4,52 @@
   #:use-module (gnu home services utils)
   #:use-module (guix packages)
   #:use-module (guix gexp)
+  #:use-module (srfi srfi-1)
 
   #:export (home-xsession-service-type
-            home-xsession-configuration))
+            home-xsession-configuration
+            home-xsession-extension))
 
-(define-configuration/no-serialization home-xsession-configuration
+(define-configuration home-xsession-configuration
   (configuration
    (text-config '())
    "Configuration"))
 
+(define-configuration/no-serialization home-xsession-extension
+  (wm
+   (text-config '())
+   "String"))
+
+(define* (mixed-executable-file name #:key guile #:rest text)
+  "Return an object representing store file NAME containing TEXT.  TEXT is a
+sequence of strings and file-like objects, as in:
+
+  (mixed-text-file \"profile\"
+                   \"export PATH=\" coreutils \"/bin:\" grep \"/bin\")
+
+This is the declarative counterpart of 'text-file*'."
+  (define build
+    (let ((text (if guile (drop text 2) text)))
+      (gexp (call-with-output-file (ungexp output "out")
+              (lambda (port)
+                (set-port-encoding! port "UTF-8")
+                (display (string-append (ungexp-splicing text)) port)
+                (chmod port #o555))))))
+
+  (computed-file name build #:guile guile))
+
 (define (xsession-home-files config)
-  `(("xsession"
-     ,(mixed-text-file
+  `((".xsession"
+     ,(mixed-executable-file
        "xsession"
-       (string-join (home-xsession-configuration-configuration config) "\n")))))
+       (serialize-text-config 'configuration (home-xsession-configuration-configuration config))))))
+
+(define (home-xsession-extensions original-config extension-configs)
+  (home-xsession-configuration
+   (inherit original-config)
+   (configuration
+    (append (home-xsession-configuration-configuration original-config)
+            (home-xsession-extension-wm (last extension-configs))))))
 
 (define home-xsession-service-type
   (service-type
@@ -27,5 +59,6 @@
            home-files-service-type
            xsession-home-files)))
    (compose identity)
+   (extend home-xsession-extensions)
    (default-value (home-xsession-configuration))
    (description "Configure xsession.")))
-- 
cgit v1.2.3-54-g00ecf