rosenthal: %rosenthal-skeletons: Compute .cache/noctalia/shell-state.json.

* modules/rosenthal/services/desktop.scm (%rosenthal-skeletons)
[.cache/noctalia/shell-state.json]: Replace to computed-file.

modules/rosenthal/examples/dot-cache/noctalia/shell-state.json

@@ -1,8 +0,0 @@
-{
-    "changelogState": {
-        "lastSeenVersion": "v4.4.3"
-    },
-    "telemetry": {
-        "instanceId": ""
-    }
-}

modules/rosenthal/examples/dot-config/niri/config.kdl

@@ -616,9 +616,8 @@ binds {
     // which ensures niri always processes them, even when an inhibitor is active.
     Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
 
-    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E hotkey-overlay-title="Restart Noctalia shell" { spawn "herd" "restart" "noctalia-shell"; }
-    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete hotkey-overlay-title="Open Noctalia shell session menu" { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; }
-    Ctrl+Alt+Delete { quit; }
 
     // Powers off the monitors. To turn them back on, do any input like
     // moving the mouse or pressing any other key.

modules/rosenthal/examples/dot-config/noctalia/settings.json

@@ -1,7 +1,6 @@
 {
     "appLauncher": {
-        "terminalCommand": "wezterm start --",
+        "terminalCommand": "wezterm start --"
-        "viewMode": "grid"
     },
     "colorSchemes": {
         "darkMode": false,

modules/rosenthal/examples/dot-config/wezterm/wezterm.lua

@@ -1,12 +1,8 @@
--- Keep WezTerm maximized so that the installer won't be resized.
--- https://wezterm.org/config/lua/gui-events/gui-startup.html
 local wezterm = require 'wezterm'
-local mux = wezterm.mux
+local config = wezterm.config_builder()
-local config = {}
 
-wezterm.on('gui-startup', function(cmd)
+-- Use Xwayland in the LiveCD so that we can change keyboard layout when
-  local tab, pane, window = mux.spawn_window(cmd or {})
+-- WezTerm is running.
-  window:gui_window():maximize()
+config.enable_wayland = false
-end)
 
 return config

modules/rosenthal/packages/wm.scm

@@ -25,6 +25,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages hardware)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
@@ -68,6 +69,9 @@
               (substitute* "Services/Power/IdleInhibitorService.qml"
                 (("systemd-inhibit")
                  (search-input-file inputs "bin/elogind-inhibit")))))
+          (add-after 'unpack 'reduce-output-size
+            (lambda _
+              (delete-file-recursively "Assets/Screenshots")))
           (add-after 'install 'make-wrapper
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((script "noctalia-shell"))
@@ -89,6 +93,7 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
                             "bin/cava"
                             "bin/cliphist"
                             "bin/convert"
+                            "bin/ddcutil"
                             "bin/fastfetch"
                             "bin/fc-list"
                             "bin/find"
@@ -118,6 +123,7 @@ exec ~a --config ~a/etc/xdg/quickshell/noctalia-shell \"$@\"~%"
            cava
            cliphist
            coreutils-minimal
+           ddcutil
            elogind
            fastfetch
            findutils

modules/rosenthal/services/desktop.scm

@@ -35,6 +35,7 @@
   #:use-module (gnu packages fcitx5)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages polkit)
@@ -312,6 +313,17 @@ compositor.")))
    (file-like noctalia-shell)
    "File-like object to provide @command{/bin/noctalia-shell}."))
 
+;; Create ~/.config/noctalia directory, otherwise Noctalia shell won't show up
+;; on initial startup.
+(define (%home-noctalia-shell-activation _)
+  (with-imported-modules (source-module-closure '((guix build utils)))
+    #~(begin
+        (use-modules (guix build utils))
+        (let ((xdg-config-home
+               (or (getenv "XDG_CONFIG_HOME")
+                   (in-vicinity (getenv "HOME") ".config"))))
+          (mkdir-p (in-vicinity xdg-config-home "noctalia"))))))
+
 (define %home-noctalia-shell-shepherd
   (match-record-lambda <home-noctalia-shell-configuration>
       (noctalia-shell)
@@ -329,10 +341,12 @@ compositor.")))
   (service-type
     (name 'home-noctalia-shell)
     (extensions
-     (list (service-extension home-shepherd-service-type
+     (list (service-extension home-profile-service-type
-                              %home-noctalia-shell-shepherd)
+                              (compose list home-noctalia-shell-configuration-noctalia-shell))
-           (service-extension home-profile-service-type
+           (service-extension home-activation-service-type
-                              (compose list home-noctalia-shell-configuration-noctalia-shell))))
+                              %home-noctalia-shell-activation)
+           (service-extension home-shepherd-service-type
+                              %home-noctalia-shell-shepherd)))
     (default-value (home-noctalia-shell-configuration))
     (description "")))
 
@@ -574,7 +588,20 @@ gtk-key-theme-name = ~a~%"
      ,(local-file "../examples/dot-config/xfce4/helpers.rc"))
     ;; Prevent Noctalia shell initial screen.
     (".cache/noctalia/shell-state.json"
-     ,(local-file "../examples/dot-cache/noctalia/shell-state.json"))
+     ,(computed-file "noctalia-shell-state.json"
+        (with-extensions (list guile-json-4)
+          #~(begin
+              (use-modules (json))
+              (call-with-output-file #$output
+                (lambda (port)
+                  (scm->json
+                   `(("changelogState"
+                      ("lastSeenVersion"
+                       . ,(string-append "v" #$(package-version noctalia-shell))))
+                     ("telemetry"
+                      ("instanceId" . "")))
+                   port
+                   #:pretty #t)))))))
 
     ;; Selected from the default skeletons.
     (".config/gdb/gdbinit" ,%default-gdbinit)