modules/rosenthal/examples/emacs/init-fonts.el

@@ -3,11 +3,10 @@
 ;;guix:font-adobe-source-serif
 ;;guix:font-google-noto-emoji
 ;;guix:font-sarasa-gothic
-;;guix:font-victor-mono
 (defvar nema--font-size 12 "Font size")
 (defvar nema-fonts '((sans     . "sans")
                      (serif    . "serif")
-                     (mono     . "Victor Mono")
+                     (mono     . "Sarasa Mono CL")
                      (cjk      . "Sarasa Mono CL")
                      (symbol   . "Noto Color Emoji")
                      (modeline . "Source Serif 4"))

modules/rosenthal/examples/foot/foot.ini

@@ -0,0 +1,4 @@
+font=monospace:size=12
+
+[environment]
+TERM=xterm-256color

modules/rosenthal/examples/mako.conf

@@ -0,0 +1,6 @@
+font=monospace 11
+text-color=#13181B
+background-color=#D2DEE9E0
+border-size=1
+border-color=#B3C6D3
+border-radius=5

modules/rosenthal/examples/niri.kdl

@@ -365,8 +365,8 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Mod+Return hotkey-overlay-title="Open a Terminal" { spawn "wezterm"; }
+    Mod+T hotkey-overlay-title="Open a Terminal: foot" { spawn "foot"; }
-    Mod+D hotkey-overlay-title="Run an Application" { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; }
+    Mod+D hotkey-overlay-title="Run an Application: rofi" { spawn "rofi" "-show" "drun"; }
     // Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
 
     // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc.
@@ -626,30 +626,9 @@ binds {
 }
 
 
-// Start user Shepherd.
+// Start user Shepherd
 spawn-at-startup "shepherd"
 
-// Noctalia shell.
-window-rule {
-    geometry-corner-radius 20
-    clip-to-geometry true
-}
-
-debug {
-  honor-xdg-activation-with-invalid-serial
-}
-
-// Needed for Emacs in the installer.
-prefer-no-csd
-
-// Needed for WezTerm in the installer.
-window-rule {
-    match app-id="org.wezfurlong.wezterm"
-    default-column-width { proportion 0.5; }
-    default-window-height { proportion 1.0; }
-}
-
-// Background color to match the wallpaper.
 overview {
     backdrop-color "#D2DEE9"
 }

modules/rosenthal/examples/noctalia-shell/settings.json

@@ -1,18 +0,0 @@
-{
-    "colorSchemes": {
-        "darkMode": false,
-        "predefinedScheme": "Nord"
-    },
-    "osd": {
-        "enabled": true,
-        "enabledTypes": [
-            0,
-            1,
-            2,
-            3
-        ]
-    },
-    "wallpaper": {
-        "enabled": false
-    }
-}

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

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

modules/rosenthal/examples/waybar/config.jsonc

@@ -0,0 +1,103 @@
+// -*- mode: jsonc -*-
+
+{
+    "layer": "top",
+    "height": 36,
+    "spacing": 5,
+    "modules-left": [
+        "temperature",
+        "cpu",
+        "memory",
+        "wlr/taskbar",
+    ],
+    "modules-center": [
+        "clock",
+    ],
+    "modules-right": [
+        "tray",
+        "wireplumber",
+        "backlight",
+        "battery",
+    ],
+    // left
+    "temperature": {
+        "critical-threshold": 80,
+        "format": "{temperatureC}\u00B0C",
+        "interval": 2,
+        "tooltip": false,
+    },
+    "cpu": {
+        "format": "CPU {usage}%",
+        "states": {
+            "full": 90,
+        },
+        "interval": 2,
+    },
+    "memory": {
+        "format": "RAM {percentage}%",
+        "states": {
+            "full": 90,
+        },
+        "interval": 2,
+    },
+    "wlr/taskbar": {
+        "format": "{icon}",
+        "icon-size": 16,
+        "tooltip-format": "{title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+    },
+    // center
+    "clock": {
+        "format": "{:%A, %B %d, %Y (%R)}",
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+            "mode"          : "year",
+            "mode-mon-col"  : 3,
+            "weeks-pos"     : "right",
+            "on-scroll"     : 1,
+            "format": {
+                "months":     "<span color='#FFEAD3'><b>{}</b></span>",
+                "days":       "<span color='#ECC6D9'><b>{}</b></span>",
+                "weeks":      "<span color='#99FFDD'><b>W{}</b></span>",
+                "weekdays":   "<span color='#FFCC66'><b>{}</b></span>",
+                "today":      "<span color='#FF6699'><b><u>{}</u></b></span>",
+            }
+        },
+        "actions":  {
+            "on-click-right": "mode",
+            "on-scroll-up": "tz_up",
+            "on-scroll-down": "tz_down",
+            "on-scroll-up": "shift_up",
+            "on-scroll-down": "shift_down",
+        }
+    },
+    // right
+    "tray": {
+        "spacing": 10,
+    },
+    "wireplumber": {
+        "scroll-step": 5,
+        "format": "{icon} {volume}%",
+        "format-icons": ["\uF026", "\uF027", "\uF028"],
+        "format-muted": "Muted {volume}%",
+        "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+        "on-click-right": "pavucontrol",
+    },
+    "backlight": {
+        "on-scroll-down": "light -U 5",
+        "on-scroll-up": "light -A 5",
+        "format": "{icon} {percent}%",
+        "format-icons": ["\uF186", "\uF0EB"],
+        "tooltip": false,
+    },
+    "battery": {
+        "interval": 60,
+        "states": {
+            "warning": 30,
+            "critical": 15,
+        },
+        "format": "{icon} {capacity}%",
+        "format-icons": ["\uF244", "\uF243", "\uF242", "\uF241", "\uF240"],
+    },
+}

modules/rosenthal/examples/waybar/style.css

@@ -0,0 +1,136 @@
+@define-color bg1    #D2DEE9;
+@define-color bg2    #13181B;
+
+@define-color red    #EC7875;
+@define-color green  #A3BE8C;
+
+/* Execute ‘guix shell python-pywal imagemagick -- wal -nstei <image>’, */
+/* then select colors from ‘~/.cache/wal/colors-waybar.css’. */
+@define-color color0 #AFB5AE;
+@define-color color1 #A7BAC9;
+@define-color color2 #B3C6D3;
+@define-color color3 #DBEDF3;
+@define-color color4 #A7BAC9;
+@define-color color5 #C2C2B5;
+@define-color color6 #939BA3;
+
+* {
+    font-size: 1.2rem;
+    background-color: transparent;
+    border-radius: 5px;
+}
+
+window {
+    color: @bg2;
+}
+
+tooltip {
+    background-color: @bg2;
+    border: 1px solid @bg2;
+}
+
+tooltip label {
+    color: @bg1;
+    text-shadow: none;
+}
+
+.modules-right {
+    margin: 10px 10px 0 0;
+}
+.modules-center {
+    margin: 10px 0 0 0;
+}
+.modules-left {
+    margin: 10px 0 0 10px;
+}
+
+#temperature,
+#cpu,
+#memory,
+#clock,
+#tray,
+#wireplumber,
+#backlight,
+#battery {
+    padding: 0 10px;
+    background-color: @bg1;
+    opacity: 0.95;
+}
+
+#taskbar {
+    color: @bg2;
+    background-color: @bg1;
+}
+
+#taskbar.empty {
+    background: transparent;
+}
+
+#taskbar button {
+    /* https://github.com/Alexays/Waybar/issues/3334 */
+    padding: 0;
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+#tray menu {
+    color: @bg2;
+    background-color: @bg1;
+}
+
+#tray menu menuitem:hover {
+    color: @bg1;
+    background-color: @bg2;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+}
+
+#tray {
+    background-color: @bg2;
+}
+
+#cpu.full,
+#memory.full,
+#temperature.critical,
+#wireplumber.muted,
+#battery.warning, #battery.critical {
+    background-color: @red;
+}
+
+#battery.charging, #battery.plugged {
+    background-color: @green;
+}
+
+#temperature {
+    background-color: @color0;
+}
+
+#cpu {
+    background-color: @color1;
+}
+
+#memory {
+    background-color: @color2;
+}
+
+#clock {
+    background-color: @color3;
+}
+
+#wireplumber {
+    background-color: @color4;
+}
+
+#backlight {
+    background-color: @color5;
+}
+
+#battery {
+    background-color: @color6;
+}

modules/rosenthal/services/cuirass.scm

@@ -165,6 +165,7 @@
         (services
          (cons (service cuirass-remote-worker-for-container
                  (cuirass-remote-worker-configuration
+                   (cuirass cuirass/hako)
                    (workers workers)
                    (server server)
                    (systems supported-systems)

modules/rosenthal/services/desktop.scm

@@ -37,7 +37,6 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
-  #:use-module (gnu packages polkit)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xorg)
@@ -60,8 +59,6 @@
             home-noctalia-shell-configuration
             home-noctalia-shell-service-type
 
-            home-polkit-gnome-service-type
-
             home-rofi-configuration
             home-rofi-service-type
 
@@ -337,28 +334,6 @@ compositor.")))
     (default-value (home-noctalia-shell-configuration))
     (description "")))
 
-
-;;;
-;;; polkit-gnome
-;;;
-
-(define (%home-polkit-gnome-shepherd _)
-  (list (shepherd-service
-          (provision '(polkit-gnome))
-          (start
-           #~(make-forkexec-constructor
-              (list #$(file-append polkit-gnome "/libexec/polkit-gnome-authentication-agent-1"))))
-          (stop #~(make-kill-destructor)))))
-
-(define home-polkit-gnome-service-type
-  (service-type
-    (name 'home-polkit-gnome)
-    (extensions
-     (list (service-extension home-shepherd-service-type
-                              %home-polkit-gnome-shepherd)))
-    (default-value #f)
-    (description "")))
-
 
 ;;;
 ;;; rofi
@@ -673,15 +648,24 @@ set-keymap us dvorak -o ctrl:nocaps\n")
     (".config/emacs/init-miscellaneous.el"
      ,(local-file "../examples/emacs/init-miscellaneous.el"))
 
+    (".config/foot/foot.ini"
+     ,(local-file "../examples/foot/foot.ini"))
+    (".config/mako/config"
+     ,(local-file "../examples/mako.conf"))
     (".config/niri/config.kdl"
      ,(local-file "../examples/niri.kdl"))
-    (".cache/noctalia/shell-state.json"
+    (".config/rofi/config.rasi"
-     ,(local-file "../examples/noctalia-shell/shell-state.json"))
+     ,(plain-file "rofi.rasi" "\
-    (".config/noctalia/settings.json"
+configuration {
-     ,(local-file "../examples/noctalia-shell/settings.json"))
+    icon-theme: \"Qogir\";
+}
+@theme \"/run/current-system/profile/share/rofi/themes/fullscreen-preview.rasi\"\n"))
+    (".config/waybar/config.jsonc"
+     ,(local-file "../examples/waybar/config.jsonc"))
+    (".config/waybar/style.css"
+     ,(local-file "../examples/waybar/style.css"))
     (".config/xfce4/helpers.rc"
-     ,(plain-file "helpers.rc" "TerminalEmulator=open-wezterm-here\n"))
+     ,(plain-file "helpers.rc" "TerminalEmulator=rofi-sensible-terminal\n"))
-
     ;; Selected from the default skeletons.
     (".config/gdb/gdbinit" ,%default-gdbinit)
     (".config/nano/nanorc" ,%default-nanorc)