From 5aeedc947b1321c71eff88ae92d0a6365624435d Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Mon, 23 Jun 2025 13:30:21 +0800
Subject: [PATCH] maint: Minor fixups.

---
 modules/rosenthal/examples/waybar/style.css | 1 -
 modules/rosenthal/services/base.scm         | 5 ++++-
 modules/rosenthal/services/cuirass.scm      | 9 +++++++--
 modules/rosenthal/services/desktop.scm      | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/rosenthal/examples/waybar/style.css b/modules/rosenthal/examples/waybar/style.css
index 250f5dd..975967b 100644
--- a/modules/rosenthal/examples/waybar/style.css
+++ b/modules/rosenthal/examples/waybar/style.css
@@ -20,7 +20,6 @@
 @define-color color7 #939ba3;
 
 * {
-    font-family: "Noto Sans";
     font-size: 1.2rem;
     background-color: transparent;
     border-radius: 5px;
diff --git a/modules/rosenthal/services/base.scm b/modules/rosenthal/services/base.scm
index ac8602c..0dd02bb 100644
--- a/modules/rosenthal/services/base.scm
+++ b/modules/rosenthal/services/base.scm
@@ -6,8 +6,11 @@
   #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (rosenthal utils packages)
+
   #:use-module (gnu services base)
+
   #:use-module (gnu packages bash)
+  #:use-module (rosenthal packages admin)
   #:export (greetd-tuigreet-session))
 
 (define-record-type* <greetd-tuigreet-session>
@@ -15,7 +18,7 @@
   greetd-tuigreet-session?
   this-greetd-tuigreet-session
   (tuigreet greetd-tuigreet-session-tuigreet
-            (default (spec->pkg "tuigreet"))))
+            (default tuigreet)))
 
 (define-gexp-compiler (greetd-tuigreet-session-compiler
                        (session <greetd-tuigreet-session>)
diff --git a/modules/rosenthal/services/cuirass.scm b/modules/rosenthal/services/cuirass.scm
index ab53cb1..764d100 100644
--- a/modules/rosenthal/services/cuirass.scm
+++ b/modules/rosenthal/services/cuirass.scm
@@ -5,24 +5,29 @@
 (define-module (rosenthal services cuirass)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
+
   #:use-module (guix gexp)
   #:use-module (guix modules)
   #:use-module (guix records)
   #:use-module (guix store)
   #:use-module (rosenthal utils packages)
-  #:use-module (gnu system)
+
   #:use-module (gnu bootloader)
   #:use-module (gnu bootloader grub)
+  #:use-module (gnu system)
   #:use-module (gnu system linux-container)
   #:use-module (gnu system file-systems)
   #:use-module (gnu system shadow)
+
   #:use-module (gnu services)
   #:use-module (gnu services admin)
   #:use-module (gnu services base)
   #:use-module (gnu services cuirass)
   #:use-module (gnu services databases)
   #:use-module (gnu services shepherd)
+
   #:use-module (gnu packages linux)
+  #:use-module (rosenthal packages ci)
   #:export (cuirass-worker-container-service-type
             cuirass-worker-container-configuration
             cuirass-worker-container-configuration?
@@ -159,7 +164,7 @@
         (services
          (cons (service cuirass-remote-worker-for-container
                  (cuirass-remote-worker-configuration
-                   (cuirass (spec->pkg "cuirass-hako"))
+                   (cuirass cuirass/hako)
                    (workers workers)
                    (server server)
                    (systems supported-systems)
diff --git a/modules/rosenthal/services/desktop.scm b/modules/rosenthal/services/desktop.scm
index 5a36cee..e49e7c4 100644
--- a/modules/rosenthal/services/desktop.scm
+++ b/modules/rosenthal/services/desktop.scm
@@ -339,7 +339,7 @@ compositor.")))
 configuration {
     icon-theme: \"Qogir\";
 }
-@theme \"" (spec->pkg "rofi") "/share/rofi/themes/fullscreen-preview.rasi\"\n"))
+@theme \"" (spec->pkg "rofi-wayland") "/share/rofi/themes/fullscreen-preview.rasi\"\n"))
 
 
 (define-record-type* <home-rofi-configuration>