splayer: replace by splayer-next

niri-nix removed its X-StopIfChanged/X-RestartIfChanged drop-in for
niri.service in acccaf2202, so switch-to-configuration-ng now stops the
running compositor (killing the graphical session) whenever the niri
store path changes. Restore the drop-in locally; the updated binary
takes effect on the next login instead.

Justfile

@@ -49,3 +49,11 @@ alias offline := switch-offline
 @fmt:
 	echo "Formatting files..."
 	nix fmt
+
+@sync-noctalia:
+	echo "Folding noctalia GUI overrides back into the repo..."
+	python3 scripts/sync-noctalia.py --apply
+
+@sync-noctalia-preview:
+	echo "Previewing noctalia config sync (no changes)..."
+	python3 scripts/sync-noctalia.py

flake.lock

@@ -108,19 +108,36 @@
         ]
       },
       "locked": {
-        "lastModified": 1784665499,
+        "lastModified": 1788011267,
-        "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=",
+        "narHash": "sha256-mEq2kU+ljompTToZ44Afvm7d/rHJ5iMBl0tjZuyShJs=",
-        "owner": "nix-community",
+        "owner": "Mic92",
         "repo": "bun2nix",
-        "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729",
+        "rev": "5765b0614591f75ee8ba5596e81ae85c167d1071",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "Mic92",
+        "ref": "fix-structured-attrs-hook",
         "repo": "bun2nix",
         "type": "github"
       }
     },
+    "crane": {
+      "locked": {
+        "lastModified": 1787326676,
+        "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "692f7e9ef2ece8125b466f66f2af532b3edaed0d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "ref": "master",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "darkly": {
       "inputs": {
         "nixpkgs": [
@@ -128,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780519775,
+        "lastModified": 1787592910,
-        "narHash": "sha256-u12imjPk4ZhOen/PgnLiNPML+5NmuKO0Ja4wQKU/Y8E=",
+        "narHash": "sha256-a2+yPzqXAlnErn1KGW28UBlqapBmySvLPWOskVFB/Hg=",
         "owner": "Bali10050",
         "repo": "Darkly",
-        "rev": "11c27e2d98025f4d4c1598f07a185280b36f35f7",
+        "rev": "65f6fa62675e3c30986f8fc8e4fdbba053096491",
         "type": "github"
       },
       "original": {
@@ -141,6 +158,30 @@
         "type": "github"
       }
     },
+    "fast-nix-gc": {
+      "inputs": {
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": [
+          "treefmt"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788439409,
+        "narHash": "sha256-AvaugOI0Hb8ZG+2goIbISKpYfW6ovdvDm/uf7PT8PO8=",
+        "owner": "Mic92",
+        "repo": "fast-nix-gc",
+        "rev": "18d82a8ce3e938ff97b5e11c7d2033f0333af5bb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "fast-nix-gc",
+        "type": "github"
+      }
+    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -149,11 +190,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1786087386,
+        "lastModified": 1788603547,
-        "narHash": "sha256-CCDk6TD6AAHurSHhKww34uh66F+nOFuWa1NVrU3kEdM=",
+        "narHash": "sha256-/ioB+JvyRtHtQOpgZYC95KiD6Gw76ZDdSbkiItR4FG4=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "c45fc50ed0a0f833e465c5d03cd9f5b9c5525d9c",
+        "rev": "03864c059200a8a96f2ee6bb050c69eae96f57ca",
         "type": "github"
       },
       "original": {
@@ -200,11 +241,11 @@
         ]
       },
       "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": {
@@ -296,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786031233,
+        "lastModified": 1788487777,
-        "narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=",
+        "narHash": "sha256-Ro/e1N4ZR8/XaFF+sF9SgfPK79HM5YNEppzFj8p+0Ak=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7834e82588860aaf780cec1366524456a70898d7",
+        "rev": "693e8ce0fb240a73c116a03cfd7b19269c87af88",
         "type": "github"
       },
       "original": {
@@ -364,11 +405,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786078118,
+        "lastModified": 1788605532,
-        "narHash": "sha256-MW8q88uv/Z5DF9UyVKQjlUOBmcoh0OyUWl94aSVtvVU=",
+        "narHash": "sha256-kqEZkn2YPC9mgJn6Wh6L1uuukvYYMbQryzaFHO41GxU=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "c4fe91eee512d8278f2593fc8f544829c76c84f8",
+        "rev": "3a3523b87e7bb7253fac39c95895ec20f241d672",
         "type": "github"
       },
       "original": {
@@ -377,6 +418,21 @@
         "type": "github"
       }
     },
+    "multiverse": {
+      "locked": {
+        "lastModified": 1788596457,
+        "narHash": "sha256-6iJ0N8hUClykevMfX8Qwt2ObOBaQF6yK7wf12OoOovk=",
+        "owner": "fzakaria",
+        "repo": "nixpkgs-multiverse",
+        "rev": "5caf7ed36b0ddf54878ef30a738fd327c9682ffa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fzakaria",
+        "repo": "nixpkgs-multiverse",
+        "type": "github"
+      }
+    },
     "my-templates": {
       "locked": {
         "lastModified": 1765097937,
@@ -401,11 +457,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1786060963,
+        "lastModified": 1788566543,
-        "narHash": "sha256-M69/THrLuFvD5Om3kgJj4R9NJF5nOl1P7cs8mV9VD2c=",
+        "narHash": "sha256-7snI9zOQMvM0ghxW9+7Tl/8pvDa4KGmQBCmRzbY9TxI=",
         "ref": "refs/heads/main",
-        "rev": "596d021351130c4da3010bee2e0af9f19a8a15e1",
+        "rev": "2bce88af7bbeff97ac132d870e2efd08a294c8f0",
-        "revCount": 162,
+        "revCount": 181,
         "type": "git",
         "url": "https://codeberg.org/bananad3v/niri-nix"
       },
@@ -417,11 +473,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1785701241,
+        "lastModified": 1787337984,
-        "narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=",
+        "narHash": "sha256-BNZUEVR2H96hCKENNKoLSSTFT8W4smp7v94hJc4Ehfc=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6",
+        "rev": "dd75865f547f0eac0e9b6c4d86d2cd00c0744252",
         "type": "github"
       },
       "original": {
@@ -430,6 +486,53 @@
         "type": "github"
       }
     },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "fast-nix-gc",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785389976,
+        "narHash": "sha256-0tLW8Ff5yt8AH97jw4ZpFJ0OCJ122zIlgWGDmOfU/VU=",
+        "owner": "nix-darwin",
+        "repo": "nix-darwin",
+        "rev": "15abb8c98f336cd8bd840d71059adebabe60bf04",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-darwin",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nix-tree-rs": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": [
+          "treefmt"
+        ]
+      },
+      "locked": {
+        "lastModified": 1787652563,
+        "narHash": "sha256-ec73Anjp5QDIid2Z/iNC9jaGRqO9aLtYOJOo95dd5YU=",
+        "owner": "Mic92",
+        "repo": "nix-tree-rs",
+        "rev": "9654bd185c7043c60ae999b4d3a9b038e85b111b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-tree-rs",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": [
@@ -455,11 +558,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785747939,
+        "lastModified": 1788400875,
-        "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=",
+        "narHash": "sha256-JIHQ6xNAN53cdo6zZ72LRcQ9lpvnABCnNE4hldJ5uZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2",
+        "rev": "5545adfad2e98de106a5544ca7067e03010410bd",
         "type": "github"
       },
       "original": {
@@ -469,29 +572,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1786091500,
+        "lastModified": 1788531059,
-        "narHash": "sha256-c33ypkuNIybip89q6VL80QGfup+KbpoPGqbiD2jrg4I=",
+        "narHash": "sha256-hLD4l3QOGBQhkVp3mQ2lJ/YbEi99qUgKapb40KovZ88=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6282fd4acaf4a11d6b94bfbd2cc5a2193a60f23e",
+        "rev": "801bef6abd86b91e51083066b83fb354a11fc640",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1785967620,
-        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
         "type": "github"
       },
       "original": {
@@ -501,67 +588,24 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable-small": {
-      "locked": {
-        "lastModified": 1786074909,
-        "narHash": "sha256-RXBE0mNKb5O4g5PR6iV43/A0qkibe2MSZ+DDvRS4ELs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5738b3c785613e0f8e0d94662dd5542188bb4dc2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "noctalia": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "noctalia-qs": "noctalia-qs"
-      },
-      "locked": {
-        "lastModified": 1775169040,
-        "narHash": "sha256-0xoCuJSRSWcn4mCX382lCxqLbnuOrrqS4dOcdpoUmZg=",
-        "owner": "noctalia-dev",
-        "repo": "noctalia-shell",
-        "rev": "8b0c7c288063e5048a439ca308dd65f7044f42b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "noctalia-dev",
-        "ref": "v4.7.5",
-        "repo": "noctalia-shell",
-        "type": "github"
-      }
-    },
-    "noctalia-qs": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": [
-          "systems"
-        ],
-        "treefmt-nix": [
-          "treefmt"
         ]
       },
       "locked": {
-        "lastModified": 1775008123,
+        "lastModified": 1787858564,
-        "narHash": "sha256-zsd/kbsgfX2YQAlbao40JxyeVDwsUmBGyUDZc/Vo1C4=",
+        "narHash": "sha256-WijEuINvjcXMO/e/zMqwG1lyGiWNosnVt1QY+ko0Rw8=",
         "owner": "noctalia-dev",
-        "repo": "noctalia-qs",
+        "repo": "noctalia-shell",
-        "rev": "b87f41771c050d3c101d1528532de53293cba6da",
+        "rev": "74e6c2790dd8f39bf496e90e479a9ae370846eed",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
-        "repo": "noctalia-qs",
+        "ref": "v5.0.0-beta.10",
+        "repo": "noctalia-shell",
         "type": "github"
       }
     },
@@ -594,6 +638,7 @@
       "inputs": {
         "angrr": "angrr",
         "darkly": "darkly",
+        "fast-nix-gc": "fast-nix-gc",
         "fenix": "fenix",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
@@ -603,16 +648,14 @@
         "impermanence": "impermanence",
         "infuse": "infuse",
         "llm-agents": "llm-agents",
+        "multiverse": "multiverse",
         "my-templates": "my-templates",
         "niri-nix": "niri-nix",
+        "nix-tree-rs": "nix-tree-rs",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2",
-          "nixpkgs-unstable"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "nixpkgs-unstable-small": "nixpkgs-unstable-small",
         "noctalia": "noctalia",
+        "selector4nix": "selector4nix",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
         "system76-scheduler-niri": "system76-scheduler-niri",
@@ -624,11 +667,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1786015008,
+        "lastModified": 1788445421,
-        "narHash": "sha256-S8yHp3Qkgey72CXtkmV2qiODqqnsmKXfYgJUEW/CTI8=",
+        "narHash": "sha256-sKEuAgygSpMZFvrj7IcCPm+3al2bQWukulM6pMEpCcc=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "ece721d6cdfdf420d8bcc7b9feb48e3b6dbc1f04",
+        "rev": "e8f7e90aa3e7b26aa9a000200f606c1078da99ec",
         "type": "github"
       },
       "original": {
@@ -638,6 +681,30 @@
         "type": "github"
       }
     },
+    "selector4nix": {
+      "inputs": {
+        "crane": "crane",
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788514031,
+        "narHash": "sha256-3nWq8IMC6GPtEqixSvpYX05nOfFqdnOfmkl0DOiWcQc=",
+        "owner": "StarryReverie",
+        "repo": "selector4nix",
+        "rev": "1ff44ddb817ff943df9667ac1a0a79791b509a20",
+        "type": "github"
+      },
+      "original": {
+        "owner": "StarryReverie",
+        "repo": "selector4nix",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -645,11 +712,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783174389,
+        "lastModified": 1788337237,
-        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
+        "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+        "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
         "type": "github"
       },
       "original": {
@@ -682,11 +749,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1785794750,
+        "lastModified": 1787771653,
-        "narHash": "sha256-OqIrGVL7AX462ISyJFAqjbqTc1RZlBkVHCa4dwPEZU4=",
+        "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "cb5eb3a7343faba61fd694fac8040a326485a339",
+        "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784",
         "type": "github"
       },
       "original": {
@@ -801,11 +868,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785945821,
+        "lastModified": 1786901030,
-        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
+        "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
+        "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
         "type": "github"
       },
       "original": {
@@ -817,11 +884,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1784679892,
+        "lastModified": 1788436361,
-        "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=",
+        "narHash": "sha256-i0QYbUlC03SrOomU+37TdZ9EdtEWLaUtsCQjC7+KhNU=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839",
+        "rev": "ea474b95a55ace75ad60a9bc0092a81ff5a1ba89",
         "type": "github"
       },
       "original": {
@@ -840,11 +907,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786047438,
+        "lastModified": 1788405419,
-        "narHash": "sha256-+8p8XryJaRpgxaJf1/YqGFs8RBOiYYx1YiwxEDDH+bs=",
+        "narHash": "sha256-wuGizAVEmY0u15MYrhgy7AoQdHg+4Y2QiC+v/mxA8dc=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "5ce465e63be9166bff1d7282d6908ca1043b6b86",
+        "rev": "fdb83f8fce835213fab7eab52c375926fe1a32dc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,11 +3,8 @@
 
   inputs = {
     # Nixpkgs
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    multiverse.url = "github:fzakaria/nixpkgs-multiverse";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/release-26.05";
-    # nixpkgs.follows = "nixpkgs-stable";
-    nixpkgs.follows = "nixpkgs-unstable";
 
     # Home manager
     home-manager = {
@@ -71,6 +68,11 @@
       url = "github:Bali10050/Darkly";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    fast-nix-gc = {
+      url = "github:Mic92/fast-nix-gc";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.treefmt-nix.follows = "treefmt";
+    };
     fenix = {
       url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -87,12 +89,20 @@
       url = "git+https://codeberg.org/bananad3v/niri-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-tree-rs = {
+      url = "github:Mic92/nix-tree-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.treefmt-nix.follows = "treefmt";
+    };
     noctalia = {
-      url = "github:noctalia-dev/noctalia-shell/v4.7.5";
+      url = "github:noctalia-dev/noctalia-shell/v5.0.0-beta.10";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    selector4nix = {
+      url = "github:StarryReverie/selector4nix";
+      inputs.flake-parts.follows = "flake-parts";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.noctalia-qs.inputs.nixpkgs.follows = "nixpkgs";
-      inputs.noctalia-qs.inputs.systems.follows = "systems";
-      inputs.noctalia-qs.inputs.treefmt-nix.follows = "treefmt";
     };
     zen = {
       url = "github:0xc000022070/zen-browser-flake";

flake/hosts.nix

@@ -2,7 +2,6 @@
   self,
   lib,
   inputs,
-  withSystem,
   config,
   pkgsParams,
   ...
@@ -35,6 +34,16 @@ let
       useGlobalPkgs = true;
     };
   };
+  upstreamModules = [
+    # keep-sorted start
+    inputs.angrr.nixosModules.angrr
+    inputs.home-manager.nixosModules.default
+    inputs.impermanence.nixosModules.impermanence
+    inputs.niri-nix.nixosModules.default
+    inputs.selector4nix.nixosModules.selector4nix
+    inputs.sops-nix.nixosModules.sops
+    # keep-sorted end
+  ];
 in
 {
   options.nixosHosts = lib.mkOption {
@@ -82,66 +91,51 @@ in
     # Generate nixosConfigurations from declarative host definitions
     flake.nixosConfigurations = lib.mapAttrs (
       hostname: hostConfig:
-      withSystem hostConfig.system (
+      lib.nixosSystem {
-        { ... }:
+        inherit (hostConfig) system;
-        lib.nixosSystem {
-          inherit (hostConfig) system;
 
-          specialArgs = {
+        specialArgs = {
-            inherit
+          inherit
-              inputs
+            inputs
-              self
+            self
-              hostname
+            hostname
-              ;
+            ;
-            assets =
+          assets =
-              with lib.haumea;
+            with lib.haumea;
-              load {
+            load {
-                src = ../assets;
+              src = ../assets;
-                loader = [ (matchers.always loaders.path) ];
+              loader = [ (matchers.always loaders.path) ];
-              };
+            };
-            secrets =
+          secrets =
-              with lib.haumea;
+            with lib.haumea;
-              load {
+            load {
-                src = ../secrets;
+              src = ../secrets;
-                loader = [ (matchers.always loaders.path) ];
+              loader = [ (matchers.always loaders.path) ];
-              };
+            };
-          }
-          // vars
-          // hostConfig.extraSpecialArgs;
-
-          modules =
-            # Automatically import all feature modules
-            (lib.umport {
-              paths = [ ../modules ];
-              extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
-              recursive = true;
-            })
-            ++ [
-              # Base profile (always included)
-              ../profiles/base.nix
-            ]
-            # Add requested profiles
-            ++ (map (profile: ../profiles/${profile}.nix) hostConfig.profiles)
-            # Add host-specific modules
-            ++ hostConfig.modules
-            ++ [
-              (lib.mkAliasOptionModule [ "my" "hm" ] [ "home-manager" "users" vars.username ])
-
-              # Upstream modules
-              # keep-sorted start
-              inputs.angrr.nixosModules.angrr
-              inputs.home-manager.nixosModules.default
-              inputs.impermanence.nixosModules.impermanence
-              inputs.niri-nix.nixosModules.default
-              inputs.sops-nix.nixosModules.sops
-              # keep-sorted end
-
-              # pkgs and home-manager configuration
-              pkgsModule
-              hmModule
-            ];
         }
-      )
+        // vars
+        // hostConfig.extraSpecialArgs;
+
+        modules =
+          (lib.umport {
+            paths = [ ../modules ];
+            extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
+            recursive = true;
+          })
+          ++ [
+            ../profiles/base.nix
+          ]
+          ++ (map (profile: ../profiles/${profile}.nix) hostConfig.profiles)
+          ++ hostConfig.modules
+          ++ upstreamModules
+          ++ [
+            (lib.mkAliasOptionModule [ "my" "hm" ] [ "home-manager" "users" vars.username ])
+
+            # pkgs and home-manager configuration
+            pkgsModule
+            hmModule
+          ];
+      }
     ) config.nixosHosts;
   };
 }

flake/overlays/default.nix

@@ -4,15 +4,13 @@
   config,
   ...
 }:
-let
+[
-  channel = channel: final: _prev: {
+  (final: _prev: {
-    ${channel} = import inputs."nixpkgs-${channel}" {
+    mv = inputs.multiverse.lib.mkMultiverse {
       inherit (final.stdenv.hostPlatform) system;
       inherit (config.nixpkgs) config;
     };
-  };
+  })
-in
-[
   (
     final: prev:
     lib.infuse prev {
@@ -20,7 +18,4 @@ in
       bottles.__input.removeWarningPopup.__assign = true;
     }
   )
-  (channel "stable")
-  (channel "unstable-small")
-  (channel "master")
 ]

flake/pkgs.nix

@@ -12,12 +12,23 @@
         inputs.niri-nix.overlays.niri-nix
         inputs.fenix.overlays.default
         inputs.angrr.overlays.default
-        (final: prev: {
-          darkly-qt6 = inputs.darkly.packages.${final.stdenv.hostPlatform.system}.darkly-qt6;
-
-          noctalia-shell = inputs.noctalia.packages.${final.stdenv.hostPlatform.system}.default;
-        })
         inputs.llm-agents.overlays.shared-nixpkgs
+        (
+          final: prev:
+          let
+            system = final.stdenv.hostPlatform.system;
+          in
+          {
+            darkly-qt6 = inputs.darkly.packages.${system}.darkly-qt6;
+
+            noctalia-shell = inputs.noctalia.packages.${system}.default;
+
+            nix-tree-rs = inputs.nix-tree-rs.packages.${system}.default;
+            fast-nix-gc = inputs.fast-nix-gc.packages.${system}.default.overrideAttrs {
+              doCheck = false;
+            };
+          }
+        )
       ];
       config.allowUnfree = true;
       flake.setNixPath = false;

hosts/imxyy-nix-server/net.nix

@@ -178,36 +178,19 @@
   };
   my.services.frp.webServers = [ "oidc.imxyy.top" ];
 
-  systemd.services.ddns-go =
+  systemd.services.ddns-go = {
-    let
+    description = "Go Dynamic DNS";
-      version = "6.6.7";
+    after = [ "network.target" ];
-      ddns-go = pkgs.buildGoModule {
+    wantedBy = [ "multi-user.target" ];
-        inherit version;
+    serviceConfig = {
-        pname = "ddns-go";
+      ExecStart = "${lib.getExe pkgs.ddns-go} -l :9876 -f 10 -cacheTimes 180 -c /var/lib/ddns-go/config.yaml";
-        src = pkgs.fetchFromGitHub {
+      Restart = "always";
-          owner = "jeessy2";
+      RestartSec = 120;
-          repo = "ddns-go";
-          rev = "v${version}";
-          hash = "sha256-Ejoe6e9GFhHxQ9oIBDgDRQW9Xx1XZK+qSAXiRXLdn+c=";
-        };
-        meta.mainProgram = "ddns-go";
-        vendorHash = "sha256-XZii7gV3DmTunYyGYzt5xXhv/VpTPIoYKbW4LnmlAgs=";
-        doCheck = false;
-      };
-    in
-    {
-      description = "Go Dynamic DNS";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${lib.getExe ddns-go} -l :9876 -f 10 -cacheTimes 180 -c /var/lib/ddns-go/config.yaml";
-        Restart = "always";
-        RestartSec = 120;
-      };
-      path = [
-        pkgs.bash
-      ];
     };
+    path = [
+      pkgs.bash
+    ];
+  };
 
   services.dnsmasq = {
     enable = true;

hosts/imxyy-nix/hardware.nix

@@ -34,6 +34,9 @@ in
     resumeDevice = btrfs;
     kernelParams = [
       "resume_offset=6444127"
+
+      # Fix connector hotplug at ly display manager
+      "amdgpu.runpm=0"
     ];
 
     zswap.enable = true;

modules/cli/shell/starship-preset.toml

@@ -53,7 +53,7 @@ symbol = "  "
 symbol = " "
 
 [git_commit]
-tag_symbol = '  '
+tag_symbol = "  "
 
 [golang]
 symbol = " "

modules/cli/shell/starship.nix

@@ -17,8 +17,7 @@ in
           enable = true;
           settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
             add_newline = false;
-            command_timeout = 2000;
+            scan_timeout = 1500;
-            nix_shell.disabled = true;
             format =
               let
                 dedupDollar =

modules/cli/vcs/jj.nix

@@ -17,6 +17,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    my.persist.homeDirs = [
+      ".config/jj"
+    ];
     my.hm = {
       programs.jujutsu = {
         enable = true;

modules/coding/agents.nix

@@ -14,13 +14,17 @@ in
 
   config = lib.mkIf cfg.enable {
     my.hm = {
-      home.packages = with pkgs.llm-agents; [
+      home.packages =
-        codex
+        (with pkgs.llm-agents; [
-        claude-code
+          # codex
-        # opencode
+          claude-code
-        pi
+          # opencode
-        omp
+          # pi
-      ];
+          # omp
+        ])
+        ++ (with pkgs; [
+          codex
+        ]);
     };
     my.persist = {
       homeDirs = [
@@ -35,6 +39,9 @@ in
 
         ".pi"
         ".omp"
+
+        ".config/ZCode"
+        ".zcode"
       ];
       homeFiles = [
         ".claude.json"

modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua

@@ -81,6 +81,7 @@ local servers = {
   java_language_server = {},
   jsonls = {},
   pyrefly = {},
+  ruff = {},
   -- taplo = {},
   tombi = {},
   ts_ls = {},

modules/coding/langs/c.nix

@@ -18,6 +18,8 @@ in
       (lib.hiPrio clang)
       clang-tools
       cmake
+      ninja
+      meson
     ];
   };
 }

modules/coding/langs/python.nix

@@ -14,9 +14,15 @@ in
 
   config = lib.mkIf cfg.enable {
     my.hm.home.packages = with pkgs; [
-      python3
+      (python3.withPackages (
+        ps: with ps; [
+          tomli
+          tomli-w
+        ]
+      ))
       uv
       pyrefly
+      ruff
     ];
   };
 }

modules/coding/langs/rust.nix

@@ -24,7 +24,6 @@ in
           "rust-analyzer"
         ])
         stdenv.cc # linker
-        evcxr # rust repl
 
         pest-ide-tools
       ];

modules/coding/misc.nix

@@ -19,6 +19,22 @@ in
         gnumake
         github-cli # gh
       ];
+      programs.starship.settings = {
+        nix_shell.disabled = true;
+        # direnv =
+        #   let
+        #     esc = builtins.fromJSON ''"\u001b"'';
+        #   in
+        #   {
+        #     disabled = false;
+        #     format = "$loaded$allowed ";
+        #     loaded_msg = "${esc}[1;92m ${esc}[0m"; # green
+        #     unloaded_msg = "";
+        #     allowed_msg = "";
+        #     not_allowed_msg = "${esc}[1;93m ${esc}[0m"; # yellow
+        #     denied_msg = "${esc}[1;91m ${esc}[0m"; # red
+        #   };
+      };
       programs.direnv = {
         enable = true;
         nix-direnv.enable = true;
@@ -28,9 +44,27 @@ in
             hide_env_diff = false;
           };
         };
+        stdlib = lib.mkAfter ''
+          if [[ -f .envrc.local && -z "$DIRENV_LOCAL_LOADED" ]]; then
+            export DIRENV_LOCAL_LOADED=1
+            log_status ".envrc.local detected, loading..."
+
+            skip_default_envrc() {
+              log_status "skip_default_envrc triggered, skipping .envrc"
+              exit 0
+            }
+
+            source_env .envrc.local
+
+            use() {
+              log_status "intercepted 'use $@' in .envrc"
+            }
+          fi
+        '';
       };
     };
     my.persist.homeDirs = [
+      ".config/gh"
       ".local/share/direnv"
     ];
   };

modules/core/nix-racer/.gitignore

@@ -1 +0,0 @@
-/target

modules/core/nix-racer/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "nix-racer"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-axum = "0.8"
-reqwest = { version = "0.13", features = ["rustls"] }
-serde = { version = "1.0.228", features = ["derive"] }
-tokio = { version = "1.52", features = ["full"] }
-toml = "1.1"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }

modules/core/nix-racer/_package.nix

@@ -1,29 +0,0 @@
-{
-  lib,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "nix-racer";
-  version = "0.1.0";
-
-  src = lib.fileset.toSource {
-    root = ./.;
-    fileset = lib.fileset.unions [
-      ./Cargo.toml
-      ./Cargo.lock
-      ./src
-    ];
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-
-  meta = {
-    description = "Nix substituter proxy with parallel cache queries and latency-aware selection";
-    mainProgram = "nix-racer";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
-  };
-}

modules/core/nix-racer/src/config.rs

@@ -1,64 +0,0 @@
-use reqwest::Url;
-use serde::{Deserialize, Deserializer, de::Error};
-use std::net::{SocketAddr, SocketAddrV4};
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct AppConfig {
-    #[serde(default = "default_listen")]
-    pub listen: SocketAddr,
-    pub substituters: Vec<Substituter>,
-}
-
-impl Default for AppConfig {
-    fn default() -> Self {
-        Self {
-            listen: default_listen(),
-            substituters: vec![
-                Substituter {
-                    url: "https://mirror.sjtu.edu.cn/nix-channels/store",
-                    penalty: 0,
-                },
-                Substituter {
-                    url: "https://mirrors.ustc.edu.cn/nix-channels/store",
-                    penalty: 0,
-                },
-                Substituter {
-                    url: "https://cache.nixos.org",
-                    penalty: 100,
-                },
-            ],
-        }
-    }
-}
-
-fn default_listen() -> SocketAddr {
-    SocketAddr::V4(SocketAddrV4::new([127, 0, 0, 1].into(), 2048))
-}
-
-#[derive(Debug, Clone)]
-pub struct Substituter {
-    pub url: &'static str,
-    pub penalty: u32,
-}
-
-impl<'de> Deserialize<'de> for Substituter {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Debug, Clone, Deserialize)]
-        struct ShadowSubstituter {
-            url: String,
-            #[serde(default)]
-            penalty: u32,
-        }
-        let sub = <ShadowSubstituter as Deserialize>::deserialize(deserializer);
-        sub.and_then(|ShadowSubstituter { url, penalty }| {
-            let url = match Url::parse(&url) {
-                Ok(url) => Ok(Box::leak(url.to_string().into_boxed_str())),
-                Err(err) => Err(<D::Error as Error>::custom(err.to_string())),
-            }?;
-            Ok(Substituter { url, penalty })
-        })
-    }
-}

modules/core/nix-racer/src/main.rs

@@ -1,212 +0,0 @@
-use std::{
-    collections::HashMap,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-use axum::{
-    Router,
-    extract::{Path, State},
-    http::{StatusCode, header},
-    response::{IntoResponse, Redirect},
-    routing::get,
-};
-use reqwest::Client;
-use tokio::task::JoinSet;
-use tracing_subscriber::{EnvFilter, layer::SubscriberExt as _, util::SubscriberInitExt as _};
-
-mod config;
-use config::*;
-
-#[derive(Clone)]
-struct AppState {
-    client: Client,
-    config: Arc<AppConfig>,
-}
-
-#[tokio::main]
-async fn main() {
-    tracing_subscriber::registry()
-        .with(tracing_subscriber::fmt::layer())
-        .with(
-            EnvFilter::builder()
-                .with_env_var("NIX_RACER_LOG")
-                .with_default_directive("nix_racer=debug".parse().unwrap())
-                .from_env()
-                .unwrap(),
-        )
-        .init();
-
-    let config: Arc<AppConfig> = match std::fs::read_to_string("/etc/nix/nix-racer.toml") {
-        Ok(file) => toml::from_str::<AppConfig>(&file).unwrap_or_else(|x| {
-            tracing::warn!("Failed to parse config file ({x}), fallback to default configuration");
-            AppConfig::default()
-        }),
-        Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
-            tracing::info!("Config file not found, fallback to default configuration");
-            AppConfig::default()
-        }
-        Err(err) => {
-            tracing::warn!("Failed to read config file ({err}), fallback to default configuration");
-            AppConfig::default()
-        }
-    }
-    .into();
-
-    if config.substituters.is_empty() {
-        tracing::error!("No substituters found");
-        std::process::exit(1);
-    }
-
-    let listen = config.listen;
-
-    let client = Client::builder()
-        .timeout(Duration::from_secs(5))
-        .pool_idle_timeout(Duration::from_secs(90))
-        .build()
-        .unwrap();
-
-    let state = AppState { client, config };
-
-    let listener = tokio::net::TcpListener::bind(listen).await.unwrap();
-
-    let app = Router::new()
-        .route("/nix-cache-info", get(nix_cache_info_handler))
-        .route("/{*path}", get(proxy_handler))
-        .with_state(state);
-
-    tracing::info!("Smart Nix Proxy listening on http://{listen}");
-    axum::serve(listener, app).await.unwrap();
-}
-
-async fn nix_cache_info_handler() -> impl IntoResponse {
-    let info = "StoreDir: /nix/store\nWantMassQuery: 1\nPriority: 30\n";
-    ([(header::CONTENT_TYPE, "text/x-nix-cache-info")], info)
-}
-
-async fn proxy_handler(
-    Path(path): Path<String>,
-    State(state): State<AppState>,
-) -> impl IntoResponse {
-    if !path.ends_with(".narinfo") {
-        let redirect_url = format!("{}/{}", state.config.substituters[0].url, path);
-        return Redirect::temporary(&redirect_url).into_response();
-    }
-
-    let start_time = Instant::now();
-    let mut set = JoinSet::new();
-
-    let mut penalties = HashMap::new();
-
-    for upstream in state.config.substituters.iter() {
-        let url = format!("{}/{}", upstream.url, path);
-        let client = state.client.clone();
-        let base_url = upstream.url;
-
-        let handle = set.spawn(async move {
-            let max_retries = 2;
-            let mut delay = Duration::from_millis(50);
-
-            for attempt in 0..=max_retries {
-                match client.get(&url).send().await {
-                    Ok(resp) if resp.status().is_success() => {
-                        let bytes = resp.bytes().await.map_err(|_| "Body error")?;
-
-                        let text = String::from_utf8_lossy(&bytes);
-                        let mut new_text = String::with_capacity(text.len() + 64);
-                        for line in text.lines() {
-                            if let Some(rel_url) = line.strip_prefix("URL: ") {
-                                if rel_url.starts_with("http://") || rel_url.starts_with("https://")
-                                {
-                                    new_text.push_str(line);
-                                } else {
-                                    new_text.push_str(&format!("URL: {}/{}", base_url, rel_url));
-                                }
-                            } else {
-                                new_text.push_str(line);
-                            }
-                            new_text.push('\n');
-                        }
-                        return Ok((new_text.into_bytes(), base_url));
-                    }
-                    Ok(resp) if resp.status() == StatusCode::NOT_FOUND => return Err("404"),
-                    Err(_) => {
-                        if attempt == max_retries {
-                            return Err("Max retries");
-                        }
-                        tokio::time::sleep(delay).await;
-                        delay *= 2;
-                    }
-                    _ => return Err("Other HTTP Error"),
-                }
-            }
-            Err("Unreachable")
-        });
-
-        penalties.insert(handle.id(), upstream.penalty);
-    }
-
-    struct ProxyResult {
-        score: Duration,
-        body: Vec<u8>,
-        url: &'static str,
-    }
-    let mut best_result: Option<ProxyResult> = None;
-
-    loop {
-        let min_active_penalty = penalties.values().min().copied();
-
-        if let Some(ProxyResult { score, .. }) = best_result {
-            if let Some(min_p) = min_active_penalty {
-                if start_time.elapsed() + Duration::from_millis(u64::from(min_p)) >= score {
-                    break;
-                }
-            } else {
-                break;
-            }
-        } else if min_active_penalty.is_none() {
-            break;
-        }
-
-        let timeout_dur = if let Some(ProxyResult { score, .. }) = best_result {
-            score.saturating_sub(start_time.elapsed())
-        } else {
-            Duration::from_secs(86400)
-        };
-
-        if timeout_dur.is_zero() && best_result.is_some() {
-            break;
-        }
-
-        let res = tokio::time::timeout(timeout_dur, set.join_next_with_id()).await;
-
-        match res {
-            Ok(Some(Ok((task_id, task_res)))) => {
-                let penalty = penalties.remove(&task_id).unwrap();
-                if let Ok((body, url)) = task_res {
-                    let score = start_time.elapsed() + Duration::from_millis(u64::from(penalty));
-                    if best_result.as_ref().is_none_or(|best| score < best.score) {
-                        best_result = Some(ProxyResult { score, body, url })
-                    }
-                }
-            }
-            Ok(Some(Err(join_err))) => {
-                penalties.remove(&join_err.id());
-            }
-            Ok(None) => break,
-            Err(_) => break,
-        }
-    }
-
-    if let Some(ProxyResult { score, body, url }) = best_result {
-        tracing::debug!("Winner for {}: {} (Score: {:?})", path, url, score,);
-        (
-            StatusCode::OK,
-            [(header::CONTENT_TYPE, "text/x-nix-narinfo")],
-            body,
-        )
-            .into_response()
-    } else {
-        (StatusCode::NOT_FOUND, "Not Found").into_response()
-    }
-}

modules/core/nix.nix

@@ -30,104 +30,51 @@ in
     environment.systemPackages = with pkgs; [
       nix-output-monitor
       nh
+      nix-tree-rs
+      fast-nix-gc
     ];
 
-    environment.etc =
+    environment.etc = (
-      (lib.mapAttrs' (name: value: {
+      lib.mapAttrs' (name: value: {
         name = "nix/path/${name}";
         value.source = value.flake;
-      }) config.nix.registry)
+      }) config.nix.registry
-      // {
+    );
-        "nix/nix-racer.toml".source = (pkgs.formats.toml { }).generate "nix-racer.toml" {
+
-          listen = "127.0.0.1:2048";
+    services.selector4nix = {
-          substituters = [
+      enable = true;
-            # {
+      configureSubstituter = "keep";
-            #   penalty = 0;
+      settings = {
-            #   url = "https://mirror.sjtu.edu.cn/nix-channels/store";
+        server = {
-            # }
+          ip = "0.0.0.0";
-            {
+          port = 5496;
-              penalty = 0;
-              url = "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store";
-            }
-            {
-              penalty = 50;
-              url = "https://mirrors.ustc.edu.cn/nix-channels/store";
-            }
-            {
-              penalty = 0;
-              url = "https://nix-community.cachix.org";
-            }
-            {
-              penalty = 0;
-              url = "https://cache.numtide.com";
-            }
-            {
-              penalty = 100;
-              url = "https://cache.nixos.org";
-            }
-          ];
         };
-      };
+        substituters = map (subst: if builtins.isString subst then { url = subst; } else subst) [
-
+          "https://mirror.sjtu.edu.cn/nix-channels/store"
-    systemd.services.nix-racer = {
+          "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
-      description = "Nix substituter proxy with parallel cache queries and latency-aware selection";
+          "https://mirrors.ustc.edu.cn/nix-channels/store"
-      wantedBy = [ "multi-user.target" ];
+          "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
-      after = [ "network-online.target" ];
+          "https://nix-community.cachix.org"
-      wants = [ "network-online.target" ];
+          "https://selector4nix.cachix.org/"
-
+          "https://cache.numtide.com"
-      serviceConfig = {
+          "https://cache.nixos.org"
-        Type = "simple";
-        ExecStart = "${lib.getExe (pkgs.callPackage ./nix-racer/_package.nix { })}";
-        Restart = "on-failure";
-        RestartSec = 5;
-
-        DynamicUser = true;
-        CapabilityBoundingSet = [ "" ];
-        DeviceAllow = "";
-        LockPersonality = true;
-        MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
-        PrivateDevices = true;
-        PrivateTmp = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectHostname = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectSystem = "strict";
-        RestrictAddressFamilies = [
-          "AF_INET"
-          "AF_INET6"
         ];
-        RestrictNamespaces = true;
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        SystemCallArchitectures = "native";
-        SystemCallFilter = [
-          "@system-service"
-          "~@resources"
-          "~@privileged"
-        ];
-        UMask = "0077";
       };
     };
 
     nix.settings = {
-      experimental-features = "nix-command flakes pipe-operators";
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "pipe-operators"
+      ];
       substituters = lib.mkForce [
-        "http://127.0.0.1:2048"
+        "http://127.0.0.1:${toString (config.services.selector4nix.settings.server.port or 5496)}"
-        "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
-        "https://cache.numtide.com"
         "https://cache.nixos.org"
-
-        # "https://mirrors.ustc.edu.cn/nix-channels/store"
-        # "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
-        # "https://nix-community.cachix.org"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "selector4nix.cachix.org-1:wovVlT07In5JCVz2tFgxPQTLpnN8hZT6P/RwfFcz3KE="
         "niks3.numtide.com-1:DTx8wZduET09hRmMtKdQDxNNthLQETkc/yaX7M4qK0g="
       ];
       download-buffer-size = 536870912; # 512 MiB

modules/desktop/media/splayer.nix

@@ -14,10 +14,10 @@ in
 
   config = lib.mkIf cfg.enable {
     my.hm.home.packages = [
-      pkgs.splayer
+      pkgs.splayer-next
     ];
     my.persist.homeDirs = [
-      ".config/SPlayer"
+      ".config/SPlayer-Next"
     ];
   };
 }

modules/desktop/terminal/alacritty/tokyonight-storm.toml

@@ -6,44 +6,44 @@
 
 # Default colors
 [colors.primary]
-background = '#24283b'
+background = "#24283b"
-foreground = '#c0caf5'
+foreground = "#c0caf5"
 
 [colors.cursor]
-cursor = '#c0caf5'
+cursor = "#c0caf5"
-text = '#24283b'
+text = "#24283b"
 
 [colors.selection]
-text = '#c0caf5'
+text = "#c0caf5"
-background = '#2e3c64'
+background = "#2e3c64"
 
 # Normal colors
 [colors.normal]
-black = '#1d202f'
+black = "#1d202f"
-red = '#f7768e'
+red = "#f7768e"
-green = '#9ece6a'
+green = "#9ece6a"
-yellow = '#e0af68'
+yellow = "#e0af68"
-blue = '#7aa2f7'
+blue = "#7aa2f7"
-magenta = '#bb9af7'
+magenta = "#bb9af7"
-cyan = '#7dcfff'
+cyan = "#7dcfff"
-white = '#a9b1d6'
+white = "#a9b1d6"
 
 # Bright colors
 [colors.bright]
-black = '#414868'
+black = "#414868"
-red = '#ff899d'
+red = "#ff899d"
-green = '#9fe044'
+green = "#9fe044"
-yellow = '#faba4a'
+yellow = "#faba4a"
-blue = '#8db0ff'
+blue = "#8db0ff"
-magenta = '#c7a9ff'
+magenta = "#c7a9ff"
-cyan = '#a4daff'
+cyan = "#a4daff"
-white = '#c0caf5'
+white = "#c0caf5"
 
 # Indexed Colors
 [[colors.indexed_colors]]
 index = 16
-color = '#ff9e64'
+color = "#ff9e64"
 
 [[colors.indexed_colors]]
 index = 17
-color = '#db4b4b'
+color = "#db4b4b"

modules/desktop/wm/niri/config/binds.kdl

@@ -1,15 +1,15 @@
 binds {
 	Ctrl+Alt+Escape { spawn "missioncenter"; }
 
-	Mod+R { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; }
+	Mod+R { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
-	Mod+V { spawn "noctalia-shell" "ipc" "call" "launcher" "clipboard"; }
+	Mod+V { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
-	Mod+W { spawn "noctalia-shell" "ipc" "call" "launcher" "windows"; }
+	Mod+W { spawn "noctalia" "msg" "panel-toggle" "launcher" "/win"; }
 
 	XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_SINK@" "2%+"; }
 	XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_SINK@" "2%-"; }
-	XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "media" "playPause"; }
+	XF86AudioMute allow-when-locked=true { spawn "noctalia" "msg" "media" "playPause"; }
-	Super+XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "media" "next"; }
+	Super+XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia" "msg" "media" "next"; }
-	Super+XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "media" "previous"; }
+	Super+XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia" "msg" "media" "previous"; }
 
     XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "set" "+5%"; }
 	XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "set" "5%-"; }

modules/desktop/wm/niri/config/config.kdl

@@ -46,6 +46,12 @@ layout {
     }
 }
 
+gestures {
+    hot-corners {
+        off
+    }
+}
+
 prefer-no-csd
 
 hotkey-overlay {

modules/desktop/wm/niri/default.nix

@@ -2,7 +2,7 @@
   lib,
   config,
   pkgs,
-  assets,
+  impure,
   ...
 }:
 let
@@ -58,16 +58,16 @@ in
         xdg-desktop-portal-gnome
       ];
     };
-    systemd.user.services.niri-polkit = {
+    # Keep switch-to-configuration from stopping the running compositor
-      description = "PolicyKit Authentication Agent";
+    # when the niri store path changes; niri-nix dropped this drop-in in
-      wantedBy = [ "niri.service" ];
+    # acccaf2202. The new binary takes effect on next login instead.
-      after = [ "graphical-session.target" ];
+    systemd.user.units."niri.service" = {
-      partOf = [ "graphical-session.target" ];
+      overrideStrategy = "asDropinIfExists";
-      serviceConfig = {
+      text = ''
-        Type = "simple";
+        [Service]
-        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        X-StopIfChanged=false
-        Restart = "on-failure";
+        X-RestartIfChanged=false
-      };
+      '';
     };
 
     services.system76-scheduler.enable = true;
@@ -82,177 +82,16 @@ in
 
         mission-center
 
-        noctalia-shell
         xdg-terminal-exec
       ];
 
       services.system76-scheduler-niri.enable = true;
 
-      programs.noctalia-shell = {
+      programs.noctalia = {
         enable = true;
-        # modified from official Tokyo-Night theme
+        systemd.enable = true;
-        colors = {
-          mError = "#f7768e";
-          mHover = "#bb9af7";
-          mOnError = "#16161e";
-          mOnHover = "#16161e";
-          mOnPrimary = "#16161e";
-          mOnSecondary = "#16161e";
-          mOnSurface = "#c0caf5";
-          mOnSurfaceVariant = "#9aa5ce";
-          mOnTertiary = "#16161e";
-          mOutline = "#353D57";
-          mPrimary = "#7aa2f7";
-          mSecondary = "#9a9ef7";
-          mShadow = "#15161e";
-          mSurface = "#1a1b26";
-          mSurfaceVariant = "#24283b";
-          mTertiary = "#bb9af7";
-        };
-        settings = {
-          appLauncher = {
-            enableClipboardHistory = true;
-            useApp2Unit = true;
-            terminalCommand = "kitty -e";
-          };
-          audio.mprisBlacklist = [
-            "firefox"
-            "chromium"
-            "zen"
-          ];
-          bar = {
-            density = "comfortable";
-            floating = true;
-            marginHorizontal = 0.5;
-            marginVertical = 0.5;
-            showCapsule = false;
-            widgets = {
-              left = [
-                {
-                  id = "ControlCenter";
-                  useDistroLogo = true;
-                }
-                {
-                  id = "Clock";
-                  formatHorizontal = "HH:mm MM/dd ddd";
-                  useCustomFont = false;
-                  usePrimaryColor = true;
-                }
-                {
-                  id = "SystemMonitor";
-                  showCpuTemp = false;
-                  showCpuUsage = true;
-                  showDiskUsage = false;
-                  showMemoryAsPercent = false;
-                  showMemoryUsage = true;
-                  showNetworkStats = true;
-                }
-                {
-                  id = "Workspace";
-                  hideUnoccupied = false;
-                  labelMode = "none";
-                }
-              ];
-              center = [
-                {
-                  id = "MediaMini";
-                  hideMode = "hidden";
-                  scrollingMode = "hover";
-                  showAlbumArt = true;
-                  showVisualizer = true;
-                  visualizerType = "wave";
-                }
-              ];
-              right = [
-                {
-                  id = "NotificationHistory";
-                  hideWhenZero = true;
-                  showUnreadBadge = true;
-                }
-                {
-                  id = "Tray";
-                  drawerEnabled = false;
-                  colorizeIcons = false;
-                }
-                {
-                  id = "Volume";
-                  displayMode = "onhover";
-                }
-                {
-                  id = "Microphone";
-                  displayMode = "onhover";
-                }
-                {
-                  id = "Battery";
-                  hideIfNotDetected = true;
-                }
-              ];
-            };
-          };
-          controlCenter = {
-            cards = [
-              {
-                id = "profile-card";
-                enabled = true;
-              }
-              {
-                id = "shortcuts-card";
-                enabled = true;
-              }
-              {
-                id = "audio-card";
-                enabled = true;
-              }
-              {
-                id = "weather-card";
-                enabled = false;
-              }
-              {
-                id = "media-sysmon-card";
-                enabled = true;
-              }
-            ];
-            position = "top_left";
-            shortcuts = {
-              left = [
-                { id = "Bluetooth"; }
-                { id = "Network"; }
-              ];
-              right = [ { id = "Notifications"; } ];
-            };
-          };
-          dock.enabled = false;
-          general = {
-            avatarImage = "${assets.avatar}";
-            scaleRatio = 1.05;
-            radiusRatio = 0.8;
-            enableShadows = false;
-            telemetryEnabled = false;
-          };
-          location.weatherEnabled = false;
-          network.wifiEnabled = false;
-          notifications = {
-            alwaysOnTop = true;
-            location = "top";
-          };
-          osd = {
-            alwaysOnTop = true;
-            # enable all types
-            enabledTypes = [ ];
-            location = "top";
-          };
-          setupCompleted = true;
-          ui = {
-            # I love Jetbrains Mono
-            fontDefault = "Monospace";
-            fontFixed = "Monospace";
-            panelsAttachedToBar = false;
-            panelsOverlayLayer = true;
-            tooltipsEnabled = true;
-          };
-          wallpaper.enabled = false;
-        };
       };
+      xdg.configFile."noctalia".source = impure.mkImpureLink ./noctalia;
     };
   };
 }

modules/desktop/wm/niri/noctalia/accessibility.toml

@@ -0,0 +1,2 @@
+[accessibility]
+ui_scale = 1

modules/desktop/wm/niri/noctalia/audio.toml

@@ -0,0 +1,2 @@
+[audio]
+enable_sounds = true

modules/desktop/wm/niri/noctalia/bar.toml

@@ -0,0 +1,34 @@
+[bar.main]
+capsule = false
+capsule_thickness = 0.75
+center = [
+  "media",
+]
+end = [
+  "notifications",
+  "Spacer-12",
+  "tray",
+  "Spacer-12",
+  "output_volume",
+  "input_volume",
+]
+font_family = "monospace"
+margin_edge = 11
+margin_ends = 15
+padding = 10
+position = "top"
+radius = 16
+scale = 1.15
+shadow = false
+start = [
+  "control-center",
+  "Spacer-12",
+  "clock",
+  "Spacer-12",
+  "sysmon_cpu",
+  "sysmon_ram",
+  "battery",
+  "Spacer-12",
+  "workspaces",
+]
+thickness = 38

modules/desktop/wm/niri/noctalia/control-center.toml

@@ -0,0 +1,4 @@
+[control_center]
+hidden_tabs = ["weather"]
+shortcuts = []
+show_shortcut_labels = false

modules/desktop/wm/niri/noctalia/desktop-widgets.toml

@@ -0,0 +1,10 @@
+[desktop_widgets]
+schema_version = 2
+widget_order = []
+
+[desktop_widgets.grid]
+cell_size = 16
+major_interval = 4
+visible = true
+
+[desktop_widgets.widget]

modules/desktop/wm/niri/noctalia/dock.toml

@@ -0,0 +1,2 @@
+[dock]
+enabled = false

modules/desktop/wm/niri/noctalia/hot-corners.toml

@@ -0,0 +1,7 @@
+[hot_corners]
+delay_ms = 200
+enabled = true
+
+[hot_corners.top_left]
+action = "command"
+command = "niri msg action toggle-overview"

modules/desktop/wm/niri/noctalia/idle.toml

@@ -0,0 +1,17 @@
+[idle]
+behavior_order = ["lock", "screen-off", "lock-and-suspend"]
+
+[idle.behavior.lock]
+action = "lock"
+enabled = true
+timeout = 300.0
+
+[idle.behavior.lock-and-suspend]
+action = "lock_and_suspend"
+enabled = false
+timeout = 900.0
+
+[idle.behavior.screen-off]
+action = "screen_off"
+enabled = true
+timeout = 600.0

modules/desktop/wm/niri/noctalia/lockscreen.toml

@@ -0,0 +1,103 @@
+[lockscreen]
+wallpaper = "~/workspace/nixos-dotfiles/assets/wallpaper.png"
+
+[lockscreen_widgets]
+enabled = true
+schema_version = 2
+widget_order = [
+  "lockscreen-login-box@DP-1",
+  "lockscreen-login-box@DP-2",
+  "lockscreen-widget-clock@DP-1",
+  "lockscreen-widget-clock@DP-2",
+]
+
+[lockscreen_widgets.grid]
+cell_size = 16
+major_interval = 4
+visible = true
+
+[lockscreen_widgets.widget."lockscreen-login-box@DP-1"]
+box_height = 70.0
+box_width = 400.0
+cx = 1024.0
+cy = 675.0
+output = "DP-1"
+placement_height = 1152.0
+placement_width = 2048.0
+rotation = 0.0
+type = "login_box"
+
+[lockscreen_widgets.widget."lockscreen-login-box@DP-1".settings]
+background_color = "surface_variant"
+background_opacity = 0.88
+background_radius = 12.0
+center_password_text = false
+input_opacity = 1.0
+input_radius = 6.0
+layout = "compact"
+show_caps_lock = true
+show_keyboard_layout = false
+show_login_button = false
+show_media = true
+show_session_buttons = true
+show_unlock_hint = false
+show_weather = true
+
+[lockscreen_widgets.widget."lockscreen-login-box@DP-2"]
+box_height = 70.0
+box_width = 400.0
+cx = 1024.0
+cy = 675.0
+output = "DP-2"
+placement_height = 1152.0
+placement_width = 2048.0
+rotation = 0.0
+type = "login_box"
+
+[lockscreen_widgets.widget."lockscreen-login-box@DP-2".settings]
+background_color = "surface_variant"
+background_opacity = 0.88
+background_radius = 12.0
+center_password_text = false
+input_opacity = 1.0
+input_radius = 6.0
+layout = "compact"
+show_caps_lock = true
+show_keyboard_layout = false
+show_login_button = false
+show_media = true
+show_session_buttons = true
+show_unlock_hint = false
+show_weather = true
+
+[lockscreen_widgets.widget."lockscreen-widget-clock@DP-1"]
+box_height = 144.0
+box_width = 240.0
+cx = 1024.0
+cy = 480.0
+output = "DP-1"
+placement_height = 1152.0
+placement_width = 2048.0
+rotation = 0.0
+type = "clock"
+
+[lockscreen_widgets.widget."lockscreen-widget-clock@DP-1".settings]
+background = false
+clock_style = "digital"
+format = "{:%H:%M}"
+
+[lockscreen_widgets.widget."lockscreen-widget-clock@DP-2"]
+box_height = 144.0
+box_width = 240.0
+cx = 1024.0
+cy = 480.0
+output = "DP-2"
+placement_height = 1152.0
+placement_width = 2048.0
+rotation = 0.0
+type = "clock"
+
+[lockscreen_widgets.widget."lockscreen-widget-clock@DP-2".settings]
+background = false
+clock_style = "digital"
+format = "{:%H:%M}"

modules/desktop/wm/niri/noctalia/notification.toml

@@ -0,0 +1,2 @@
+[notification]
+layer = "top"

modules/desktop/wm/niri/noctalia/osd.toml

@@ -0,0 +1,6 @@
+[osd]
+position = "top_center"
+
+[osd.kinds]
+keyboard_layout = false
+media = false

modules/desktop/wm/niri/noctalia/palettes/TokyoNight.json

@@ -0,0 +1,48 @@
+{
+  "dark": {
+    "mPrimary": "#7aa2f7",
+    "mOnPrimary": "#16161e",
+    "mSecondary": "#9a9ef7",
+    "mOnSecondary": "#16161e",
+    "mTertiary": "#bb9af7",
+    "mOnTertiary": "#16161e",
+    "mError": "#f7768e",
+    "mOnError": "#16161e",
+    "mSurface": "#1a1b26",
+    "mOnSurface": "#c0caf5",
+    "mSurfaceVariant": "#24283b",
+    "mOnSurfaceVariant": "#9aa5ce",
+    "mOutline": "#353d57",
+    "mShadow": "#15161e",
+    "mHover": "#bb9af7",
+    "mOnHover": "#16161e",
+    "terminal": {
+      "background": "#1a1b26",
+      "foreground": "#c0caf5",
+      "cursor": "#c0caf5",
+      "cursorText": "#1a1b26",
+      "selectionFg": "#c0caf5",
+      "selectionBg": "#283457",
+      "normal": {
+        "black": "#16161e",
+        "red": "#f7768e",
+        "green": "#9ece6a",
+        "yellow": "#e0af68",
+        "blue": "#7aa2f7",
+        "magenta": "#bb9af7",
+        "cyan": "#7dcfff",
+        "white": "#c0caf5"
+      },
+      "bright": {
+        "black": "#1a1b26",
+        "red": "#ff7a93",
+        "green": "#b9f27c",
+        "yellow": "#ffc777",
+        "blue": "#7da6ff",
+        "magenta": "#bb9af7",
+        "cyan": "#89ddff",
+        "white": "#d5d6e3"
+      }
+    }
+  }
+}

modules/desktop/wm/niri/noctalia/shell.toml

@@ -0,0 +1,39 @@
+# tombi: format.rules.table-keys-order.disabled = true
+[shell]
+avatar_path = "~/workspace/nixos-dotfiles/assets/avatar.jpg"
+corner_radius_scale = 1.5
+date_format = "%Y/%m/%d"
+font_family = "monospace"
+lang = "en"
+launch_apps_as_systemd_services = true
+panel_anchor_bar = "main"
+polkit_agent = true
+screen_time_enabled = true
+telemetry_enabled = false
+
+clipboard_enabled = true
+clipboard_history_max_entries = 1000
+
+[shell.animation]
+speed = 0.8
+
+[shell.launcher]
+sort_by_usage = true
+
+[shell.mpris]
+blacklist = ["firefox", "chromium", "zen"]
+
+[shell.panel]
+borders = false
+clipboard_placement = "floating"
+control_center_placement = "floating"
+launcher_placement = "floating"
+open_near_click_control_center = true
+session_placement = "floating"
+session_position = "center"
+shadow = true
+transparency_mode = "soft"
+wallpaper_placement = "floating"
+
+[shell.shadow]
+alpha = 0.0

modules/desktop/wm/niri/noctalia/theme.toml

@@ -0,0 +1,4 @@
+[theme]
+custom_palette = "TokyoNight"
+mode = "dark"
+source = "custom"

modules/desktop/wm/niri/noctalia/wallpaper.toml

@@ -0,0 +1,2 @@
+[wallpaper]
+enabled = false

modules/desktop/wm/niri/noctalia/weather.toml

@@ -0,0 +1,2 @@
+[weather]
+enabled = false

modules/desktop/wm/niri/noctalia/widgets.toml

@@ -0,0 +1,58 @@
+[widget.Spacer-12]
+length = 12
+type = "spacer"
+
+[widget.battery]
+scale = 1.2
+
+[widget.clock]
+format = "{:%H:%M %m/%d}"
+scale = 0.9
+
+[widget.control-center]
+custom_image = "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg"
+scale = 1.25
+
+[widget.input_volume]
+show_label = false
+
+[widget.media]
+art_size = 30
+font_scale = 0.84
+title_scroll = "always"
+hide_when_no_media = true
+
+[widget.mic]
+device = "input"
+type = "volume"
+
+[widget.notifications]
+capsule_radius = "auto"
+hide_when_no_unread = false
+scale = 1.05
+
+[widget.output_volume]
+show_label = false
+
+[widget.sysmon_cpu]
+scale = 1.2
+show_glyph = false
+show_value = false
+stat = "cpu_usage"
+type = "sysmon"
+visualization = "graph"
+
+[widget.sysmon_ram]
+label_show_units = false
+show_value = false
+stat = "ram_used"
+type = "sysmon"
+
+[widget.tray]
+capsule_radius = 16
+drawer = false
+
+[widget.workspaces]
+hide_when_empty = false
+pill_scale = 0.9
+show_labels = false

profiles/desktop.nix

@@ -35,6 +35,8 @@
   # GVFS for virtual filesystems
   services.gvfs.enable = true;
 
+  services.speechd.enable = false;
+
   # Enable desktop-related modules by default
   my = {
     audio.enable = true;

scripts/sync-noctalia.py

@@ -0,0 +1,491 @@
+#!/usr/bin/env python3
+"""Fold noctalia GUI overrides back into the declarative dotfiles config.
+
+This script folds `noctalia config export merged` back into the per-aspect
+*.toml files so the repo alone reproduces the current effective config:
+
+  * export values win (added if missing, updated if changed),
+  * repo-only keys and empty-table declarations are never deleted,
+  * f32 serialization noise (0.74999998696148396 vs 0.75) is ignored,
+  * floats are written back clean (0.8400000000000001 -> 0.84),
+  * comments (tombi directives) are preserved across the rewrite.
+
+Files are parsed with `tomli` and rewritten with `tomli_w`, then touched
+files are re-formatted with `tombi` to match repo style. Note that `tomli_w`
+renders every non-empty array on multiple lines and `tombi` preserves that
+layout, so arrays in a folded file are reflowed from inline to multiline the
+first time that file is touched.
+
+After a successful fold the GUI override file is moved to
+<state-dir>/settings.bak.d/<timestamp>.toml (the 3 most recent are kept) and
+the running instance is reloaded.
+
+Usage:
+  sync-noctalia.py                       # preview the fold; change nothing
+  sync-noctalia.py --apply               # apply, backup settings.toml, reload
+  sync-noctalia.py --export-file <file>  # read the export from F instead of noctalia
+  sync-noctalia.py --config-dir <dir>    # target a different config dir
+  sync-noctalia.py --state-dir <dir>     # state dir holding settings.toml
+"""
+
+import argparse
+import math
+import os
+import re
+import shutil
+import subprocess
+import sys
+from datetime import datetime, timezone
+from pathlib import Path
+from subprocess import CalledProcessError
+
+import tomli
+import tomli_w
+
+REPO = Path(__file__).resolve().parent.parent
+DEFAULT_CONFIG_DIR = REPO / "modules" / "desktop" / "wm" / "niri" / "noctalia"
+DEFAULT_STATE_DIR = Path.home() / ".local" / "state" / "noctalia"
+KEEP_BACKUPS = 3
+FLOAT_TOL = 1e-4
+FLOAT_PRECISION = 6
+
+
+def parse_export(export_file: Path | None) -> dict:
+    if export_file:
+        return tomli.loads(export_file.read_text())
+    try:
+        proc = subprocess.run(
+            ["noctalia", "config", "export", "merged"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+    except FileNotFoundError:
+        sys.exit("error: `noctalia` not found on PATH")
+    except CalledProcessError as err:
+        sys.exit(f"error: `noctalia config export merged` failed:\n{err.stderr}")
+    return tomli.loads(proc.stdout)
+
+
+def values_differ(a, b) -> bool:
+    """True if two values differ as config values (float-tolerant, recursive)."""
+    if isinstance(a, (int, float)) and isinstance(b, (int, float)):
+        return not math.isclose(float(a), float(b), rel_tol=0.0, abs_tol=FLOAT_TOL)
+    if isinstance(a, list) and isinstance(b, list):
+        return len(a) != len(b) or any(values_differ(x, y) for x, y in zip(a, b))
+    if isinstance(a, dict) and isinstance(b, dict):
+        return set(a) != set(b) or any(values_differ(a[k], b[k]) for k in a)
+    return a != b
+
+
+def collect_changes(repo_sub, exp_sub, prefix, changes):
+    """Recursively diff export subtree against repo subtree, appending
+    (path, old_value, new_value) tuples. New subtrees carry old_value=None
+    and a dict new_value."""
+    for k, v in exp_sub.items():
+        path = prefix + [k]
+        if isinstance(v, dict):
+            cur = repo_sub.get(k)
+            if isinstance(cur, dict):
+                collect_changes(cur, v, path, changes)
+            else:
+                changes.append((path, cur, v))
+        else:
+            cur = repo_sub.get(k)
+            if cur is None or values_differ(cur, v):
+                changes.append((path, cur, v))
+
+
+def clean_value(v):
+    """Round floats to FLOAT_PRECISION places, recursively.
+
+    tomli_w serialises floats with str(), which would keep f32 noise like
+    0.74999998696148396 written by a float slider; rounding keeps written
+    values clean without losing precision we care about.
+    """
+    if isinstance(v, float):
+        return round(v, FLOAT_PRECISION)
+    if isinstance(v, list):
+        return [clean_value(x) for x in v]
+    if isinstance(v, dict):
+        return {k: clean_value(x) for k, x in v.items()}
+    return v
+
+
+# Preview rendering (display only; file I/O goes through tomli_w)
+
+
+def _dotted(segments) -> str:
+    """Render segments as a TOML dotted path, quoting non-bare segments."""
+    out = []
+    for s in segments:
+        if not s or not all(c.isalnum() or c in "_-" for c in s):
+            out.append('"' + s.replace("\\", "\\\\").replace('"', '\\"') + '"')
+        else:
+            out.append(s)
+    return ".".join(out)
+
+
+def _clean_float(v: float) -> str:
+    s = f"{v:.6f}".rstrip("0").rstrip(".")
+    return s + ".0" if "." not in s else s
+
+
+def serialize_value(v, indent: str = "") -> str:
+    if isinstance(v, bool):
+        return "true" if v else "false"
+    if isinstance(v, int):
+        return str(v)
+    if isinstance(v, float):
+        return _clean_float(v)
+    if isinstance(v, str):
+        return '"' + v.replace("\\", "\\\\").replace('"', '\\"') + '"'
+    if isinstance(v, list):
+        return "[" + ", ".join(serialize_value(e, indent) for e in v) + "]"
+    if isinstance(v, dict):
+        inner = ", ".join(
+            f"{_dotted([k])} = {serialize_value(x, '')}" for k, x in v.items()
+        )
+        return "{ " + inner + " }"
+    raise TypeError(f"unsupported TOML value: {v!r}")
+
+
+def serialize_subtree(path, subtree) -> str:
+    """Serialize a dict as a TOML section block: headers followed by keys."""
+    out = []
+
+    def walk(p, d):
+        out.append(f"[{_dotted(p)}]\n")
+        for k, v in d.items():
+            if not isinstance(v, dict):
+                out.append(f"{k} = {serialize_value(v)}\n")
+        for k, v in d.items():
+            if isinstance(v, dict):
+                walk(p + [k], v)
+
+    walk(path, subtree)
+    return "".join(out)
+
+
+# Comment preservation
+
+
+def extract_comment_blocks(text: str) -> list[tuple[list[str], str | None]]:
+    """Contiguous comment lines, each paired with the table header that follows
+    them (or None for a trailing run). tomli_w drops comments when rewriting a
+    file, so they are re-anchored from the original text."""
+    lines = text.splitlines()
+    runs = []
+    i = 0
+    while i < len(lines):
+        if lines[i].lstrip().startswith("#"):
+            j = i
+            while j < len(lines) and lines[j].lstrip().startswith("#"):
+                j += 1
+            runs.append((i, j))
+            i = j
+        else:
+            i += 1
+    blocks = []
+    for start, end in runs:
+        anchor = None
+        for k in range(end, len(lines)):
+            t = lines[k].strip()
+            if t.startswith("[") and t.endswith("]"):
+                anchor = t
+                break
+        blocks.append((lines[start:end], anchor))
+    return blocks
+
+
+def restore_comments(original_text: str, rendered_text: str) -> str:
+    """Re-insert the original file's comments into tomli_w's output, before the
+    table header each comment preceded (any stragglers go at EOF)."""
+    blocks = extract_comment_blocks(original_text)
+    if not blocks:
+        return rendered_text
+    pending = list(blocks)
+    out = []
+    for line in rendered_text.splitlines():
+        stripped = line.strip()
+        if stripped.startswith("[") and stripped.endswith("]"):
+            for block, anchor in list(pending):
+                if anchor == stripped:
+                    out.extend(block)
+                    pending.remove((block, anchor))
+        out.append(line)
+    for block, _anchor in pending:
+        out.extend(block)
+    return "\n".join(out) + "\n"
+
+
+# Dict-based edits
+
+
+def apply_path(data: dict, path, value, *, as_table: bool, old):
+    """Set ``path`` to ``value`` in ``data``, creating intermediate tables.
+
+    Leaf values are assigned in place (a new key appends at the end of its
+    table). Sub-tables are inserted at their sorted position among sibling
+    sub-tables, matching the repo's alphabetical `[section]` order; a scalar
+    being replaced by a table is dropped first.
+    """
+    node = data
+    for seg in path[:-1]:
+        nxt = node.get(seg)
+        if not isinstance(nxt, dict):
+            nxt = {}
+            node[seg] = nxt
+        node = nxt
+    key = path[-1]
+    if as_table:
+        if old is not None:
+            node.pop(key, None)
+        items = list(node.items())
+        pos = len(items)
+        for i, (k, v) in enumerate(items):
+            if isinstance(v, dict) and k > key:
+                pos = i
+                break
+        items.insert(pos, (key, value))
+        node.clear()
+        node.update(items)
+    else:
+        node[key] = value
+
+
+# Verification and state handling
+
+
+def completeness_diffs(export, repo_after) -> list:
+    """Leaf paths where repo_after still differs from the export."""
+    diffs = []
+
+    def walk(e, r, prefix):
+        for k, v in e.items():
+            p = prefix + [k]
+            if isinstance(v, dict):
+                if not isinstance(r.get(k), dict):
+                    diffs.append((p, None, v))
+                else:
+                    walk(v, r[k], p)
+            else:
+                cur = r.get(k)
+                if cur is None or values_differ(cur, v):
+                    diffs.append((p, cur, v))
+
+    walk(export, repo_after, [])
+    return diffs
+
+
+def run_validate(config_dir: Path) -> bool:
+    print(f"  validate: noctalia config validate {config_dir}")
+    proc = subprocess.run(
+        ["noctalia", "config", "validate", str(config_dir)],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    out = proc.stdout + proc.stderr
+    for line in out.splitlines():
+        print(f"    {line}")
+    if "WARN" in out:
+        print(
+            "    note: confirm none of the warnings above were newly introduced by this fold"
+        )
+    return proc.returncode == 0
+
+
+def run_tombi(files) -> None:
+    for f in files:
+        proc = subprocess.run(
+            ["tombi", "format", str(f)], capture_output=True, text=True, check=False
+        )
+        if proc.returncode != 0:
+            print(f"    tombi format {f.name}: FAILED\n{proc.stdout}{proc.stderr}")
+
+
+def backup_settings(state_dir: Path, keep: int = KEEP_BACKUPS):
+    src = state_dir / "settings.toml"
+    if not src.exists():
+        return None
+    bak = state_dir / "settings.bak.d"
+    bak.mkdir(parents=True, exist_ok=True)
+    ts = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
+    dest = bak / f"{ts}.toml"
+    n = 1
+    while dest.exists():
+        dest = bak / f"{ts}-{n}.toml"
+        n += 1
+    shutil.move(str(src), str(dest))
+    # Prune oldest backups, counting only timestamp-shaped files we own.
+    backups = sorted(
+        f for f in bak.glob("*.toml") if re.fullmatch(r"\d{8}-\d{6}(?:-\d+)?", f.stem)
+    )
+    for old in backups[:-keep]:
+        old.unlink()
+    return dest
+
+
+def reload_instance():
+    proc = subprocess.run(
+        ["noctalia", "msg", "config-reload"],
+        capture_output=True,
+        text=True,
+        timeout=15,
+        check=False,
+    )
+    if proc.returncode == 0:
+        print("  reload: noctalia msg config-reload")
+    else:
+        print("  reload: noctalia not running or reload failed")
+
+
+def main():
+    ap = argparse.ArgumentParser(
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    ap.add_argument(
+        "--apply", action="store_true", help="apply the fold (default: preview only)"
+    )
+    ap.add_argument(
+        "--config-dir", type=Path, default=DEFAULT_CONFIG_DIR, help=argparse.SUPPRESS
+    )
+    ap.add_argument(
+        "--state-dir", type=Path, default=DEFAULT_STATE_DIR, help=argparse.SUPPRESS
+    )
+    ap.add_argument("--export-file", type=Path, default=None, help=argparse.SUPPRESS)
+    args = ap.parse_args()
+
+    config_dir = args.config_dir.resolve()
+    state_dir = args.state_dir
+    if not config_dir.is_dir():
+        sys.exit(f"error: config dir not found: {config_dir}")
+
+    if not args.export_file:
+        live = Path(os.path.realpath(Path.home() / ".config" / "noctalia"))
+        if live != config_dir:
+            print(
+                f"warning: ~/.config/noctalia is not linked to {config_dir} (found {live});"
+            )
+            print("         the live export may describe a different config")
+
+    export = parse_export(args.export_file)
+
+    # Parse per-aspect files; map each top-level root to its owning file.
+    files = sorted(config_dir.glob("*.toml"))
+    texts = {}
+    parsed = {}
+    for f in files:
+        text = f.read_text()
+        texts[f] = text
+        parsed[f] = tomli.loads(text)
+    root_map = {}
+    for f, d in parsed.items():
+        for root in d:
+            root_map.setdefault(root, f)
+
+    # Collect every change the export implies relative to the repo.
+    changes = []
+    new_files = {}
+    for root, subtree in export.items():
+        if not isinstance(subtree, dict):
+            continue  # do not fold top-level scalars
+        tgt = root_map.get(root)
+        if tgt is None:
+            new_files[root] = subtree
+            continue
+        cur = parsed[tgt].get(root)
+        collect_changes(cur if isinstance(cur, dict) else {}, subtree, [root], changes)
+
+    sets_by_file, subs_by_file = {}, {}
+    for path, old, val in changes:
+        f = root_map[path[0]]
+        if isinstance(val, dict):  # new subtree
+            subs_by_file.setdefault(f, []).append((path, old, val))
+        else:
+            sets_by_file.setdefault(f, []).append((path, old, val))
+
+    if not changes and not new_files:
+        print("No changes to fold. Repo config already matches the export.")
+        return
+
+    # Preview
+    touched = set(sets_by_file) | set(subs_by_file)
+    for f in sorted(touched, key=str):
+        rel = os.path.relpath(f, REPO)
+        print(f"\n{rel}")
+        for path, old, val in sorted(
+            sets_by_file.get(f, []), key=lambda c: _dotted(c[0])
+        ):
+            key = _dotted(path)
+            if old is None:
+                print(f"  + {key} = {serialize_value(val)}")
+            else:
+                print(f"  ~ {key}: {serialize_value(old)}  ->  {serialize_value(val)}")
+        for path, old, subtree in subs_by_file.get(f, []):
+            print(f"  + [{_dotted(path)}]")
+            for line in serialize_subtree(path, subtree).splitlines():
+                if line.strip():
+                    print(f"    {line}")
+    for root in new_files:
+        print(
+            f"\n  + new section root: {root} (new file {root.replace('_', '-')}.toml)"
+        )
+
+    if not args.apply:
+        total = len(changes) + len(new_files)
+        file_count = len(touched) + len(new_files)
+        print(
+            f"\n{total} change{'s' if total != 1 else ''} in {file_count} file(s)."
+        )
+        print("Run with --apply to fold into the repo.")
+        return
+
+    # Apply
+    for f in sorted(touched, key=str):
+        data = parsed[f]
+        for path, old, val in sets_by_file.get(f, []):
+            apply_path(data, path, clean_value(val), as_table=False, old=old)
+        for path, old, subtree in subs_by_file.get(f, []):
+            apply_path(data, path, clean_value(subtree), as_table=True, old=old)
+        f.write_text(restore_comments(texts[f], tomli_w.dumps(data)))
+
+    new_paths = []
+    for root, subtree in new_files.items():
+        p = config_dir / (root.replace("_", "-") + ".toml")
+        p.write_text(tomli_w.dumps(clean_value({root: subtree})))
+        new_paths.append(p)
+        files.append(p)
+
+    print("  formatting changed files with tombi...")
+    run_tombi(sorted(touched, key=str) + new_paths)
+
+    # Completeness: repo-as-loaded must now equal the export (within tolerance).
+    repo_after = {}
+    for f in files:
+        repo_after.update(tomli.loads(f.read_text()))
+    diffs = completeness_diffs(export, repo_after)
+    if diffs:
+        print("error: repo does not fully reproduce the export after applying:")
+        for p, old, val in diffs[:20]:
+            print(f"  {_dotted(p)}: {serialize_value(old)} != {serialize_value(val)}")
+        sys.exit(1)
+
+    if not run_validate(config_dir):
+        sys.exit("error: validation failed after applying changes")
+
+    bak = backup_settings(state_dir)
+    if bak:
+        print(f"  backed up {state_dir}/settings.toml -> {bak}")
+        reload_instance()
+    else:
+        # Should not reach this branch, since a fold implies GUI overrides exist.
+        print("warning: settings.toml does not exist. Nothing backuped")
+
+    total = len(changes) + len(new_files)
+    print(f"\nDone. {total} change{'s' if total != 1 else ''} folded.")
+
+
+if __name__ == "__main__":
+    main()

treefmt.nix

@@ -1,12 +1,28 @@
-{ inputs, ... }:
+{ inputs, ... }: {
-{
+  imports = [
-  imports = [ inputs.treefmt.flakeModule ];
+    inputs.treefmt.flakeModule
-  perSystem.treefmt = {
+  ];
+  perSystem.treefmt = { lib, pkgs, ... }: {
     projectRootFile = "flake.nix";
     programs = {
       nixfmt.enable = true;
-      stylua.enable = true;
       keep-sorted.enable = true;
+      stylua.enable = true;
+      ruff.enable = true;
     };
+    settings.formatter.tombi = {
+      command = "${pkgs.bash}/bin/bash";
+      options = [
+        "-euc"
+        ''
+          for file in "$@"; do
+            ${lib.getExe pkgs.tombi} fmt $file
+          done
+        ''
+        "--"
+      ];
+      includes = [ "*.toml" ];
+    };
+    settings.excludes = [ "secrets/*" ];
   };
 }

typos.toml

@@ -1,18 +1,13 @@
 #:schema https://raw.githubusercontent.com/crate-ci/typos/refs/heads/master/config.schema.json
 
 [files]
-extend-exclude = [
+extend-exclude = ["secrets"]
-    "secrets"
+
-]
+[default]
+extend-ignore-identifiers-re = ["KEY_102ND", "VE_UE"]
 
 [default.extend-words]
 # noice.nvim
 noice = "noice"
 enew = "enew"
 iif = "iif"
-
-[default]
-extend-ignore-identifiers-re = [
-    "KEY_102ND",
-    "VE_UE"
-]