From f1f47b6e2d9caaa58102b39ab457c388eb260707 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Fri, 27 Jun 2025 10:43:26 +0800
Subject: [PATCH] services: shellutils: Avoid dynamic extensions.

This would create different service type objects.

* modules/rosenthal/services/shellutils.scm (%home-atuin-fish)
(home-atuin-service-type, %home-direnv-fish, home-direnv-service-type)
(%home-zoxide-fish, home-zoxide-service-type): Avoid dynamically extensions.
---
 modules/rosenthal/services/shellutils.scm | 48 ++++++++++-------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/modules/rosenthal/services/shellutils.scm b/modules/rosenthal/services/shellutils.scm
index 784aa8a..d03ef2d 100644
--- a/modules/rosenthal/services/shellutils.scm
+++ b/modules/rosenthal/services/shellutils.scm
@@ -45,21 +45,19 @@
 (define %home-atuin-fish
   (match-record-lambda <home-atuin-configuration>
       (atuin shells)
-    (if (member 'fish shells)
-        (home-fish-extension
-          (config
+    (home-fish-extension
+      (config
+       (if (member 'fish shells)
            (list (mixed-text-file "atuin.fish"
-                   atuin "/bin/atuin init fish | source\n")))))))
+                   atuin "/bin/atuin init fish | source\n"))
+           '())))))
 
 (define home-atuin-service-type
   (service-type
     (name 'atuin)
     (extensions
-     `(,@(if %home-atuin-fish
-             (list (service-extension home-fish-service-type
-                                      %home-atuin-fish))
-
-             '())))
+     (list (service-extension home-fish-service-type
+                              %home-atuin-fish)))
     (description "")))
 
 
@@ -78,21 +76,19 @@
 (define %home-direnv-fish
   (match-record-lambda <home-direnv-configuration>
       (direnv shells)
-    (if (member 'fish shells)
-        (home-fish-extension
-          (config
+    (home-fish-extension
+      (config
+       (if (member 'fish shells)
            (list (mixed-text-file "direnv.fish"
-                   direnv "/bin/direnv hook fish | source\n")))))))
+                   direnv "/bin/direnv hook fish | source\n"))
+           '())))))
 
 (define home-direnv-service-type
   (service-type
     (name 'direnv)
     (extensions
-     `(,@(if %home-direnv-fish
-             (list (service-extension home-fish-service-type
-                                      %home-direnv-fish))
-
-             '())))
+     (list (service-extension home-fish-service-type
+                              %home-direnv-fish)))
     (description "")))
 
 
@@ -111,19 +107,17 @@
 (define %home-zoxide-fish
   (match-record-lambda <home-zoxide-configuration>
       (zoxide shells)
-    (if (member 'fish shells)
-        (home-fish-extension
-          (config
+    (home-fish-extension
+      (config
+       (if (member 'fish shells)
            (list (mixed-text-file "zoxide.fish"
-                   zoxide "/bin/zoxide init --cmd cd fish | source\n")))))))
+                   zoxide "/bin/zoxide init --cmd cd fish | source\n"))
+           '())))))
 
 (define home-zoxide-service-type
   (service-type
     (name 'zoxide)
     (extensions
-     `(,@(if %home-zoxide-fish
-             (list (service-extension home-fish-service-type
-                                      %home-zoxide-fish))
-
-             '())))
+     (list (service-extension home-fish-service-type
+                              %home-zoxide-fish)))
     (description "")))