treewide: fix evaluation warnings

Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6?narHash=sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc%2BThpSSHm90s%3D' (2026-01-08)
  → 'github:hyprwm/Hyprland/81e7498ec27156ee97aabba6fe4993412d98d1ab?narHash=sha256-/E66%2BtcVBnvJcOFL/CjnjBfKew6A2e%2B28EZrcRHioBw%3D' (2026-01-09)
• Updated input 'niri':
    'github:sodiboo/niri-flake/28e3e179cb997a26ffa30238f9ac700744b03a65?narHash=sha256-GSHlkIV/X8oOS15fCwdH1v1HhnYDY/beK9SCgAR0loA%3D' (2026-01-09)
  → 'github:sodiboo/niri-flake/95cbdad2ebce328c7b3fca09d9129e02d318b075?narHash=sha256-%2BRmYWQUHSSSF%2B/bVR2U/K7y6Z97fH4vvVW73IDouTFg%3D' (2026-01-10)
• Updated input 'niri/niri-unstable':
    'github:YaLTeR/niri/10df9f4717cbd4efd20ae796eb6b0aa400127bdc?narHash=sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0%3D' (2026-01-07)
  → 'github:YaLTeR/niri/a6baef7b68fcb60dfc57a9fc04e983cfd8a028ac?narHash=sha256-4thwWvKFEAFNtolJNN3i9wQ78jMI5VmejiLtjv3vNdc%3D' (2026-01-10)
• Updated input 'nix-topology':
    'github:oddlama/nix-topology/c02ed65766ba5153f38bb43e43a60fe5a1fff7d2?narHash=sha256-ofVU9FpGR8mLtI6UDnRSbpvXZBB%2B2xWUw3x8OcAYSNE%3D' (2026-01-09)
  → 'github:oddlama/nix-topology/924a60a75e17b8c405c5cf0c721449f6441b9967?narHash=sha256-VfU/4wlBPcyAfqftIyw5Yk9GPYVwMowRZcvnPBn%2BOwk%3D' (2026-01-09)
• Removed input 'nix-topology/devshell'
• Removed input 'nix-topology/devshell/nixpkgs'
• Added input 'nix-topology/flake-parts':
    'github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9?narHash=sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw%3D' (2025-12-15)
• Added input 'nix-topology/flake-parts/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/2075416fcb47225d9b68ac469a5c4801a9c4dd85?narHash=sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo%3D' (2025-12-14)
• Removed input 'nix-topology/flake-utils'
• Removed input 'nix-topology/flake-utils/systems'
• Removed input 'nix-topology/pre-commit-hooks'
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/5912c1772a44e31bf1c63c0390b90501e5026886?narHash=sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4%3D' (2026-01-07)
  → 'github:NixOS/nixpkgs/3497aa5c9457a9d88d71fa93a4a8368816fbeeba?narHash=sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww%3D' (2026-01-08)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/778a1d691f1ef45dd68c661715c5bf8cbf131c80?narHash=sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2%2BgM5tf8%3D' (2026-01-07)
  → 'github:numtide/treefmt-nix/0c445aa21b01fd1d4bb58927f7b268568af87b20?narHash=sha256-b2gJDJfi%2BTbA7Hu2sKip%2B1mWqya0GJaWrrXQjpbOVTU%3D' (2026-01-10)

flake.lock

@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765900596,
+        "lastModified": 1767024902,
-        "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
+        "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
+        "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
         "type": "github"
       },
       "original": {
@@ -185,27 +185,6 @@
         "type": "github"
       }
     },
-    "devshell_3": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-topology",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -261,15 +240,15 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -293,15 +272,15 @@
     "flake-compat_4": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -331,6 +310,24 @@
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
+      "locked": {
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
       "locked": {
         "lastModified": 1765835352,
         "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
@@ -345,7 +342,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -370,24 +367,6 @@
       "inputs": {
         "systems": "systems_4"
       },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_5"
-      },
       "locked": {
         "lastModified": 1731533236,
         "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -517,11 +496,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766553861,
+        "lastModified": 1767910483,
-        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
+        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
+        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
         "type": "github"
       },
       "original": {
@@ -531,6 +510,27 @@
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "impermanence",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747978958,
+        "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -576,11 +576,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763733840,
+        "lastModified": 1766946335,
-        "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
+        "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
+        "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1766761711,
+        "lastModified": 1768000181,
-        "narHash": "sha256-m9VZ9cxYUl9Q9+ROSKmYpVeyIAvz1faqNqBKZ4WamWI=",
+        "narHash": "sha256-/E66+tcVBnvJcOFL/CjnjBfKew6A2e+28EZrcRHioBw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "33df518f97b930316742736ecb07dc322da4c5d3",
+        "rev": "81e7498ec27156ee97aabba6fe4993412d98d1ab",
         "type": "github"
       },
       "original": {
@@ -652,11 +652,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765643131,
+        "lastModified": 1767023960,
-        "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
         "type": "github"
       },
       "original": {
@@ -682,11 +682,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766258034,
+        "lastModified": 1767723101,
-        "narHash": "sha256-0EoL8X+sYexDBusF9XyY2WoGKRqnARA+vfh/3uAi/j0=",
+        "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "3e29d68d5a830c542643a52d4be726661eaa85e7",
+        "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697",
         "type": "github"
       },
       "original": {
@@ -813,11 +813,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766160771,
+        "lastModified": 1766253372,
-        "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
+        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
+        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
         "type": "github"
       },
       "original": {
@@ -867,11 +867,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766253200,
+        "lastModified": 1767473322,
-        "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
+        "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
+        "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
         "type": "github"
       },
       "original": {
@@ -881,12 +881,16 @@
       }
     },
     "impermanence": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_2"
+      },
       "locked": {
-        "lastModified": 1737831083,
+        "lastModified": 1767822991,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+        "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5",
         "type": "github"
       },
       "original": {
@@ -939,23 +943,77 @@
         "type": "github"
       }
     },
-    "nix-topology": {
+    "niri": {
       "inputs": {
-        "devshell": "devshell_3",
+        "niri-stable": "niri-stable",
-        "flake-utils": "flake-utils",
+        "niri-unstable": "niri-unstable",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": [
+        "nixpkgs-stable": "nixpkgs-stable",
-          "pre-commit-hooks"
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1768053065,
+        "narHash": "sha256-+RmYWQUHSSSF+/bVR2U/K7y6Z97fH4vvVW73IDouTFg=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "95cbdad2ebce328c7b3fca09d9129e02d318b075",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1768048242,
+        "narHash": "sha256-4thwWvKFEAFNtolJNN3i9wQ78jMI5VmejiLtjv3vNdc=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "a6baef7b68fcb60dfc57a9fc04e983cfd8a028ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "nix-topology": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": [
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1765969653,
+        "lastModified": 1767999039,
-        "narHash": "sha256-qVpQxyvdByeDfb+d+jhbyNna2Ie+w85iHpt4Qu0rv/E=",
+        "narHash": "sha256-VfU/4wlBPcyAfqftIyw5Yk9GPYVwMowRZcvnPBn+Owk=",
         "owner": "oddlama",
         "repo": "nix-topology",
-        "rev": "0ed73e5a1b65eb8ed388d070ebe8dedb9182f466",
+        "rev": "924a60a75e17b8c405c5cf0c721449f6441b9967",
         "type": "github"
       },
       "original": {
@@ -966,11 +1024,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1766568855,
+        "lastModified": 1767185284,
-        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
+        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
+        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
         "type": "github"
       },
       "original": {
@@ -1005,11 +1063,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
+        "lastModified": 1767379071,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
         "type": "github"
       },
       "original": {
@@ -1034,13 +1092,44 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1766651565,
+        "lastModified": 1765674936,
-        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1767892417,
+        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
         "type": "github"
       },
       "original": {
@@ -1051,11 +1140,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766736597,
+        "lastModified": 1748026106,
-        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
+        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {
@@ -1066,19 +1171,19 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1766725080,
+        "lastModified": 1767448089,
-        "narHash": "sha256-JG0KvKmVyAQZ4PxKVDy7FGGUirt1lLhWwGwy9ExLCoI=",
+        "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2d3184cd3dd31f6eb57eb4ddfe2387ebd141f1e5",
+        "rev": "983751b66f255bbea1adc185364e9e7b73f82358",
         "type": "github"
       },
       "original": {
@@ -1090,7 +1195,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -1121,11 +1226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765911976,
+        "lastModified": 1767281941,
-        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
         "type": "github"
       },
       "original": {
@@ -1143,11 +1248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765911976,
+        "lastModified": 1767281941,
-        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
         "type": "github"
       },
       "original": {
@@ -1171,10 +1276,11 @@
         "hyprland-plugins": "hyprland-plugins",
         "impermanence": "impermanence",
         "kvlibadwaita": "kvlibadwaita",
+        "niri": "niri",
         "nix-topology": "nix-topology",
         "nixos-hardware": "nixos-hardware",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "pre-commit-hooks": "pre-commit-hooks_2",
@@ -1274,21 +1380,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "thunderbird-gnome-theme": {
       "flake": false,
       "locked": {
@@ -1333,11 +1424,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766000401,
+        "lastModified": 1768031762,
-        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
+        "narHash": "sha256-b2gJDJfi+TbA7Hu2sKip+1mWqya0GJaWrrXQjpbOVTU=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
+        "rev": "0c445aa21b01fd1d4bb58927f7b268568af87b20",
         "type": "github"
       },
       "original": {
@@ -1404,6 +1495,39 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767932953,
+        "narHash": "sha256-V8+DrPOp940J6icERAaGuDQTKyEyZzFuRw363XwDKXg=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "bc47ef59501556fc2584155ddef76493752dd727",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -60,6 +60,11 @@
       flake = false;
     };
 
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
     nixos-mailserver = {
@@ -81,7 +86,6 @@
     nix-topology = {
       url = "github:oddlama/nix-topology";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
     };
 
     pre-commit-hooks = {
@@ -136,7 +140,7 @@
       perSystem =
         { pkgs, ... }:
         {
-          formatter = pkgs.nixfmt-rfc-style;
+          formatter = pkgs.nixfmt;
 
           legacyPackages = pkgs.lib.packagesFromDirectoryRecursive {
             callPackage = pkgs.callPackage;
@@ -168,7 +172,7 @@
                 no-lambda-arg = true;
               };
               mdformat.enable = true;
-              nixfmt-rfc-style.enable = true;
+              nixfmt.enable = true;
               shellcheck.enable = true;
             };
           };

hosts/artemis/hardware-configuration.nix

@@ -68,8 +68,9 @@ in
       "amdgpu.sched_hw_submission=4"
       "audit=0"
     ];
-    kernelPackages = pkgs.linuxPackages_6_17;
+    kernelPackages = pkgs.linuxPackages_6_18;
     supportedFilesystems = [ "ntfs" ];
+    zfs.package = pkgs.zfs_2_4;
   };
 
   hardware = {

hosts/common.nix

@@ -24,12 +24,13 @@
     config.allowUnfree = true;
     overlays = [
       inputs.agenix.overlays.default
+      inputs.niri.overlays.niri
       (final: prev: {
         unstable = import inputs.nixpkgs-unstable {
           config = {
             allowUnfree = true;
           };
-          system = final.system;
+          system = final.stdenv.hostPlatform.system;
         };
       })
       (import ../overlays/default.nix)

hosts/odyssey/default.nix

@@ -83,6 +83,12 @@
     };
   };
 
+  # We actually use the home-manager module to add the actual portal config,
+  # but need this so relevant implementations are found
+  environment.pathsToLink = [
+    "/share/xdg-desktop-portal"
+  ];
+
   modules = {
     hardware.presonus-studio.enable = true;
     services = {
@@ -102,7 +108,7 @@
     };
     system.desktop = {
       gnome.enable = lib.mkForce false;
-      hyprland.enable = true;
+      hyprland.enable = lib.mkForce false;
     };
   };
 

modules/nixos/impermanence.nix

@@ -1,21 +1,14 @@
 {
   config,
-  pkgs,
   lib,
   ...
 }:
 let
   inherit (lib)
-    attrNames
-    flip
-    isAttrs
-    mapAttrs
     mkIf
-    mkMerge
-    mkOption
     optionals
-    types
     ;
+  zfsPkg = config.boot.zfs.package;
 in
 {
   boot.zfs.forceImportRoot = false;
@@ -31,7 +24,7 @@ in
         unitConfig.DefaultDependencies = "no";
         serviceConfig = {
           Type = "oneshot";
-          ExecStart = "${pkgs.zfs}/bin/zfs rollback -r rpool/local/root@blank";
+          ExecStart = "${zfsPkg}/bin/zfs rollback -r rpool/local/root@blank";
         };
       };
 
@@ -88,60 +81,4 @@ in
   };
 
   users.mutableUsers = !config.environment.persistence."/persist".enable;
-
-  # For each user that has a home-manager config, merge the locally defined
-  # persistence options that we defined above.
-  imports =
-    let
-      mkUserFiles = map (
-        x: { parentDirectory.mode = "700"; } // (if isAttrs x then x else { file = x; })
-      );
-      mkUserDirs = map (x: { mode = "700"; } // (if isAttrs x then x else { directory = x; }));
-    in
-    [
-      {
-        environment.persistence = mkMerge (
-          flip map (attrNames config.home-manager.users) (
-            user:
-            let
-              hmUserCfg = config.home-manager.users.${user};
-            in
-            flip mapAttrs hmUserCfg.home.persistence (
-              _: sourceCfg: {
-                users.${user} = {
-                  files = mkUserFiles sourceCfg.files;
-                  directories = mkUserDirs sourceCfg.directories;
-                };
-              }
-            )
-          )
-        );
-      }
-    ];
-
-  home-manager.sharedModules = [
-    {
-      options.home.persistence = mkOption {
-        description = "Additional persistence config for the given source path";
-        default = { };
-        type = types.attrsOf (
-          types.submodule {
-            options = {
-              files = mkOption {
-                description = "Additional files to persist via NixOS impermanence.";
-                type = types.listOf (types.either types.attrs types.str);
-                default = [ ];
-              };
-
-              directories = mkOption {
-                description = "Additional directories to persist via NixOS impermanence.";
-                type = types.listOf (types.either types.attrs types.str);
-                default = [ ];
-              };
-            };
-          }
-        );
-      };
-    }
-  ];
 }

modules/nixos/podman.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...
@@ -9,6 +8,7 @@ with lib;
 
 let
   cfg = config.modules.podman;
+  zfsPkg = config.boot.zfs.package;
 in
 {
   options.modules.podman = {
@@ -29,7 +29,7 @@ in
           dates = "weekly";
           flags = [ "--all" ];
         };
-        extraPackages = [ pkgs.zfs ];
+        extraPackages = [ zfsPkg ];
       };
 
       containers.storage.settings.storage = {

users/guest/default.nix

@@ -160,7 +160,7 @@ in
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions";
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions";
         };
       };
     };

users/jordan/common/git.nix

@@ -17,6 +17,9 @@
         email = "jordan@vimium.com";
         name = "Jordan Holt";
       };
+      rebase.autosquash = true;
+      push.default = "current";
+      pull.rebase = true;
     };
     ignores = [
       ".Trash-*"
@@ -37,10 +40,5 @@
       key = "B8CFFF61F1CCF520";
       signByDefault = true;
     };
-    extraConfig = {
-      rebase.autosquash = true;
-      push.default = "current";
-      pull.rebase = true;
-    };
   };
 }

users/jordan/common/optional/graphical/niri.nix

@@ -0,0 +1,322 @@
+{
+  lib,
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
+let
+  inherit (lib)
+    getExe
+    ;
+in
+{
+  imports = [
+    inputs.niri.homeModules.niri
+  ];
+
+  services.gnome-keyring.enable = true;
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+    config.niri = {
+      default = [
+        "gtk"
+        "gnome"
+      ];
+      "org.freedesktop.impl.portal.Access" = [ "gtk" ];
+      "org.freedesktop.impl.portal.Notification" = [ "gtk" ];
+      "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+      "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
+      "org.freedesktop.impl.portal.ScreenCast" = [ "xdg-desktop-portal-gnome" ];
+      "org.freedesktop.impl.portal.Screenshot" = [ "xdg-desktop-portal-gnome" ];
+    };
+    extraPortals = [
+      pkgs.gnome-keyring
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-gnome
+    ];
+  };
+
+  programs.zsh.initContent = lib.mkOrder 9999 ''
+    if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]]; then
+      echo "Login shell detected. Starting wayland..."
+      niri-session
+    fi
+  '';
+
+  programs.niri = {
+    enable = true;
+    package = pkgs.niri-unstable;
+
+    settings = {
+      xwayland-satellite.path = getExe pkgs.xwayland-satellite-stable;
+
+      environment = {
+        "QT_QPA_PLATFORM" = "wayland";
+        "XDG_SESSION_TYPE" = "wayland";
+        "NIXOS_OZONE_WL" = "1";
+        "MOZ_ENABLE_WAYLAND" = "1";
+        "MOZ_WEBRENDER" = "1";
+        "_JAVA_AWT_WM_NONREPARENTING" = "1";
+        "QT_WAYLAND_DISABLE_WINDOWDECORATION" = "1";
+        "GDK_BACKEND" = "wayland";
+        "GBM_BACKEND" = "nvidia-drm";
+        "GSK_RENDERER" = "vulkan";
+        "LIBVA_DRIVER_NAME" = "nvidia";
+      };
+
+      input = {
+        keyboard = {
+          xkb = {
+            layout = "us";
+            options = "ctrl:nocaps";
+          };
+
+          repeat-delay = 235;
+          repeat-rate = 60;
+        };
+
+        touchpad = {
+          tap = true;
+          dwt = true;
+          dwtp = true;
+          natural-scroll = true;
+          accel-profile = "flat";
+        };
+
+        mouse = {
+          accel-speed = 0.2;
+          accel-profile = "flat";
+        };
+
+        power-key-handling.enable = false;
+        workspace-auto-back-and-forth = true;
+      };
+
+      gestures.hot-corners.enable = false;
+      debug.honor-xdg-activation-with-invalid-serial = true;
+
+      binds = with config.lib.niri.actions; {
+        "Mod+T".action = spawn "kitty";
+        "Mod+b".action = spawn "firefox";
+        "Super+Alt+L".action = spawn "systemctl suspend";
+        XF86AudioRaiseVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+";
+          allow-when-locked = true;
+        };
+        XF86AudioLowerVolume = {
+          action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-";
+          allow-when-locked = true;
+        };
+        XF86AudioMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
+          allow-when-locked = true;
+        };
+        XF86AudioMicMute = {
+          action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
+          allow-when-locked = true;
+        };
+        "Mod+Q".action = close-window;
+
+        "Mod+n".action = focus-column-left;
+        "Mod+left".action = focus-column-left;
+        "Mod+Shift+n".action = move-column-left;
+        "Mod+Shift+left".action = move-column-left;
+
+        "Mod+r".action = focus-window-or-workspace-down;
+        "Mod+down".action = focus-window-or-workspace-down;
+        "Mod+Shift+r".action = move-window-down;
+        "Mod+Shift+down".action = move-window-down;
+
+        "Mod+l".action = focus-window-or-workspace-up;
+        "Mod+up".action = focus-window-or-workspace-up;
+        "Mod+Shift+l".action = move-window-up;
+        "Mod+Shift+up".action = move-window-up;
+
+        "Mod+s".action = focus-column-right;
+        "Mod+right".action = focus-column-right;
+        "Mod+Shift+s".action = move-column-right;
+        "Mod+Shift+right".action = move-column-right;
+
+        "Mod+h".action = focus-column-first;
+        "Mod+Shift+h".action = consume-or-expel-window-left;
+        "Mod+m".action = focus-column-last;
+        "Mod+Shift+m".action = consume-or-expel-window-right;
+
+        "Mod+Ctrl+n".action = focus-monitor-left;
+        "Mod+Shift+Ctrl+n".action = move-column-to-monitor-left;
+        "Mod+Ctrl+r".action = focus-monitor-down;
+        "Mod+Shift+Ctrl+r".action = move-column-to-monitor-down;
+        "Mod+Ctrl+l".action = focus-monitor-up;
+        "Mod+Shift+Ctrl+l".action = move-column-to-monitor-up;
+        "Mod+Ctrl+s".action = focus-monitor-right;
+        "Mod+Shift+Ctrl+s".action = move-column-to-monitor-right;
+
+        "Mod+Period".action = focus-workspace-down;
+        "Mod+Shift+Period".action = move-column-to-workspace-down;
+        "Mod+Ctrl+Period".action = move-workspace-down;
+        "Mod+comma".action = focus-workspace-up;
+        "Mod+Shift+comma".action = move-column-to-workspace-up;
+        "Mod+Ctrl+comma".action = move-workspace-up;
+
+        "Mod+WheelScrollDown" = {
+          action = focus-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollUp" = {
+          action = focus-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollDown" = {
+          action = move-column-to-workspace-down;
+          cooldown-ms = 150;
+        };
+        "Mod+Ctrl+WheelScrollUp" = {
+          action = move-column-to-workspace-up;
+          cooldown-ms = 150;
+        };
+        "Mod+WheelScrollRight".action = focus-column-right;
+        "Mod+WheelScrollLeft".action = focus-column-left;
+        "Mod+Ctrl+WheelScrollRight".action = move-column-right;
+        "Mod+Ctrl+WheelScrollLeft".action = move-column-left;
+        "Mod+Shift+WheelScrollDown".action = focus-column-right;
+        "Mod+Shift+WheelScrollUp".action = focus-column-left;
+        "Mod+Ctrl+Shift+WheelScrollDown".action = move-column-right;
+        "Mod+Ctrl+Shift+WheelScrollUp".action = move-column-left;
+
+        "Mod+V".action = maximize-column;
+        "Mod+Ctrl+V".action = expand-column-to-available-width;
+        "Mod+return".action = fullscreen-window;
+        "Mod+Minus".action = set-column-width "-10%";
+        "Mod+Shift+0".action = set-column-width "+10%";
+
+        "Mod+F".action = toggle-window-floating;
+        "Mod+Ctrl+F".action = switch-focus-between-floating-and-tiling;
+
+        "Mod+y".action = toggle-column-tabbed-display;
+
+        # "Print".action = screenshot;
+        # "Ctrl+Print".action = screenshot-screen { };
+        # "Alt+Print".action = screenshot-window;
+
+        "Mod+Escape" = {
+          action = toggle-keyboard-shortcuts-inhibit;
+          allow-inhibiting = false;
+        };
+
+        "Mod+Ctrl+Escape".action = quit;
+        "Mod+Shift+P".action = power-off-monitors;
+      };
+
+      spawn-at-startup = [
+        { command = [ "firefox" ]; }
+      ];
+
+      prefer-no-csd = true;
+      hotkey-overlay = {
+        skip-at-startup = true;
+      };
+      layout = {
+        gaps = 1;
+        center-focused-column = "never";
+        empty-workspace-above-first = true;
+        preset-column-widths = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        default-column-width = {
+          proportion = 0.5;
+        };
+        preset-window-heights = [
+          { proportion = 0.33333; }
+          { proportion = 0.5; }
+          { proportion = 0.66667; }
+        ];
+        focus-ring = {
+          enable = true;
+          width = 2;
+          active.color = "#7fc8ff";
+          inactive.color = "#505050";
+        };
+        border = {
+          enable = false;
+          width = 2;
+          active.color = "#ffc87f";
+          inactive.color = "#505050";
+        };
+        shadow = {
+          softness = 30;
+          spread = 5;
+          offset = {
+            x = 0;
+            y = 5;
+          };
+          draw-behind-window = true;
+          color = "#00000070";
+        };
+        tab-indicator = {
+          hide-when-single-tab = true;
+          place-within-column = true;
+          gap = 5;
+          width = 4;
+          length = {
+            total-proportion = 1.0;
+          };
+          position = "right";
+          gaps-between-tabs = 2;
+          corner-radius = 8;
+          active.color = "red";
+          inactive.color = "gray";
+        };
+        insert-hint = {
+          display.color = "#ffc87f80";
+        };
+      };
+    };
+  };
+
+  home.packages = [
+    pkgs.dconf
+  ];
+
+  home.pointerCursor = {
+    enable = true;
+    gtk.enable = true;
+    name = "macOS";
+    package = pkgs.apple-cursor;
+    size = 28;
+  };
+
+  gtk = {
+    enable = true;
+
+    iconTheme = {
+      name = "MoreWaita";
+      package = pkgs.unstable.morewaita-icon-theme;
+    };
+  };
+
+  fonts.fontconfig = {
+    enable = true;
+    defaultFonts = {
+      sansSerif = [
+        "Adwaita Sans"
+      ];
+      emoji = [
+        "Apple Color Emoji"
+      ];
+    };
+  };
+
+  programs.kitty = {
+    enable = true;
+    settings = {
+      background = "#000000";
+      background_opacity = 0.8;
+    };
+  };
+
+  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
+}

users/jordan/common/shell.nix

@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  config,
   ...
 }:
 let
@@ -19,7 +20,7 @@ in
         strategy = [ "completion" ];
       };
       defaultKeymap = "viins";
-      dotDir = ".config/zsh";
+      dotDir = "${config.xdg.configHome}/zsh";
       enableCompletion = true;
       enableVteIntegration = true;
 

users/jordan/common/ssh.nix

@@ -5,6 +5,24 @@
 {
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
+    matchBlocks."*" = {
+      forwardAgent = false;
+      addKeysToAgent = "yes";
+      compression = false;
+      serverAliveInterval = 0;
+      serverAliveCountMax = 3;
+      hashKnownHosts = false;
+      userKnownHostsFile = "~/.ssh/known_hosts";
+      controlMaster = "no";
+      controlPath = "~/.ssh/master-%r@%n:%p";
+      controlPersist = "no";
+    };
+  };
+
+  services.ssh-agent = {
+    enable = true;
+    enableZshIntegration = true;
   };
 
   home.persistence."/state".files = [

users/jordan/default.nix

@@ -49,12 +49,14 @@ in
       ./common/ssh.nix
       {
         home.persistence."/state" = {
+          enable = false;
           directories = [
             "Downloads"
             ".local/state/wireplumber"
           ];
         };
         home.persistence."/persist" = {
+          enable = false;
           directories = [
             "Desktop"
             "Documents"

users/jordan/odyssey.nix

@@ -7,9 +7,9 @@
   imports = [
     ./common/optional/graphical/firefox.nix
     ./common/optional/graphical/fonts.nix
-    ./common/optional/graphical/hyprland
     ./common/optional/graphical/libreoffice.nix
     ./common/optional/graphical/mimeapps.nix
+    ./common/optional/graphical/niri.nix
     ./common/optional/graphical/thunderbird.nix
   ];