manatee: Add services homepage with auto-discovery

Add a homepage module that generates a static landing page served on port 80 via nginx. Each service module registers itself via the shared mod.homepage.services option, so enabling a module automatically adds it to the page.
2026-02-28 21:46:44 +01:00
34 changed files with 253 additions and 528 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776702787,
+        "lastModified": 1770895474,
-        "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=",
+        "narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945",
+        "rev": "a494d50d32b5567956b558437ceaa58a380712f7",
        "type": "github"
      },
      "original": {
@@ -85,11 +85,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776613567,
+        "lastModified": 1769524058,
-        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
+        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
+        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
        "type": "github"
      },
      "original": {
@@ -106,11 +106,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1776936542,
+        "lastModified": 1771057865,
-        "narHash": "sha256-UEC1ywLxd+0bSX+qNWuooO2nrJAT7hRrLONyycG8gnE=",
+        "narHash": "sha256-Suny75DfQS3Mqd8ihiDZNsRs4CfRC3GiQDMmaFPj2qM=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "32f7f12480ae05b1f89d06161230ac16cb4656ef",
+        "rev": "56690eb79372e49054b0c2b87780fe3f86be7616",
        "type": "github"
      },
      "original": {
@@ -169,24 +169,6 @@
        "type": "github"
      }
    },
    "flake-utils_2": {
      "inputs": {
        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1731533236,
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@@ -237,11 +219,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776950293,
+        "lastModified": 1771037579,
-        "narHash": "sha256-t6KMARLILjPuTBSRoYanUxV+FU50IFZ7L5XVdOcdtaY=",
+        "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6837e0d6c5eda81fd26308489799fbf83a160465",
+        "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
        "type": "github"
      },
      "original": {
@@ -266,11 +248,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776511930,
+        "lastModified": 1753964049,
-        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
        "type": "github"
      },
      "original": {
@@ -295,11 +277,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776426399,
+        "lastModified": 1770511807,
-        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
        "type": "github"
      },
      "original": {
@@ -327,11 +309,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1776947531,
+        "lastModified": 1771026735,
-        "narHash": "sha256-DBE9ECXz4ItAyIZ0NCfccpjFjpLALvDbkLd62xDZPQI=",
+        "narHash": "sha256-vIzZ1Pb1o9xOXwGTdr09vRwGFgD/II6ZnGpnCfl8zz8=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "b65714e3b8e123fb2febd507905d25fa6abd0400",
+        "rev": "e80f705d76d4dbe836e0f57aadea994a624ac63e",
        "type": "github"
      },
      "original": {
@@ -347,11 +329,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776426061,
+        "lastModified": 1770889987,
-        "narHash": "sha256-3rROoGl8xBsIOM+5m+qZS4GJnsdQPAH3NJJe1OUfJ5o=",
+        "narHash": "sha256-JPbwE1Yg5t9zrMcOyDQwl1Pd8e0J1dtZf3kGnC7udwQ=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "1f71628d86a7701fd5ba0f8aeabe15376f4c6afc",
+        "rev": "8fdd69edefed16c9ab395b433a1c3323d5633f30",
        "type": "github"
      },
      "original": {
@@ -393,11 +375,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776426575,
+        "lastModified": 1767023960,
-        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
        "owner": "hyprwm",
        "repo": "hyprland-guiutils",
-        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
        "type": "github"
      },
      "original": {
@@ -418,11 +400,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772460177,
+        "lastModified": 1765214753,
-        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
        "type": "github"
      },
      "original": {
@@ -447,11 +429,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776426736,
+        "lastModified": 1767983607,
-        "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
+        "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
+        "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
        "type": "github"
      },
      "original": {
@@ -499,11 +481,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772462885,
+        "lastModified": 1764592794,
-        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
        "owner": "hyprwm",
        "repo": "hyprtoolkit",
-        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
        "type": "github"
      },
      "original": {
@@ -524,11 +506,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776428866,
+        "lastModified": 1770139857,
-        "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=",
+        "narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674",
+        "rev": "9038eec033843c289b06b83557a381a2648d8fa5",
        "type": "github"
      },
      "original": {
@@ -549,11 +531,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776430932,
+        "lastModified": 1770501770,
-        "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=",
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
        "type": "github"
      },
      "original": {
@@ -578,11 +560,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776728575,
+        "lastModified": 1770203293,
-        "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
+        "narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=",
        "owner": "hyprwm",
        "repo": "hyprwire",
-        "rev": "f3a80888783702a39691b684d099e16b83ed4702",
+        "rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98",
        "type": "github"
      },
      "original": {
@@ -591,27 +573,6 @@
        "type": "github"
      }
    },
    "komga-bookmanager": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1772988002,
        "narHash": "sha256-42Arpp+ShJorA9uR1nNlKuMoDx3y+cHg2BxQUW1fo7U=",
        "ref": "main",
        "rev": "bd5ae71978bb60eda28a010956825983dd931e2a",
        "revCount": 18,
        "type": "git",
        "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-bookmanager.git"
      },
      "original": {
        "ref": "main",
        "type": "git",
        "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-bookmanager.git"
      }
    },
    "komga-comictracker": {
      "inputs": {
        "nixpkgs": [
@@ -619,11 +580,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773858923,
+        "lastModified": 1771079752,
-        "narHash": "sha256-JOm+qe+loPxpjpTn2fN5QuqeGLDqYc1QevNeZZuEkdE=",
+        "narHash": "sha256-4Pw8MhQUVWcTH3fg31sP19k+qgHDxqSKtSoDU/CYf/Y=",
        "ref": "main",
-        "rev": "2ab63ae85af1e2009e4bce10940e8db56827d942",
+        "rev": "2b5cc59e3d4dba439a9a5f0d1fc2c30d9bdf45e1",
-        "revCount": 67,
+        "revCount": 32,
        "type": "git",
        "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-comictracker.git"
      },
@@ -633,7 +594,7 @@
        "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-comictracker.git"
      }
    },
-    "komga-reading-stats": {
+    "naviterm": {
      "inputs": {
        "flake-utils": "flake-utils",
        "nixpkgs": [
@@ -641,33 +602,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774185820,
+        "lastModified": 1770485744,
-        "narHash": "sha256-ASExCDbdujwneZ/tZeNXxzKPbUFLroBnmPBJ5jEniCI=",
+        "narHash": "sha256-ZJGHKtEWhpXyONjy6/popJz0uL2MXmknGr9Vr1B6BAk=",
        "ref": "main",
        "rev": "769bd540e8975050b2778025fdebc6fdd5c5e2b5",
        "revCount": 42,
        "type": "git",
        "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-reading-stats.git"
      },
      "original": {
        "ref": "main",
        "type": "git",
        "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-reading-stats.git"
      }
    },
    "naviterm": {
      "inputs": {
        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1773476909,
        "narHash": "sha256-hSg/7xFO+3G3wWFq1480OecREqTY+fu06L06rM2UBmQ=",
        "owner": "detoxify92",
        "repo": "naviterm",
-        "rev": "f89dbde00222fb1e4f611419d05583d8edee4c25",
+        "rev": "b311af7ae0ab095657264b5fe4a43b9118207584",
        "type": "gitlab"
      },
      "original": {
@@ -681,17 +620,16 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1773920367,
+        "lastModified": 1770930949,
-        "narHash": "sha256-ADGQjlsFzT9POglBkBJZcFqg3go4d+J3E4GS4WlxENY=",
+        "narHash": "sha256-ulX/6yOI9fmiiDqNjn59oLsVkABRo0M2Wkr2w8Ric64=",
        "owner": "viperML",
        "repo": "nh",
-        "rev": "b00a24b39944efd4ec7944f02e0bd9113d991767",
+        "rev": "b37b9a6ca31741282873dd8e335f66aad54f6326",
        "type": "github"
      },
      "original": {
        "owner": "viperML",
        "repo": "nh",
        "rev": "b00a24b39944efd4ec7944f02e0bd9113d991767",
        "type": "github"
      }
    },
@@ -716,14 +654,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "systems": "systems_5"
+        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1776531667,
+        "lastModified": 1771059595,
-        "narHash": "sha256-AFiJUWK8RDeL4c3s0XW3oSTkBqxxsQqUXrwHoJZfIm8=",
+        "narHash": "sha256-avvMQpGX/erjzPI10bN5uHDD08er5QC+pBypQisUNHs=",
        "owner": "nix-community",
        "repo": "nix-jetbrains-plugins",
-        "rev": "96ef56d2c967771d7f1f5436ac11e8cca5014d95",
+        "rev": "fb4b27d169c7fbfc92c9dfec971e9c87506cb8f0",
        "type": "github"
      },
      "original": {
@@ -734,11 +672,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1776830795,
+        "lastModified": 1770882871,
-        "narHash": "sha256-PAfvLwuHc1VOvsLcpk6+HDKgMEibvZjCNvbM1BJOA7o=",
+        "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "72674a6b5599e844c045ae7449ba91f803d44ebc",
+        "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
        "type": "github"
      },
      "original": {
@@ -750,11 +688,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772822230,
+        "lastModified": 1770770419,
-        "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
+        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
+        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
        "type": "github"
      },
      "original": {
@@ -766,27 +704,27 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1776734388,
+        "lastModified": 1767313136,
-        "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1776548001,
+        "lastModified": 1771008912,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
        "type": "github"
      },
      "original": {
@@ -827,11 +765,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776796298,
+        "lastModified": 1770726378,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
        "type": "github"
      },
      "original": {
@@ -848,9 +786,7 @@
        "home-manager": "home-manager_2",
        "hyprland": "hyprland",
        "hyprland-contrib": "hyprland-contrib",
        "komga-bookmanager": "komga-bookmanager",
        "komga-comictracker": "komga-comictracker",
        "komga-reading-stats": "komga-reading-stats",
        "naviterm": "naviterm",
        "nh": "nh",
        "nix-gc-env": "nix-gc-env",
@@ -922,21 +858,6 @@
        "type": "github"
      }
    },
    "systems_5": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
        "owner": "nix-systems",
        "repo": "default",
        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
        "repo": "default",
        "type": "github"
      }
    },
    "whib-backend": {
      "inputs": {
        "nixpkgs": [
@@ -944,11 +865,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774202723,
+        "lastModified": 1739029248,
-        "narHash": "sha256-z3kfGSm1EFzzUorewI5Jtgv79lPV128pZd8EEak4xZg=",
+        "narHash": "sha256-ux/Udy0Mhs66P/EQQ8S+xIuXRm9UHEYwSy12IZtlbnA=",
        "ref": "master",
-        "rev": "02ad04e1460d7ce84db24b3bb526339df1e76501",
+        "rev": "222a8f6dde2e9270f6390b5e1e83c7ae1ea48290",
-        "revCount": 372,
+        "revCount": 371,
        "type": "git",
        "url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
      },
@@ -1007,11 +928,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1776608502,
+        "lastModified": 1761431178,
-        "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=",
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
    };
    nh = {
-      url = "github:viperML/nh/b00a24b39944efd4ec7944f02e0bd9113d991767";
+      url = "github:viperML/nh";
    };
    nix-gc-env.url = "github:Julow/nix-gc-env";
@@ -74,18 +74,6 @@
      # url = "path:/home/alex/code/own/komga-comictracker";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    komga-bookmanager = {
      url = "git+ssh://gitea@git.ppp.pm:1122/alex/komga-bookmanager.git?ref=main";
      # url = "path:/home/alex/code/own/komga-bookmanager";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    komga-reading-stats = {
      url = "git+ssh://gitea@git.ppp.pm:1122/alex/komga-reading-stats.git?ref=main";
      # url = "path:/home/alex/code/own/komga-reading-stats";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };
  outputs =
--- a/hosts/manatee/modules/audiobookshelf/default.nix
+++ b/hosts/manatee/modules/audiobookshelf/default.nix
@@ -10,13 +10,11 @@ in
  };
  config = lib.mkIf enabled {
-    mod.homepage.services = [
+    mod.homepage.services = [{
-      {
+      name = "Audiobookshelf";
-        name = "Audiobookshelf";
+      port = 8000;
-        port = 8000;
+      description = "Audiobooks & podcasts";
-        description = "Audiobooks & podcasts";
+    }];
      }
    ];
    users.users.audiobookshelf = {
      isSystemUser = true;
--- a/hosts/manatee/modules/calibre-web/default.nix
+++ b/hosts/manatee/modules/calibre-web/default.nix
@@ -0,0 +1,40 @@
 { lib, config, ... }:
 let
  enabled = config.mod.calibre-web.enable;
 in
 {
  options = {
    mod.calibre-web = {
      enable = lib.mkEnableOption "add calibre-web module";
    };
  };
  config = lib.mkIf enabled {
    mod.homepage.services = [{
      name = "Calibre-Web";
      port = 8083;
      description = "E-book library";
    }];
    services = {
      calibre-web = {
        enable = true;
        user = "storage";
        group = "storage";
        listen = {
          ip = "0.0.0.0";
          port = 8083;
        };
        dataDir = "/mnt/media/public/books";
        options = {
          calibreLibrary = "/mnt/media/public/books";
          enableBookUploading = true;
        };
      };
    };
  };
 }
--- a/hosts/manatee/modules/certs/default.nix
+++ b/hosts/manatee/modules/certs/default.nix
@@ -20,19 +20,6 @@
          "--http-timeout=60"
        ];
      };
      "komga.ppp.pm" = {
        dnsProvider = "hetzner";
        environmentFile = config.age.secrets.hetzner-dns.path;
        group = "nginx";
        extraLegoFlags = [
          "--dns.resolvers=1.1.1.1:53,8.8.8.8:53"
          "--dns.propagation-wait=60s"
          "--dns-timeout=60"
          "--http-timeout=60"
        ];
      };
    };
  };
--- a/hosts/manatee/modules/default.nix
+++ b/hosts/manatee/modules/default.nix
@@ -16,6 +16,7 @@ in
      nginx.enable = true;
      syncthing.enable = true;
      transmission.enable = true;
      calibre-web.enable = true;
      audiobookshelf.enable = true;
      jellyfin.enable = true;
      immich.enable = true;
--- a/hosts/manatee/modules/home-assistant/default.nix
+++ b/hosts/manatee/modules/home-assistant/default.nix
@@ -62,14 +62,6 @@ let
  '';
 in
 {
  mod.homepage.services = [
    {
      name = "Home Assistant";
      port = 8123;
      description = "Home automation";
    }
  ];
  hardware.bluetooth.enable = true;
  virtualisation.oci-containers = {
@@ -162,13 +154,13 @@ in
    user = {
      timers = {
-        "update-hetzner-dns" = {
+        "update-hetzner-ha-dns" = {
          unitConfig = {
-            Description = "updates Hetzner DNS records";
+            Description = "updates Hetzner DNS for home-assistant";
          };
          timerConfig = {
-            Unit = "update-hetzner-dns.service";
+            Unit = "update-hetzner-ha-dns.service";
            OnCalendar = "*-*-* *:00/30:00";
            Persistent = true;
          };
@@ -178,9 +170,9 @@ in
      };
      services = {
-        "update-hetzner-dns" = {
+        "update-hetzner-ha-dns" = {
          unitConfig = {
-            Description = "updates Hetzner DNS records";
+            Description = "updates Hetzner DNS for home-assistant";
          };
          serviceConfig = {
@@ -190,41 +182,38 @@ in
          path = [
            pkgs.curl
-            pkgs.coreutils
+            pkgs.coreutils # For `cat`
            pkgs.jq
          ];
          script = ''
-            SUBDOMAINS="ha komga"
+            LAST_IP_FILE="/tmp/hetzner-dns-ha-ip"
            INTERFACE="enp3s0"
            CURRENT_IP=$(curl -s --fail --interface "$INTERFACE" ifconfig.me)
-            for SUBDOMAIN in $SUBDOMAINS; do
+            LAST_IP=""
-              LAST_IP_FILE="/tmp/hetzner-dns-''${SUBDOMAIN}-ip"
+            if [[ -f "$LAST_IP_FILE" ]]; then
                LAST_IP=$(cat "$LAST_IP_FILE")
            fi
-              LAST_IP=""
+            if [[ "$CURRENT_IP" == "$LAST_IP" ]]; then
-              if [[ -f "$LAST_IP_FILE" ]]; then
+                echo "IP unchanged, NOOP update."
-                  LAST_IP=$(cat "$LAST_IP_FILE")
+                exit 0
-              fi
+            else
                echo "Updating IP"
-              if [[ "$CURRENT_IP" == "$LAST_IP" ]]; then
+                JSON_BODY=$(jq -n --arg ip "$CURRENT_IP" '{records: [{value: $ip}]}')
                  echo "$SUBDOMAIN: IP unchanged, NOOP update."
              else
                  echo "$SUBDOMAIN: Updating IP"
-                  JSON_BODY=$(jq -n --arg ip "$CURRENT_IP" '{records: [{value: $ip}]}')
+                curl \
-
+                  --fail \
-                  curl \
+                	-X POST \
-                    --fail \
+                  -H "Authorization: Bearer $HETZNER_API_TOKEN" \
-                  	-X POST \
+                  -H "Content-Type: application/json" \
-                    -H "Authorization: Bearer $HETZNER_API_TOKEN" \
+                  -d "$JSON_BODY" \
-                    -H "Content-Type: application/json" \
+                  "https://api.hetzner.cloud/v1/zones/ppp.pm/rrsets/ha/A/actions/set_records" \
-                    -d "$JSON_BODY" \
+                  && echo $CURRENT_IP > $LAST_IP_FILE
-                    "https://api.hetzner.cloud/v1/zones/ppp.pm/rrsets/''${SUBDOMAIN}/A/actions/set_records" \
+            fi
                    && echo $CURRENT_IP > $LAST_IP_FILE
              fi
            done
          '';
        };
      };
--- a/hosts/manatee/modules/homepage/default.nix
+++ b/hosts/manatee/modules/homepage/default.nix
@@ -77,15 +77,13 @@ in
    mod.homepage = {
      enable = lib.mkEnableOption "Enable homepage module";
      services = lib.mkOption {
-        type = lib.types.listOf (
+        type = lib.types.listOf (lib.types.submodule {
-          lib.types.submodule {
+          options = {
-            options = {
+            name = lib.mkOption { type = lib.types.str; };
-              name = lib.mkOption { type = lib.types.str; };
+            port = lib.mkOption { type = lib.types.port; };
-              port = lib.mkOption { type = lib.types.port; };
+            description = lib.mkOption { type = lib.types.str; };
-              description = lib.mkOption { type = lib.types.str; };
+          };
-            };
+        });
          }
        );
        default = [ ];
        description = "Services to display on the homepage";
      };
@@ -97,7 +95,7 @@ in
      listen = [
        {
          addr = "0.0.0.0";
-          port = 9999;
+          port = 80;
        }
      ];
      root = page;
@@ -106,6 +104,6 @@ in
      };
    };
-    networking.firewall.allowedTCPPorts = [ 9999 ];
+    networking.firewall.allowedTCPPorts = [ 80 ];
  };
 }
--- a/hosts/manatee/modules/immich/default.nix
+++ b/hosts/manatee/modules/immich/default.nix
@@ -10,13 +10,11 @@ in
  };
  config = lib.mkIf enabled {
-    mod.homepage.services = [
+    mod.homepage.services = [{
-      {
+      name = "Immich";
-        name = "Immich";
+      port = 2283;
-        port = 2283;
+      description = "Photo library";
-        description = "Photo library";
+    }];
      }
    ];
    users.users.immich = {
      isSystemUser = true;
--- a/hosts/manatee/modules/jellyfin/default.nix
+++ b/hosts/manatee/modules/jellyfin/default.nix
@@ -47,13 +47,11 @@ in
      };
    };
-    mod.homepage.services = [
+    mod.homepage.services = [{
-      {
+      name = "Jellyfin";
-        name = "Jellyfin";
+      port = 8096;
-        port = 8096;
+      description = "Media streaming";
-        description = "Media streaming";
+    }];
      }
    ];
    networking = {
      firewall.allowedTCPPorts = [ 8096 ];
--- a/hosts/manatee/modules/komga/default.nix
+++ b/hosts/manatee/modules/komga/default.nix
@@ -16,11 +16,7 @@ in
    };
  };
-  imports = [
+  imports = [ inputs.komga-comictracker.nixosModules.default ];
    inputs.komga-comictracker.nixosModules.default
    inputs.komga-bookmanager.nixosModules.default
    inputs.komga-reading-stats.nixosModules.default
  ];
  config = lib.mkIf enabled {
    mod.homepage.services = [
@@ -34,16 +30,6 @@ in
        port = 8888;
        description = "Comic reader";
      }
      {
        name = "Komga Book Manager";
        port = 8686;
        description = "Book manager";
      }
      {
        name = "Komga Reading Stats";
        port = 8787;
        description = "Reading stats";
      }
    ];
    users.users.komga = {
@@ -61,7 +47,6 @@ in
        server.port = 8002;
        komga."cors.allowed-origins" = [
          "http://manatee:8888"
          "https://komga.ppp.pm"
        ];
      };
@@ -83,75 +68,22 @@ in
          tryFiles = "$uri $uri/ /komga-reader.html";
        };
      };
      virtualHosts."komga.ppp.pm" = {
        forceSSL = true;
        useACMEHost = "komga.ppp.pm";
        locations."/" = {
          proxyPass = "http://127.0.0.1:8002";
          proxyWebsockets = true;
        };
      };
    };
    networking.firewall.allowedTCPPorts = [ 8888 ];
    programs.comictracker = {
      enable = true;
-      komgaUrl = "http://127.0.0.1:8002";
+      komgaUrl = "http://manatee:8002";
      komgaLibraryId = "0NVZH5AK3RPE1";
      secretsFile = config.age.secrets.komga-comicbooktracker-credentials.path;
    };
    services.komga-book-manager = {
      enable = true;
      port = 8686;
      group = "storage";
      komgaUrl = "http://127.0.0.1:8002";
      credentialsFile = config.age.secrets.komga-bookmanager-credentials.path;
      libraryRoot = "/mnt/media/public/books";
      libraryId = "0PNE1NEPY6995";
    };
    services.komga-reading-stats = {
      enable = true;
      host = "0.0.0.0";
      port = 8787;
      origin = "http://manatee:8787";
      anthropicApiKeyFile = config.age.secrets.komga-reading-stats-claude-api-key.path;
      claudeModel = "claude-sonnet-4-6";
      komga = {
        url = "http://127.0.0.1:8002";
        apiKeyFile = config.age.secrets.komga-reading-stats-komga-api-key.path;
      };
    };
    age.secrets = {
      "komga-comicbooktracker-credentials" = {
        file = ../../../../secrets/manatee/komga-comicbooktracker-credentials.age;
        owner = "alex";
        group = "users";
      };
      "komga-bookmanager-credentials" = {
        file = ../../../../secrets/manatee/komga-bookmanager-credentials.age;
        owner = "alex";
        group = "users";
      };
      "komga-reading-stats-claude-api-key" = {
        file = ../../../../secrets/manatee/komga-reading-stats-claude-api-key.age;
        owner = "komga-reading-stats";
        group = "komga-reading-stats";
      };
      "komga-reading-stats-komga-api-key" = {
        file = ../../../../secrets/manatee/komga-reading-stats-komga-api-key.age;
        owner = "komga-reading-stats";
        group = "komga-reading-stats";
      };
    };
  };
 }
--- a/hosts/manatee/modules/navidrome/default.nix
+++ b/hosts/manatee/modules/navidrome/default.nix
@@ -15,13 +15,11 @@ in
  };
  config = {
-    mod.homepage.services = lib.mkIf navidromeEnabled [
+    mod.homepage.services = lib.mkIf navidromeEnabled [{
-      {
+      name = "Navidrome";
-        name = "Navidrome";
+      port = 4533;
-        port = 4533;
+      description = "Music streaming";
-        description = "Music streaming";
+    }];
      }
    ];
    services = lib.mkIf navidromeEnabled {
      navidrome = {
--- a/hosts/manatee/modules/syncthing/default.nix
+++ b/hosts/manatee/modules/syncthing/default.nix
@@ -10,13 +10,11 @@ in
  };
  config = lib.mkIf enabled {
-    mod.homepage.services = [
+    mod.homepage.services = [{
-      {
+      name = "Syncthing";
-        name = "Syncthing";
+      port = 8384;
-        port = 8384;
+      description = "File sync";
-        description = "File sync";
+    }];
      }
    ];
    services.syncthing = {
      enable = true;
--- a/hosts/manatee/modules/transmission/default.nix
+++ b/hosts/manatee/modules/transmission/default.nix
@@ -15,13 +15,11 @@ in
  };
  config = lib.mkIf enabled {
-    mod.homepage.services = [
+    mod.homepage.services = [{
-      {
+      name = "Transmission";
-        name = "Transmission";
+      port = 9091;
-        port = 9091;
+      description = "Torrent client";
-        description = "Torrent client";
+    }];
      }
    ];
    services = {
      transmission = {
--- a/hosts/pinwheel/home.nix
+++ b/hosts/pinwheel/home.nix
@@ -27,8 +27,6 @@
          pkgs.onlyoffice-desktopeditors
          pkgs.wdisplays
          pkgs.vlc
          pkgs.claude-code
          pkgs.opencode
        ];
        home.stateVersion = "23.05";
--- a/hosts/pinwheel/modules/default.nix
+++ b/hosts/pinwheel/modules/default.nix
@@ -14,7 +14,7 @@ in
      nix-index.enable = false;
      greetd.enable = true;
      hyprland.enable = true;
-      hyprlock.enable = true;
+      swaylock.enable = true;
      physlock.enable = false;
      power.enable = true;
--- a/hosts/pinwheel/modules/emacs/config.org
+++ b/hosts/pinwheel/modules/emacs/config.org
@@ -588,6 +588,9 @@ Setup prefix for keybindings.
    )
  )
  (use-package eglot-booster
    :after eglot
    :config (eglot-booster-mode))
 #+END_SRC
 ** Go
 #+BEGIN_SRC emacs-lisp
--- a/hosts/pinwheel/modules/emacs/default.nix
+++ b/hosts/pinwheel/modules/emacs/default.nix
@@ -12,6 +12,18 @@ let
      epkgs.flymake-go-staticcheck
      epkgs.tree-sitter-langs
      epkgs.treesit-grammars.with-all-grammars
      (epkgs.trivialBuild {
        pname = "eglot-booster";
        version = "main-2024-04-11";
        src = pkgs.fetchFromGitHub {
          owner = "jdtsmith";
          repo = "eglot-booster";
          rev = "e19dd7ea81bada84c66e8bdd121408d9c0761fe6";
          hash = "sha256-vF34ZoUUj8RENyH9OeKGSPk34G6KXZhEZozQKEcRNhs=";
        };
      })
    ];
  };
@@ -38,6 +50,7 @@ in
      ec
      emacs
      pkgs.wl-clipboard
      pkgs.emacs-lsp-booster
      pkgs.nixd
    ];
  };
--- a/hosts/pinwheel/modules/git/default.nix
+++ b/hosts/pinwheel/modules/git/default.nix
@@ -15,7 +15,7 @@ in
  };
  config = lib.mkIf enabled {
-    home-manager.users.alex = { lib, ... }: {
+    home-manager.users.alex = {
      programs.git = {
        enable = true;
@@ -23,26 +23,11 @@ in
          { path = ./gitconfig; }
        ];
        signing = {
          key = config.age.secrets."alex.pinwheel-github.com-signing.pub".path;
          signByDefault = true;
        };
        settings = {
          rerere.enable = true;
          # Tells Git to use SSH instead of the default GPG
          gpg.format = "ssh";
        };
      };
      home.file.".ssh/config".target = ".ssh/config_source";
      home.activation.sshConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
        run cat ~/.ssh/config_source > ~/.ssh/config
        run chmod 600 ~/.ssh/config
      '';
      home.packages = [ pkgs.tig ];
      home.file.".tigrc".text = ''
@@ -50,20 +35,5 @@ in
        set main-view-line-number-interval = 1
      '';
    };
    age.secrets = {
      "alex.pinwheel-github.com-signing" = {
        file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.age;
        path = "/home/alex/.ssh/alex.pinwheel-github.com-signing";
        owner = "alex";
        group = "users";
      };
      "alex.pinwheel-github.com-signing.pub" = {
        file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age;
        path = "/home/alex/.ssh/alex.pinwheel-github.com-signing.pub";
        owner = "alex";
        group = "users";
      };
    };
  };
 }
--- a/hosts/pinwheel/modules/greetd/default.nix
+++ b/hosts/pinwheel/modules/greetd/default.nix
@@ -22,7 +22,7 @@ in
        let
          session = {
            user = "alex";
-            command = "uwsm start hyprland-uwsm.desktop";
+            command = "${pkgs.hyprland}/bin/Hyprland";
          };
        in
        {
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -26,30 +26,28 @@ let
    }
    bind_workspaces() {
-      local external batch=""
+      local external
      if external=$(get_active_external); then
-        # External monitor connected: move workspaces 1-5 to external, 6-10 to internal
+        # External monitor connected: 1-5 on external, 6-10 on internal
        for ws in 1 2 3 4 5; do
-          batch="$batch dispatch moveworkspacetomonitor $ws $external;"
+          $HYPRCTL keyword workspace "$ws, monitor:$external, default:true"
        done
        for ws in 6 7 8 9 10; do
-          batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
+          $HYPRCTL keyword workspace "$ws, monitor:$INTERNAL, default:true"
        done
      else
-        # No external monitor: move all workspaces to internal
+        # No external monitor: all workspaces on internal
        for ws in 1 2 3 4 5 6 7 8 9 10; do
-          batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
+          $HYPRCTL keyword workspace "$ws, monitor:$INTERNAL, default:true"
        done
      fi
      $HYPRCTL --batch "$batch"
    }
    handle_event() {
      case $1 in
        monitoradded*|monitorremoved*)
-          sleep 0.5
+          sleep 0.5  # Give monitor time to initialize
          bind_workspaces
          ;;
      esac
@@ -73,7 +71,6 @@ in
  config = lib.mkIf enabled {
    programs.hyprland = {
      enable = true;
      withUWSM = true;
      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
      portalPackage =
        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
@@ -86,11 +83,10 @@ in
    home-manager.users.alex = {
      wayland.windowManager.hyprland = {
        enable = true;
        systemd.enable = false;
        extraConfig = ''
-          exec-once = uwsm app -- waybar
+          exec-once=waybar
-          exec-once = uwsm app -- hyprctl setcursor Adwaita 24
+          exec-once=hyprctl setcursor Adwaita 24
          env = GDK_DPI_SCALE,1.5
          env = HYPRCURSOR_THEME,Adwaita
@@ -100,25 +96,6 @@ in
          monitor=HDMI-A-1, 2560x1440@100, auto-center-up, 1
          monitor=DP-3, 2560x1440@60, auto-center-up, 1
          # Workspaces 1-5 on external monitors (HDMI-A-1 or DP-3)
          workspace = 1, monitor:HDMI-A-1, default:true
          workspace = 2, monitor:HDMI-A-1
          workspace = 3, monitor:HDMI-A-1
          workspace = 4, monitor:HDMI-A-1
          workspace = 5, monitor:HDMI-A-1
          workspace = 1, monitor:DP-3, default:true
          workspace = 2, monitor:DP-3
          workspace = 3, monitor:DP-3
          workspace = 4, monitor:DP-3
          workspace = 5, monitor:DP-3
          # Workspaces 6-10 on internal monitor
          workspace = 6, monitor:eDP-1, default:true
          workspace = 7, monitor:eDP-1
          workspace = 8, monitor:eDP-1
          workspace = 9, monitor:eDP-1
          workspace = 10, monitor:eDP-1
          workspace = w[tv1], gapsout:0, gapsin:0
          workspace = f[1], gapsout:0, gapsin:0
          windowrule = border_size 0, match:float 0, match:workspace w[tv1]
@@ -129,6 +106,7 @@ in
          # https://wiki.archlinux.org/title/Hyprland#Jetbrains_apps_focus_issues
          windowrule = match:xwayland true, no_initial_focus on
          exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
        '';
        settings = {
--- a/hosts/pinwheel/modules/light/default.nix
+++ b/hosts/pinwheel/modules/light/default.nix
@@ -9,13 +9,14 @@ let
 in
 {
  users.users.alex.extraGroups = [ "video" ];
  programs.light.enable = true;
  home-manager.users.alex = {
    wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
      settings = {
        bind = [
-          ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +5%"
+          ", XF86MonBrightnessUp, exec, ${pkgs.light}/bin/light -A 5"
-          ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
+          ", XF86MonBrightnessDown, exec, ${pkgs.light}/bin/light -U 5"
        ];
      };
    };
--- a/hosts/pinwheel/modules/power/default.nix
+++ b/hosts/pinwheel/modules/power/default.nix
@@ -80,12 +80,12 @@ in
          path = [
            pkgs.coreutils # For `cat`
            pkgs.libnotify
-            pkgs.hyprlock
+            pkgs.swaylock
          ];
          script =
            let
-              pause-music = "${pkgs.playerctl}/bin/playerctl -a pause";
+              pause-music = "${pkgs.playerctl}/bin/playerctl -p spotify pause";
            in
            ''
               BATTERY_CAPACITY=$(cat /sys/class/power_supply/${lowbat.battery}/capacity)
@@ -103,7 +103,7 @@ in
                 BATTERY_STATUS=$(cat /sys/class/power_supply/${lowbat.battery}/status)
                 if [[ $BATTERY_STATUS = "Discharging" ]]; then
-                   ${pause-music}; ${pkgs.hyprlock}/bin/hyprlock & sleep 0.5; systemctl suspend
+                   ${pause-music}; ${pkgs.swaylock}/bin/swaylock -f; systemctl suspend
                 fi
              fi
            '';
--- a/hosts/pinwheel/modules/ssh/default.nix
+++ b/hosts/pinwheel/modules/ssh/default.nix
@@ -1,14 +1,6 @@
 { pkgs, ... }:
 {
  # Enable gnome-keyring at system level for PAM integration
  services.gnome.gnome-keyring.enable = true;
  home-manager.users.alex = {
    services.gnome-keyring = {
      enable = true;
      components = [ "secrets" "ssh" ];
    };
    programs.ssh = {
      enable = true;
      enableDefaultConfig = false;
@@ -47,7 +39,7 @@
        "*" = {
          forwardAgent = false;
-          addKeysToAgent = "yes";
+          addKeysToAgent = "no";
          compression = false;
          serverAliveInterval = 0;
          serverAliveCountMax = 3;
@@ -60,10 +52,7 @@
      };
    };
-    home.packages = [
+    home.packages = [ pkgs.sshfs ];
      pkgs.sshfs
      pkgs.seahorse # GUI for managing gnome-keyring
    ];
  };
  age.secrets = {
--- a/hosts/pinwheel/modules/swaylock/default.nix
+++ b/hosts/pinwheel/modules/swaylock/default.nix
@@ -5,13 +5,13 @@
  ...
 }:
 let
-  enabled = config.mod.hyprlock.enable;
+  enabled = config.mod.swaylock.enable;
  hyprlandEnabled = config.mod.hyprland.enable;
 in
 {
  options = {
-    mod.hyprlock = {
+    mod.swaylock = {
-      enable = lib.mkEnableOption "enable hyprlock module";
+      enable = lib.mkEnableOption "enable swaylock module";
      dpmsTimeout = lib.mkOption {
        description = "timeout in seconds before DPMS is turned on";
@@ -23,32 +23,13 @@ in
  config = lib.mkIf enabled {
    home-manager.users.alex = {
-      programs.hyprlock = {
+      programs.swaylock = {
        enable = true;
        settings = {
-          general = {
+          color = "000000";
-            hide_cursor = true;
+          indicator-idle-visible = false;
-          };
+          show-failed-attempts = true;
          background = [
            {
              color = "rgb(000000)";
            }
          ];
          input-field = [
            {
              size = "250, 50";
              position = "0, 0";
              halign = "center";
              valign = "center";
              outline_thickness = 2;
              dots_center = true;
              fade_on_empty = true;
              placeholder_text = "";
            }
          ];
        };
      };
@@ -56,20 +37,20 @@ in
        settings = {
          bind =
            let
-              pause-music = "${pkgs.playerctl}/bin/playerctl -a pause";
+              pause-music = "${pkgs.playerctl}/bin/playerctl -p spotify pause";
-              dpmsTimeout = config.mod.hyprlock.dpmsTimeout;
+              dpmsTimeout = config.mod.swaylock.dpmsTimeout;
              dpms-lock = pkgs.writeShellScript "dpms-lock" ''
                ${pkgs.swayidle}/bin/swayidle \
                  timeout ${dpmsTimeout} "${pkgs.hyprland}/bin/hyprctl dispatch dpms off" \
                  resume "${pkgs.hyprland}/bin/hyprctl dispatch dpms on" &
-                ${pkgs.hyprlock}/bin/hyprlock; ${pkgs.procps}/bin/pkill swayidle
+                ${pkgs.swaylock}/bin/swaylock && ${pkgs.procps}/bin/pkill swayidle
              '';
            in
            [
              "$mod, x, exec, ${pause-music}; ${dpms-lock}"
-              "$mod SHIFT, x, exec, ${pause-music}; ${pkgs.hyprlock}/bin/hyprlock & sleep 0.5; systemctl suspend"
+              "$mod SHIFT, x, exec, ${pause-music}; ${pkgs.swaylock}/bin/swaylock -f; systemctl suspend"
            ];
        };
      };
@@ -78,7 +59,11 @@ in
    security = {
      polkit.enable = true;
-      pam.services.hyprlock = {};
+      pam.services.swaylock.text = ''
        # PAM configuration file for the swaylock screen locker. By default, it includes
        # the 'login' configuration file (see /etc/pam.d/login)
        auth include login
      '';
    };
  };
 }
--- a/hosts/pinwheel/modules/tmux/default.nix
+++ b/hosts/pinwheel/modules/tmux/default.nix
@@ -18,7 +18,7 @@
        # https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/
        set -g default-terminal "xterm-256color"
        set -ga terminal-overrides ",*256col*:Tc"
-        set -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[ q'
+        set -ga terminal-overrides "*:Ss=\E[%p1%d q:Se=\E[ q"
        set-environment -g COLORTERM "truecolor"
        set-option -g allow-rename off
--- a/hosts/pinwheel/modules/work/default.nix
+++ b/hosts/pinwheel/modules/work/default.nix
@@ -12,34 +12,6 @@ let
 in
 {
  home-manager.users.alex = {
    # Ensure bashInteractive is first in PATH inside nix devshells.
    # stdenv provides a non-interactive bash that breaks Copilot shell commands.
    # Adding bashInteractive to home.packages alone isn't enough because devshell
    # packages are prepended to PATH. This precmd hook runs after direnv's hook
    # and re-prepends bashInteractive so it takes priority.
    programs.zsh.initContent = ''
      _ensure_bash_interactive() {
        [[ "$PATH" == "${pkgs.bashInteractive}/bin:"* ]] || export PATH="${pkgs.bashInteractive}/bin:$PATH"
      }
      precmd_functions+=(_ensure_bash_interactive)
    '';
    # Configure IntelliJ to exclude .direnv from indexing
    home.activation.intellijIgnoreDirenv = ''
      for idea_config in $HOME/.config/JetBrains/IntelliJIdea*; do
        if [ -d "$idea_config" ]; then
          $DRY_RUN_CMD mkdir -p "$idea_config/options"
          $DRY_RUN_CMD tee "$idea_config/options/filetypes.xml" > /dev/null <<'EOF'
 <application>
  <component name="FileTypeManager" version="18">
    <ignoreFiles list="*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc;.direnv" />
  </component>
 </application>
 EOF
        fi
      done
    '';
    home.sessionVariables = {
      GITHUB_ACTOR = "Alexander Heldt";
      GITHUB_TOKEN = "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.work-github-token.path})";
@@ -53,7 +25,6 @@ EOF
        "IdeaVIM"
        "com.github.copilot"
      ])
      pkgs.bashInteractive
      (pkgs.google-cloud-sdk.withExtraComponents [
        pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
@@ -64,8 +35,6 @@ EOF
      pkgs.postman
      pkgs.grpcurl
      pkgs.slack
      # for `radio`
      pkgs.go-mockery
      pkgs.golangci-lint
--- a/secrets/manatee/komga-bookmanager-credentials.age
+++ b/secrets/manatee/komga-bookmanager-credentials.age
@@ -1,7 +0,0 @@
 age-encryption.org/v1
 -> ssh-ed25519 wkRvNA GW8mvnaXpspxr78xV0fKhXwHVvReyjvDc0v7uPwhuBI
 Rne8JZYVhrTTesSFpRQ/IOZlFIMoX9Wmv5n1Ed7Ehv8
 -> ssh-ed25519 +oNaHQ d7utzodGQ7LsD2Uht1rbT8Qq9BZp3PkJS9EDhajCjnk
 qd2Vj+1TQrjEKkSVAf0cXcCdkgeN/Jbp4UrBSp3cKYQ
 --- JQr5UQlutONqnTeoT/mIVZL8ME7ipUDK8zDfNcN3uhU
 ø5-VŸÌ²ÂòÀ-®ªÁÅ'^žô5kú.t(d1‡)É'<u%
--- a/secrets/manatee/komga-reading-stats-claude-api-key.age
+++ b/secrets/manatee/komga-reading-stats-claude-api-key.age
@@ -1,7 +0,0 @@
 age-encryption.org/v1
 -> ssh-ed25519 wkRvNA 5bEWAlzS34w3tMqMCTRqFoni4MKyQCcaBdEQ96BccVk
 85rIfjpzL/cNx5SlpKeOUzsMl0rwvCdPgrZ0jlXE1nQ
 -> ssh-ed25519 +oNaHQ d2ZZ/XQ5fgT8FMwhyfWHB5FESXM0Y9tlE1KcWwQV7HY
 bCj5fLqN2zfPBcnXaJAYJYA+PXTPAdLZVy2FinZvUTM
 --- vxopGi8/YrgI/VceX807yk7edWrdYgjmGYG9Zp/cuQA
 žFc˜ÖÂ|ª67Ñ~uðÃ¡úÉ€Wê–ÿ’eïó‰ÍVMj5‹ÜG?³JâË_pîcf57^ƒŒ¥r@g&<26>?„¬4ŠþÎðˆÉ‘@ƒN…œsjZ¡Šé^-âyB{\ºÔñ3«ˆýT)³ž¯uÝ\Wa\àìB)@d ™vrì8q.kÚ™˜
--- a/secrets/manatee/komga-reading-stats-komga-api-key.age
+++ b/secrets/manatee/komga-reading-stats-komga-api-key.age
@@ -1,7 +0,0 @@
 age-encryption.org/v1
 -> ssh-ed25519 wkRvNA ykXbxHlehL+AucBCiS7NKNOWjHm51ZTbfgM7fPU+QDo
 FtPBWg91yWq90n4PkzdwpIq+DnwL+nwUNzH3mQP4lgg
 -> ssh-ed25519 +oNaHQ fCNig/NdBmbZqicNhSnYKz7Rmc7S2JpN+sQ50o+QFg0
 AQiKSjZMsjuJGsnZWjSNePrbXBQ/f1zhNCXLznbZk1w
 --- zjW49MAgjerHuHqMrSSDpgkWLD40eMSr+ZkKZ0Y9pJo
 •Ø‡¯O¹Þ°<>}Œ/¨ïd°°
--- a/secrets/pinwheel/alex.pinwheel-github.com-signing.age
+++ b/secrets/pinwheel/alex.pinwheel-github.com-signing.age
--- a/secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age
+++ b/secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age
--- a/secrets/pinwheel/work-gitconfig.age
+++ b/secrets/pinwheel/work-gitconfig.age
@@ -1,7 +1,8 @@
 age-encryption.org/v1
-> ssh-ed25519 vxPbZg GMTnaun91WNPRFQYkN7xPqdALyMQpXCOq6jj4Q4O1Q0
+-> ssh-ed25519 vxPbZg bCF+MdTMA8jH26XEosgyd5N0RsTa9WT/VAIZGsVemHg
-OyA/Zk7KQlbSyJlXETFh4JZ57S92oXULa9/mgC019PE
+1DNCO2mpsJ68osmFZIzAlY6kjoxCbThpSI4XNEyUNjY
-> ssh-ed25519 +oNaHQ C0K34MjLZDIKv6ci2efBxv1nfvuHKn9OCj26DxjtmBo
+-> ssh-ed25519 +oNaHQ L91QfGk0r81Df5fHWHdrvXJ54FJ+3S30vus/h4v/H2k
-tMG+KxpFX2K8F34iNxDBpb2epd94QPFWo8X/mY67LEI
+Vi/5VdJhl72cwLiD2qxbmQiKD0RPb4vv6VddGWrPvF4
--- FBMSSr82MYSwER9O8dEs3o2vy/+rc29DxUuziFZqYzw
+--- F8ff4nu9K9cXId34L2RMBzH4vE3efIuzISN1spbvDHo
-l'c(êˆ6ônnxgA7j"%ÎIÂ'¢{úH¯˜@Þ™vä°ÔêyŸåJÃ»T°©ˆ¼)ÇÃ…¿nSÝ&ìÉš¦e;õ	4zNº½„KU¤Á€,d”<64>Cñæ®®U;Dc«.<2E>x`
+KÙŒ¬<EFBFBD>Ëâey¾z’ÛŸ%Œ]Ÿ…˜m®s÷«¥úb°U×qX{¸±‹!©(<28>u‹|ø!œ_‘}˜íÿ<ùÓ#ù–ÞºˆžXU^¸üs”W<E2809D>´wñNÐÆU×ù¥D
 ú˜
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -17,8 +17,6 @@ in {
  "pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ];
  "pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-github.com-signing.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-github.com-signing.pub.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-git.ppp.pm.pub.age".publicKeys = [ pinwheel alex ];
@@ -36,9 +34,6 @@ in {
  "manatee/syncthing-key.age".publicKeys = [ manatee alex ];
  "manatee/hetzner-dns.age".publicKeys = [ manatee alex ];
  "manatee/komga-comicbooktracker-credentials.age".publicKeys = [ manatee alex];
  "manatee/komga-bookmanager-credentials.age".publicKeys = [ manatee alex];
  "manatee/komga-reading-stats-claude-api-key.age".publicKeys = [ manatee alex];
  "manatee/komga-reading-stats-komga-api-key.age".publicKeys = [ manatee alex];
  "backwards/root.backwards.age".publicKeys = [ backwards alex ];
  "backwards/root.backwards.pub.age".publicKeys = [ backwards alex ];