Merge pull request 'Feat/jupiter seerr rename' (#16) from feat/jupiter-seerr-rename into feat/hermes-webpage-port

Reviewed-on: #16

.sops.yaml

@@ -1,7 +1,7 @@
 keys:
   - &admin_finn age1a0v442ct2qfjcdhyktn25spw02yq4fl08plrrvuradwwxzsle4mq8thln4
   - &host_mibook age1n3uqtee5ymykrls6k04dznq50cwmj99hw7ny83yxjndt4y2ncf5qhjwa2p
-  # - &host_jupiter age1...   # TODO: Phase 9, see docs/secrets.md
+  - &host_jupiter age15uxuaxhn2hr4ypmgll36fwnkdkvv6gynvlxuc2p8ek0enmxmr5rsvlq0r2
 
 creation_rules:
   - path_regex: ^secrets/mibook\.yaml$
@@ -9,9 +9,11 @@ creation_rules:
       - age:
           - *admin_finn
           - *host_mibook
-  # - path_regex: ^secrets/jupiter\.yaml$   # TODO: Phase 9
+  - path_regex: ^secrets/jupiter\.yaml$
-  #   key_groups:
+    key_groups:
-  #     - age: [ *admin_finn, *host_jupiter ]
+      - age:
-  # - path_regex: ^secrets/common\.yaml$    # TODO: Phase 9
+          - *admin_finn
+          - *host_jupiter
+  # - path_regex: ^secrets/common\.yaml$    # TODO: only if/when a secret needs to be shared across both hosts
   #   key_groups:
   #     - age: [ *admin_finn, *host_mibook, *host_jupiter ]

flake.lock

@@ -21,11 +21,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1785627969,
+        "lastModified": 1788450739,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782949081,
+        "lastModified": 1788450739,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783008725,
+        "lastModified": 1788267358,
-        "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=",
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
         "uv2nix": "uv2nix"
       },
       "locked": {
-        "lastModified": 1788877844,
+        "lastModified": 1789999030,
-        "narHash": "sha256-9Ik9egIxYhW/IDw1mz/dYN0IqLTP3bEe+LdEFtP9FWM=",
+        "narHash": "sha256-oqEWD3Ih/CDejvfWNXFhbwUxvU4RwQZQ9DrI5dD+P10=",
         "owner": "NousResearch",
         "repo": "hermes-agent",
-        "rev": "c8aa5608c24e3636e77c267650c0f1f52e44adb0",
+        "rev": "8f7b3b48fc61dc411cac6ebcb0aaaf451ba9c1cb",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1787274306,
+        "lastModified": 1789933661,
-        "narHash": "sha256-Qg9f9td5iphUWSQS6zmvyZWO1F+D7j8Z3U6dGyUTg08=",
+        "narHash": "sha256-GtfSaYgUPu91AafiBAQIVEwQiPfIOrgqwmxGtMNDtMI=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "649e823fb24ed118d72e613be35fa8ea1b64afe7",
+        "rev": "5711f8fed2fcff91a52646e2e856648eca86c331",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1787144466,
+        "lastModified": 1789978172,
-        "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=",
+        "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0471accf8d0a8210b31d947497d179ecc99e0021",
+        "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1783148766,
+        "lastModified": 1789344334,
-        "narHash": "sha256-H9+N+GFtsbVC8ZniHliChM7ndizxtqVZs6bnGOLM3WQ=",
+        "narHash": "sha256-it+7kNGnOOHBCEnl4SfZ7QtfGziH3EryzHqwvJpjAfg=",
-        "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
+        "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.4193.a50de1b7d8a5/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.9729.c3eea5b2156d/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -255,11 +255,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1785031560,
+        "lastModified": 1788057806,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
         "type": "github"
       },
       "original": {
@@ -286,11 +286,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1787135253,
+        "lastModified": 1789921291,
-        "narHash": "sha256-M5/r2v++FjVhdsxXYMb4BDJ5YLAdCWFt3aZotcshocA=",
+        "narHash": "sha256-uLLUj+TLUmBc6KrUzx76KZdPi5ZkI1ORR9A6lJUIZlo=",
-        "rev": "ffb3c9b700e759be2ef13237c9d8f953b32a1e46",
+        "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1058091.ffb3c9b700e7/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1077143.44a91898084f/nixexprs.tar.zst"
       },
       "original": {
         "id": "nixpkgs",
@@ -300,11 +300,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1789546076,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -313,11 +313,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1787101114,
+        "lastModified": 1789885152,
-        "narHash": "sha256-BA7sSNjLDuPGSOYBGpr6WQjke1MQ8AZpJ8GlYZM/mOc=",
+        "narHash": "sha256-lIL3uDaS4Q9Ks6klLrBlDr+XS71sbjMJFSipIp2yPjs=",
-        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
+        "rev": "6d663c0533ff269008fb84e45930151e37c99db9",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.8045.b18a4b905f8d/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.10304.6d663c0533ff/nixexprs.tar.zst"
       },
       "original": {
         "id": "nixpkgs",
@@ -415,11 +415,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788337237,
+        "lastModified": 1789890976,
-        "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
+        "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
+        "rev": "7214124c20c1542c90deb54af50e2f53ae02711f",
         "type": "github"
       },
       "original": {

machines/jupiter/configuration.nix

@@ -49,11 +49,22 @@
   # Try fix wifi disconnect
   networking.networkmanager.wifi.powersave = false;
 
-  # Disable hibernate completely
+  # Disable hibernate and suspend completely - this is a headless server.
+  # The board exposes a phantom ACPI lid switch (PNP0C0D) that fires a
+  # "closed" event when the HDMI cable is unplugged, which used to trigger
+  # a real suspend via logind's default HandleLidSwitch=suspend.
   powerManagement.enable = true;
   systemd.targets."hibernate".enable = false;
   systemd.targets."hybrid-sleep".enable = false;
   systemd.targets."suspend-then-hibernate".enable = false;
+  systemd.targets."suspend".enable = false;
+  systemd.targets."sleep".enable = false;
+
+  services.logind.settings.Login = {
+    HandleLidSwitch = "ignore";
+    HandleLidSwitchExternalPower = "ignore";
+    HandleLidSwitchDocked = "ignore";
+  };
 
   # Optional: kernel parameter to fully disable hibernation
   boot.kernelParams = [ "nohibernate" ];

machines/jupiter/environments.nix

@@ -10,13 +10,14 @@ _: {
     };
     actual.enable = false;
     audiobookshelf.enable = true;
+    claude-code.enable = true;
     kde-desktop.enable = false;
     radarr.enable = true;
     docker.enable = true;
     readarr.enable = true;
     sonarr.enable = true;
     jellyfin.enable = true;
-    jellyseerr.enable = true;
+    seerr.enable = true;
     immich.enable = true;
     development.enable = true;
     home-assistant.enable = true;

machines/jupiter/network.nix

@@ -4,7 +4,7 @@ _: {
   ];
 
   networking = {
-    domain = "jupiter.solar.internal";
+    domain = "jupiter";
     search = [ "jupiter.solar.internal" ];
   };
 }

machines/mibook/configuration.nix

@@ -16,6 +16,13 @@
   ];
 
   networking.hostName = "mibook";
+
+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 8 * 1024; # 8G, headroom for nix builds (7.7G RAM, no prior swap)
+    }
+  ];
   boot.loader.grub = {
     enable = true;
     device = "/dev/nvme0n1";

machines/mibook/network.nix

@@ -4,5 +4,6 @@ _: {
   # firewall otherwise blocks inbound connections from other devices.
   networking.firewall.allowedTCPPorts = [
     9119 # athena hermes dashboard
+    47823 # hermes agent ad-hoc webpage server
   ];
 }

modules/environments/default.nix

@@ -18,7 +18,7 @@
     ./readarr
     ./sonarr
     ./jellyfin
-    ./jellyseerr
+    ./seerr
     ./immich
     ./hermes-agent
   ];

modules/environments/development/default.nix

@@ -21,6 +21,7 @@ in
       neovim
       # jetbrains.idea-ultimate
       go
+      nodejs # bundles npm
       (python3.withPackages (
         ps: with ps; [
           jupyter # notebooks

modules/environments/hermes-agent/default.nix

@@ -20,6 +20,9 @@ in
       enable = true;
       # Deliberate pin, matches the approved design — bump on purpose, not by drift.
       settings.model.default = "anthropic/claude-sonnet-4-5";
+      # The Nix flake input is the source of truth for hermes's version here; its
+      # built-in self-updater polling GitHub independently just burns API quota.
+      settings.updates.check = false;
       environmentFiles = [ config.sops.secrets."hermes-env".path ];
       addToSystemPackages = true;
 

modules/environments/home-assistant/default.nix

@@ -54,14 +54,16 @@ in
       "f /var/lib/hass/scenes.yaml 0644 hass hass - []"
     ];
 
-    services.openthread-border-router = {
+    # Disabled: ZBT-2 antenna isn't connected, so otbr-agent can't reach the
-      enable = true;
+    # radio and just crash-loops on every switch.
-      package = pkgs.unstable.openthread-border-router;
+    # services.openthread-border-router = {
-      openFirewall = true;
+    #   enable = true;
-      backboneInterfaces = [ "enp3s0" ];
+    #   package = pkgs.unstable.openthread-border-router;
-      radio.device = "/dev/serial/by-id/usb-Nabu_Casa_ZBT-2_DCB4D9149C7C-if00";
+    #   openFirewall = true;
-      radio.baudRate = 460800;
+    #   backboneInterfaces = [ "enp3s0" ];
-    };
+    #   radio.device = "/dev/serial/by-id/usb-Nabu_Casa_ZBT-2_DCB4D9149C7C-if00";
+    #   radio.baudRate = 460800;
+    # };
 
     my.homepage.services = [
       {

modules/environments/homepage/bookmarks.nix

@@ -1,16 +1,4 @@
 [
-  {
-    Developer = [
-      {
-        Github = [
-          {
-            abbr = "GitLab - Smoothcloud";
-            href = "https://gitlab.smoothcloud.de/";
-          }
-        ];
-      }
-    ];
-  }
   {
     Social = [
       {

modules/environments/homepage/default.nix

@@ -12,91 +12,107 @@ let
   manualServices = import ./manual-services.nix;
   manualWidgets = import ./manual-widgets.nix;
 
-  groupedServices =
+  groupedServices = lib.foldl' (
-    lib.foldl'
+    acc: entry:
-      (
+    acc
-        acc: entry:
+    // {
-        acc
+      ${entry.group} = (acc.${entry.group} or [ ]) ++ [ entry ];
-        // {
-          ${entry.group} = (acc.${entry.group} or [ ]) ++ [ entry ];
-        }
-      )
-      { }
-      config.my.homepage.services;
-
-  homepageServices = lib.mapAttrsToList (
-    group: entries:
-    {
-      ${group} = map (
-        entry:
-        let
-          service = builtins.removeAttrs entry [
-            "group"
-            "name"
-          ];
-        in
-        {
-          ${entry.name} = lib.filterAttrs (_: value: value != null) service;
-        }
-      ) entries;
     }
-  ) groupedServices;
+  ) { } config.my.homepage.services;
+
+  homepageServices = lib.mapAttrsToList (group: entries: {
+    ${group} = map (
+      entry:
+      let
+        service = builtins.removeAttrs entry [
+          "group"
+          "name"
+        ];
+      in
+      {
+        ${entry.name} = lib.filterAttrs (_: value: value != null) service;
+      }
+    ) entries;
+  }) groupedServices;
+
+  # homepage-dashboard keeps only the first services.yaml list entry with a
+  # given group name (first match wins), so module-contributed and manual
+  # groups sharing a name (e.g. "Services") must be merged here rather than
+  # simply concatenated, or the later ones are silently dropped.
+  mergeGroups =
+    lists:
+    let
+      merged = lib.foldl' (
+        acc: groupAttrs:
+        let
+          groupName = builtins.head (builtins.attrNames groupAttrs);
+        in
+        acc // { ${groupName} = (acc.${groupName} or [ ]) ++ groupAttrs.${groupName}; }
+      ) { } lists;
+    in
+    lib.mapAttrsToList (name: entries: { ${name} = entries; }) merged;
 in
 {
 
-  options.my.homepage.services = with lib; mkOption {
+  options.my.homepage.services =
-    type = types.listOf (
+    with lib;
-      types.submodule {
+    mkOption {
-        options = {
+      type = types.listOf (
-          group = mkOption {
+        types.submodule {
-            type = types.str;
+          options = {
-            description = "Homepage service group";
+            group = mkOption {
-          };
+              type = types.str;
+              description = "Homepage service group";
+            };
 
-          name = mkOption {
+            name = mkOption {
-            type = types.str;
+              type = types.str;
-            description = "Homepage service name";
+              description = "Homepage service name";
-          };
+            };
 
-          description = mkOption {
+            description = mkOption {
-            type = types.str;
+              type = types.str;
-            description = "Homepage service description";
+              description = "Homepage service description";
-          };
+            };
 
-          href = mkOption {
+            href = mkOption {
-            type = types.str;
+              type = types.str;
-            description = "Homepage service URL";
+              description = "Homepage service URL";
-          };
+            };
 
-          icon = mkOption {
+            icon = mkOption {
-            type = types.nullOr types.str;
+              type = types.nullOr types.str;
-            default = null;
+              default = null;
-            description = "Optional Homepage service icon";
+              description = "Optional Homepage service icon";
+            };
           };
-        };
+        }
-      }
+      );
-    );
+      default = [ ];
-    default = [ ];
+      description = "Merged homepage service metadata contributed by repo modules.";
-    description = "Merged homepage service metadata contributed by repo modules.";
+    };
-  };
 
-  options.my.homepage.widgets = with lib; mkOption {
+  options.my.homepage.widgets =
-    type = types.listOf types.attrs;
+    with lib;
-    default = [ ];
+    mkOption {
-    description = "Widget definitions passed directly to services.homepage-dashboard.widgets. Each entry is an attrset like { resources = { cpu = true; memory = true; }; }.";
+      type = types.listOf types.attrs;
-  };
+      default = [ ];
+      description = "Widget definitions passed directly to services.homepage-dashboard.widgets. Each entry is an attrset like { resources = { cpu = true; memory = true; }; }.";
+    };
 
   options.my.profiles.homepage = with lib; {
     enable = mkEnableOption "getHomepage.dev Dashboard";
   };
 
   config = lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [ dashboardPort ];
+
     services.homepage-dashboard = {
       enable = true;
       listenPort = dashboardPort;
-      allowedHosts = "${dashboardHost}:${toString dashboardPort},localhost:${toString dashboardPort},127.0.0.1:${toString dashboardPort},jupiter.solar.internal:${toString dashboardPort}";
+      allowedHosts = "${dashboardHost}:${toString dashboardPort},192.168.178.65:${toString dashboardPort},localhost:${toString dashboardPort},127.0.0.1:${toString dashboardPort},jupiter:${toString dashboardPort},jupiter.solar.internal:${toString dashboardPort}";
       bookmarks = import ./bookmarks.nix;
-      services = homepageServices ++ manualServices;
+      services = mergeGroups (homepageServices ++ manualServices);
       widgets = config.my.homepage.widgets ++ manualWidgets;
     };
 

modules/environments/homepage/manual-services.nix

@@ -2,6 +2,13 @@
   # Example:
   {
     "Services" = [
+      {
+        "Athena Dashboard" = {
+          href = "http://mibook:9119";
+          description = "Hermes Agent messaging gateway";
+          icon = "mdi-robot-outline";
+        };
+      }
       {
         "Tesla - Dashboard" = {
           href = "https://grafana.smoothcloud.de";
@@ -10,10 +17,10 @@
         };
       }
       {
-        "GitLab" = {
+        "Gitea" = {
-          href = "https://gitlab.smoothcloud.de";
+          href = "https://git.rechberg.online";
-          description = "Selfhosted GitLab";
+          description = "Selfhosted Gitea";
-          icon = "gitlab.png";
+          icon = "gitea.png";
         };
       }
       {

modules/environments/immich/default.nix

@@ -18,6 +18,8 @@ in
   config = lib.mkIf cfg.enable {
     services.immich = {
       enable = true;
+      # nixos-26.05 pins immich 2.7.5; pull 3.x from the unstable overlay instead.
+      package = pkgs.unstable.immich;
       host = "0.0.0.0";
       inherit port;
       openFirewall = true;

modules/environments/seerr/default.nix

@@ -1,17 +1,17 @@
 # manages and downloads films
 { config, lib, ... }:
 let
-  cfg = config.my.profiles.jellyseerr;
+  cfg = config.my.profiles.seerr;
   hostName = config.networking.hostName;
   port = 5055;
 in
 {
-  options.my.profiles.jellyseerr = with lib; {
+  options.my.profiles.seerr = with lib; {
-    enable = mkEnableOption "JellySeerr Media Service";
+    enable = mkEnableOption "Seerr Media Service";
   };
 
   config = lib.mkIf cfg.enable {
-    services.jellyseerr = {
+    services.seerr = {
       enable = true;
       openFirewall = true;
     };
@@ -19,14 +19,14 @@ in
     my.homepage.services = [
       {
         group = "Media";
-        name = "Jellyseerr";
+        name = "Seerr";
         description = "Media requests";
         href = "http://${hostName}:${toString port}";
         icon = "mdi-television-guide";
       }
     ];
 
-    systemd.services.jellyseerr = {
+    systemd.services.seerr = {
       after = [ "network-online.target" ];
     };
   };