Fix rincewind configuration

3 files changed, 61 insertions, 5 deletions

diff --git a/oni/home/services/gnuzilla.scm b/oni/home/services/gnuzilla.scm
index 61b9c36..b7c0807 100644
--- a/oni/home/services/gnuzilla.scm
+++ b/oni/home/services/gnuzilla.scm
@@ -12,7 +12,8 @@
                           home-profile-service-type
                           home-files-service-type))
   #:use-module ((guix packages)
-                #:select (package?))
+                #:select (package?
+                          package-name))
   #:use-module ((guix gexp)
                 #:select (gexp
                           mixed-text-file))
@@ -49,7 +50,8 @@
   (list (home-icecat-configuration-package config)))
 
 (define (home-icecat-configuration-files config)
-  `((".mozilla/icecat/profiles.ini"
+  `((;; ,(string-append ".mozilla/" (package-name (home-icecat-configuration-package config)) "/profiles.ini")
+     ".librewolf/profiles.ini"
      ,(mixed-text-file
        "profiles.ini"
        "[Install4F96D1932A9F858E]\n"
@@ -65,7 +67,8 @@
        "[General]\n"
        "StartWithLastProfile=1\n"
        "Version=2\n"))
-    (".mozilla/icecat/default/user.js"
+    (;; ,(string-append ".mozilla/" (package-name (home-icecat-configuration-package config)) "/default/user.js")
+     ".librewolf/default/user.js"
      ,(mixed-text-file
        "user.js"
        (serialize-alist config (home-icecat-configuration-settings config))))))
diff --git a/oni/home/services/kdeconnect.scm b/oni/home/services/kdeconnect.scm
index 917a662..4d648d2 100644
--- a/oni/home/services/kdeconnect.scm
+++ b/oni/home/services/kdeconnect.scm
@@ -21,9 +21,19 @@
 (define (home-kdeconnect-shepherd-service config)
   (list
    (shepherd-service
+    (documentation "Start kdeconnectd")
+    (provision '(kdeconnectd))
+    (auto-start? #t)
+    (start
+     #~(make-forkexec-constructor
+        (list #$(file-append (home-kdeconnect-configuration-package config) "/bin/kdeconnectd"))
+        #:log-file (format #f "~a/.local/var/log/kdeconnectd.log" (getenv "HOME"))))
+    (stop #~(make-kill-destructor)))
+   (shepherd-service
     (documentation "Start kdeconnect")
     (provision '(kdeconnect))
-    (requirement '(statusbar))
+    (requirement '(kdeconnectd))
+    ;; (requirement '(statusbar))
     (auto-start? #t)
     (start
      #~(make-forkexec-constructor
diff --git a/oni/home/services/stumpwm.scm b/oni/home/services/stumpwm.scm
index 5f1a298..3b60a03 100644
--- a/oni/home/services/stumpwm.scm
+++ b/oni/home/services/stumpwm.scm
@@ -19,6 +19,9 @@
                           home-profile-service-type
                           home-xdg-configuration-files-service-type
                           home-run-on-change-service-type))
+  #:use-module ((gnu home services shepherd)
+                #:select (home-shepherd-service-type
+                          shepherd-service))
   #:use-module ((guix gexp)
                 #:select (local-file
                           gexp
@@ -37,6 +40,9 @@
             home-stumpwm-stumptray-service-type
             home-stumpwm-stumptray-configuration))
 
+(define (serialize-integer field value)
+  "")
+
 (define-configuration/no-serialization home-stumpwm-extension
   (configurations
    (text-config '())
@@ -49,6 +55,9 @@
   (configurations
    (text-config '())
    "The configuration to apply.")
+  (startup-delay
+   (integer 10)
+   "The number of seconds to wait for stumpwm to start up.")
   (stumpish-package
    (package stumpish)
    "Package to use for setting Stumpish"))
@@ -75,6 +84,36 @@
   `(("files/.config/stumpwm/config"
      ,#~(system* #$(file-append stumpish "/bin/stumpish") "reload"))))
 
+;; (define (stumpwm-mode-line-service config)
+;;   (list (shepherd-service
+;;          (documentation "Try and find out if the stumpwm mode line is enabled.")
+;;          (provision '(stumpwm-mode-line statusbar))
+;;          (modules '((ice-9 textual-ports)
+;;                     (srfi srfi-1)))
+;;          (start
+;;           #~(lambda ()
+;;               (let loop ((attempts #$(home-stumpwm-configuration-startup-delay config)))
+;;                 (let* ((input+output (pipe))
+;;                        ;; Use the timeout command here to stop it.
+;;                        (pid (spawn "timeout" '("timeout" "1" "stumpish" "eval" "(print (let ((ml (stumpwm::head-mode-line (current-head)))) (and ml (not (eq (stumpwm::mode-line-mode ml) :hidden)))))")
+;;                                    #:output (cdr input+output))))
+;;                   (let ((result (string= "T" (string-trim-right (get-string-all (car input+output))))))
+;;                     (close-port (car input+output))
+;;                     (close-port (cdr input+output))
+;;                     (waitpid pid)
+;;                     (if result
+;;                         result
+;;                         (if (zero? attempts)
+;;                             (begin
+;;                               (format (current-error-port)
+;;                                       "Stumpwm mode line did not show up; giving up.\n")
+;;                               #f)
+;;                             (begin
+;;                               (sleep 1)
+;;                               (loop (- attemps 1))))))))))
+;;          (stop #~(lambda (_) #f))
+;;          (respawn? #f))))
+
 (define home-stumpwm-service-type
   (service-type
    (name 'home-stumpwm)
@@ -87,7 +126,11 @@
            home-stumpwm-config-files)
           (service-extension
            home-run-on-change-service-type
-           reload-stumpwm-config-gexp)))
+           reload-stumpwm-config-gexp)
+          ;; (service-extension
+          ;;  home-shepherd-service-type
+          ;;  stumpwm-mode-line-service)
+          ))
    (compose identity)
    (extend home-stumpwm-extensions)
    (default-value (home-stumpwm-configuration))