Merge pull request 'bunk things' (#8) from bunk into main

Reviewed-on: #8

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1754433428,
+        "lastModified": 1760836749,
-        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760083914,
+        "lastModified": 1761238850,
-        "narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=",
+        "narHash": "sha256-WGoqR+ULsh1w7yDNAtJiE27HX6zSlGPR4I2pgjAU/SA=",
         "owner": "anyrun-org",
         "repo": "anyrun",
-        "rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59",
+        "rev": "ae3c499316e9aa568acb3832566a1978ca665748",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759499898,
+        "lastModified": 1760101617,
-        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
         "type": "github"
       },
       "original": {
@@ -100,14 +100,10 @@
       "inputs": {
         "authentik-src": "authentik-src",
         "flake-compat": "flake-compat",
-        "flake-parts": [
+        "flake-parts": "flake-parts_2",
-          "flake-parts"
-        ],
         "flake-utils": "flake-utils",
         "napalm": "napalm",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3",
-          "nixpkgs"
-        ],
         "pyproject-build-systems": "pyproject-build-systems",
         "pyproject-nix": "pyproject-nix",
         "systems": "systems_3",
@@ -123,6 +119,7 @@
       },
       "original": {
         "owner": "nix-community",
+        "ref": "version/2025.8.4",
         "repo": "authentik-nix",
         "type": "github"
       }
@@ -149,15 +146,15 @@
         "flake-schemas": "flake-schemas",
         "home-manager": "home-manager_2",
         "jovian": "jovian",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1760395520,
+        "lastModified": 1761326352,
-        "narHash": "sha256-4hVEyj3H4i0kwtO8dDIKee1WoZ0iMZxr3ageSdJ6Cck=",
+        "narHash": "sha256-DoR4mHaStX6Dg2Gilc2Dqr/XaxXmQTOQS5cZ5xKPQJY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "c438d72cee048fe6203df15c81a230efb16fa409",
+        "rev": "6492dc810f2f250ef95096910a44f03eea6a594f",
         "type": "github"
       },
       "original": {
@@ -212,11 +209,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1760596988,
+        "lastModified": 1761460927,
-        "narHash": "sha256-+h9FVfiNnsWKpk2HiaecPocq4gWD9GNn5/eVS3I9Z+8=",
+        "narHash": "sha256-9BUyZfPBh3mh58fmpseqfMAB73PNm+iwl8UpjCbThk0=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "8e99c7d8e07635dea2e1001485f9de41bb1587f2",
+        "rev": "0f19d25425626ea42bded065029f45ca5f526ca1",
         "type": "github"
       },
       "original": {
@@ -327,16 +324,14 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1759362264,
+        "lastModified": 1756770412,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
         "type": "github"
       },
       "original": {
@@ -347,7 +342,27 @@
     },
     "flake-parts_3": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760948891,
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
         "lastModified": 1753121425,
@@ -363,7 +378,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "lanzaboote",
@@ -384,7 +399,7 @@
         "type": "github"
       }
     },
-    "flake-parts_5": {
+    "flake-parts_6": {
       "inputs": {
         "nixpkgs-lib": [
           "nvf",
@@ -405,7 +420,7 @@
         "type": "github"
       }
     },
-    "flake-parts_6": {
+    "flake-parts_7": {
       "inputs": {
         "nixpkgs-lib": [
           "tuirun",
@@ -463,8 +478,8 @@
     },
     "fonts": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1753431871,
@@ -491,11 +506,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760392170,
+        "lastModified": 1760663237,
-        "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=",
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -571,11 +586,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1760106635,
+        "lastModified": 1760958188,
-        "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
+        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
+        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
         "type": "github"
       },
       "original": {
@@ -586,15 +601,15 @@
     },
     "helix-flake": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1760540014,
+        "lastModified": 1761440613,
-        "narHash": "sha256-aRHbYRS0xekHabEMer6YsHsYHbEFZpMXgUP0Q6GEGSU=",
+        "narHash": "sha256-eQTH5iTkEQptZqVGyTPgpMYL7zj6QkI/uGo+1/PkAQY=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "f6f8634eb07f35f02bd2881666925a90513f6f3b",
+        "rev": "7c4ff9c39dbd3dd7d6e2cb3e26cb34212202bb1b",
         "type": "github"
       },
       "original": {
@@ -610,11 +625,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760500983,
+        "lastModified": 1761468550,
-        "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=",
+        "narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa",
+        "rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762",
         "type": "github"
       },
       "original": {
@@ -652,11 +667,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760312644,
+        "lastModified": 1761266473,
-        "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=",
+        "narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e121f3773fa596ecaba5b22e518936a632d72a90",
+        "rev": "5c71d4a730bd3c972befff343bb074421e345937",
         "type": "github"
       },
       "original": {
@@ -710,11 +725,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759490292,
+        "lastModified": 1760445448,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
         "type": "github"
       },
       "original": {
@@ -797,17 +812,17 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner_2",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_4",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1760621586,
+        "lastModified": 1761486729,
-        "narHash": "sha256-sIbe3te3RrL9PY4ASKGwv1KuJs0pyn4Zvo3xIF3jFms=",
+        "narHash": "sha256-vlIMIIiUlwS6zPez57g1Z7THZxC25pyMk3o9Uu9DEyk=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "8164b90bc2839d4d2a10c0d2b26c4a413ecf90b2",
+        "rev": "05aa4e1c54da31d95663f9b4bc757e2a6ca65538",
         "type": "github"
       },
       "original": {
@@ -874,11 +889,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749046714,
+        "lastModified": 1759610243,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "type": "github"
       },
       "original": {
@@ -1191,11 +1206,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760266702,
+        "lastModified": 1761202163,
-        "narHash": "sha256-TP19RpzIyo1JeYAhKii13seYwmhkv7IOD+dCnQOrcgQ=",
+        "narHash": "sha256-6RySf5VQElrm7RYGWxlIkNttemDp4FF0aH+LX435G2Y=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "3d7e970d4cac5d3ee3fe7cafa17cc9868fa21fed",
+        "rev": "47976126007d9658ca4ac4dd933bea8846170fd9",
         "type": "github"
       },
       "original": {
@@ -1208,8 +1223,8 @@
       "inputs": {
         "crane": "crane",
         "flake-compat": "flake-compat_4",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "rust-overlay": "rust-overlay_3"
       },
@@ -1278,11 +1293,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760579393,
+        "lastModified": 1761443969,
-        "narHash": "sha256-YuXbuaJ/2EZ1FePhz1eTyo/b+kpiEmw4lj6wX0u0Q/0=",
+        "narHash": "sha256-iK8EZX+0I8nRhNRCEkmYmh2pifNTXhpcRsiUkObUK8c=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "7d002241668a738df3973a6c07ef5d79e5508b24",
+        "rev": "5e6ced46102b654619d0b60356b1268511053cba",
         "type": "github"
       },
       "original": {
@@ -1331,6 +1346,21 @@
       }
     },
     "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1751159883,
         "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
@@ -1345,6 +1375,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1759386674,
+        "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "625ad6366178f03acd79f9e3822606dd7985b657",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1758690382,
@@ -1363,11 +1409,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1760284886,
+        "lastModified": 1757745802,
-        "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -1378,6 +1424,22 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1761114652,
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1753250450,
         "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
@@ -1393,39 +1455,39 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_6": {
       "locked": {
         "lastModified": 1759381078,
         "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1761114652,
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1754243818,
         "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=",
@@ -1441,13 +1503,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
-        "lastModified": 1760524057,
+        "lastModified": 1761373498,
-        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -1457,36 +1519,20 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1759386674,
-        "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "625ad6366178f03acd79f9e3822606dd7985b657",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nvf": {
       "inputs": {
         "flake-compat": "flake-compat_5",
-        "flake-parts": "flake-parts_5",
+        "flake-parts": "flake-parts_6",
         "mnw": "mnw",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_10",
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1760153667,
+        "lastModified": 1761486540,
-        "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=",
+        "narHash": "sha256-O0VNqERaZ1H+4P3XwHNd8wVCqUcGtMPJT1z4cJodRFc=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d",
+        "rev": "4b904de36157035fa3dddf0312a4242e5d0d9bd0",
         "type": "github"
       },
       "original": {
@@ -1505,11 +1551,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1760663237,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -1602,7 +1648,7 @@
         "chaotic": "chaotic",
         "fenix": "fenix",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "fonts": "fonts",
         "git-hooks": "git-hooks",
         "hardware": "hardware",
@@ -1615,7 +1661,7 @@
         "hyprpaper": "hyprpaper",
         "lanzaboote": "lanzaboote",
         "nix-gaming": "nix-gaming",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_9",
         "nvf": "nvf",
         "systems": "systems_6",
         "treefmt-nix": "treefmt-nix",
@@ -1626,11 +1672,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1760497432,
+        "lastModified": 1761412493,
-        "narHash": "sha256-ImhJMtnkBlADdrC8jzMDflhA4WMdaCRKkhsJC2pzPcM=",
+        "narHash": "sha256-Ig2yUk5ek3vSFR+m+rtmg0kJyRLPYol55QgsYsoSGI4=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "fcfff0827f64a91f5676d617f0d4dd8b58eefbd1",
+        "rev": "daf1cd953fe878226e3a5b0356468f5a61995bf0",
         "type": "github"
       },
       "original": {
@@ -1648,11 +1694,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760236527,
+        "lastModified": 1761273263,
-        "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=",
+        "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa",
+        "rev": "28405834d4fdd458d28e123fae4db148daecec6f",
         "type": "github"
       },
       "original": {
@@ -1815,11 +1861,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760120816,
+        "lastModified": 1761311587,
-        "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=",
+        "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "761ae7aff00907b607125b2f57338b74177697ed",
+        "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
         "type": "github"
       },
       "original": {
@@ -1830,7 +1876,7 @@
     },
     "tuirun": {
       "inputs": {
-        "flake-parts": "flake-parts_6",
+        "flake-parts": "flake-parts_7",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1903,11 +1949,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755354946,
+        "lastModified": 1760713634,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
         "type": "github"
       },
       "original": {
@@ -1923,11 +1969,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759969704,
+        "lastModified": 1761394326,
-        "narHash": "sha256-T7f/invcFIKHrBqD+FLf/C/HOGmpYfbZUzTDxFscpOA=",
+        "narHash": "sha256-7PjjvOGNyRWzS/PNdyKJdyKjfZ9M88v3dAcuakr39RA=",
         "ref": "refs/heads/main",
-        "rev": "1173c777dc8daddcc4959260a7b00fd8abc884c5",
+        "rev": "cdc72ca31fee238e0e5bb55c376a6c612296a8b1",
-        "revCount": 137,
+        "revCount": 141,
         "type": "git",
         "url": "https://git.sr.ht/~canasta/zen-browser-flake"
       },

flake.nix

@@ -53,11 +53,7 @@
     };
 
     authentik = {
-      url = "github:nix-community/authentik-nix";
+      url = "github:nix-community/authentik-nix/version/2025.8.4";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-parts.follows = "flake-parts";
-      };
     };
 
     flake-compat.url = "github:edolstra/flake-compat";

hosts/bunk/default.nix

@@ -38,17 +38,11 @@ in
     ./settings.nix
   ];
 
+  boot.initrd.luks.devices."luks-0ad53967-bb38-4485-be75-ca55ae4c3b68".device = "/dev/disk/by-uuid/0ad53967-bb38-4485-be75-ca55ae4c3b68";
   networking.hostName = "bunk";
 
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 32 * 1024;
-    }
-  ];
-
   environment.variables.NH_FLAKE = "/home/cnst/.nix-config";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = lib.mkDefault "23.11";
+  system.stateVersion = lib.mkDefault "25.05";
 }

hosts/bunk/hardware-configuration.nix

@@ -1,48 +1,36 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  modulesPath,
-  ...
-}:
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "ahci"
-        "usbhid"
-        "usb_storage"
-        "sd_mod"
     ];
-      kernelModules = [ "amdgpu" ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/d15672b5-dc97-4f99-9ad2-70f9ddf20447";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
     };
 
-    kernelModules = [ "kvm-amd" ];
+  boot.initrd.luks.devices."luks-2f0dfe96-bc63-4f38-b190-3d9fa45dc560".device = "/dev/disk/by-uuid/2f0dfe96-bc63-4f38-b190-3d9fa45dc560";
-    extraModulePackages = [ ];
-  };
 
-  fileSystems."/" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/da41c89a-7ab8-4697-9a14-0d115b97cc2e";
+    { device = "/dev/disk/by-uuid/F3FC-3CDF";
-    fsType = "ext4";
-  };
-
-  boot.initrd.luks.devices."luks-e75ac560-748f-4071-bbe7-479678400be3".device =
-    "/dev/disk/by-uuid/e75ac560-748f-4071-bbe7-479678400be3";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/7E84-D168";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/e6464248-0d1e-4950-bf48-4cebeabaf871"; }
+    ];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction

hosts/bunk/settings.nix

@@ -10,7 +10,7 @@
         name = "DP-3";
         width = 2560;
         height = 1440;
-        refreshRate = 240;
+        refreshRate = "143.99";
         position = "0x0";
         transform = 0;
         bitDepth = 10;
@@ -20,7 +20,7 @@
         name = "HDMI-A-1";
         width = 1920;
         height = 1080;
-        refreshRate = 60;
+        refreshRate = "60";
         position = "2560x0";
         # transform = 3;
         workspace = "5";
@@ -29,7 +29,7 @@
         name = "eDP-1";
         width = 1920;
         height = 1200;
-        refreshRate = 60;
+        refreshRate = "60";
         workspace = "1";
       }
     ];

hosts/kima/settings.nix

@@ -10,7 +10,7 @@
         name = "DP-3";
         width = 2560;
         height = 1440;
-        refreshRate = 240;
+        refreshRate = "143.99";
         position = "0x0";
         transform = 0;
         bitDepth = 10;
@@ -20,7 +20,7 @@
         name = "HDMI-A-1";
         width = 1920;
         height = 1080;
-        refreshRate = 60;
+        refreshRate = "60";
         position = "2560x0";
         transform = 3;
         workspace = "5";
@@ -29,7 +29,7 @@
         name = "eDP-1";
         width = 1920;
         height = 1200;
-        refreshRate = 60;
+        refreshRate = "60";
         workspace = "1";
       }
     ];

hosts/toothpc/settings.nix

@@ -10,7 +10,7 @@
         name = "DVI-D-1";
         width = 1920;
         height = 1080;
-        refreshRate = 144;
+        refreshRate = "144";
         position = "0x0";
         transform = 0;
         workspace = "1";

modules/home/programs/git/default.nix

@@ -15,17 +15,16 @@ in
   };
   config = mkIf cfg.enable {
     home.packages = [ pkgs.gh ];
-    programs.git = {
+    programs = {
+      git = {
         enable = true;
-      userName = osConfig.settings.accounts.username;
+        settings = {
-      userEmail = osConfig.settings.accounts.mail;
-      delta = {
-        enable = true;
-        options.dark = true;
-      };
-      extraConfig = {
           # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
-        user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
+          user = {
+            name = osConfig.settings.accounts.username;
+            email = osConfig.settings.accounts.mail;
+            signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
+          };
           signing = {
             format = lib.mkDefault "ssh";
             key = "${config.home.homeDirectory}/.ssh/id_ed25519";
@@ -56,6 +55,14 @@ in
           ".jj"
         ];
       };
+
+      delta = {
+        enableGitIntegration = true;
+        enable = true;
+        options.dark = true;
+      };
+    };
+
     xdg.configFile."git/allowed_signers".text = ''
       ${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
     '';

modules/home/programs/hyprlock/default.nix

@@ -3,13 +3,15 @@
   osConfig,
   clib,
   ...
-}: let
+}:
+let
   inherit (lib) mkIf;
   cfg = osConfig.nixos.programs.hyprland;
 
   bg = osConfig.settings.theme.background;
   inherit (clib.theme.bgs) resolve;
-in {
+in
+{
   config = mkIf cfg.enable {
     programs.hyprlock = {
       enable = true;
@@ -52,6 +54,7 @@ in {
             position = "0, 20";
             halign = "center";
             valign = "center";
+            font_family = "DepartureMono Nerd Font Mono Italic";
           }
         ];
         label = [
@@ -63,7 +66,7 @@ in {
             shadow_boost = 0.5;
             color = "rgba(FFFFFFFF)";
             font_size = 25;
-            font_family = "Input Mono Compressed";
+            font_family = "DepartureMono Nerd Font Mono Regular";
             position = "0, 230";
             halign = "center";
             valign = "center";
@@ -76,7 +79,7 @@ in {
             shadow_boost = 0.5;
             color = "rgba(FFFFFFFF)";
             font_size = 85;
-            font_family = "Input Mono Compressed";
+            font_family = "DepartureMono Nerd Font Mono Regular";
             position = "0, 300";
             halign = "center";
             valign = "center";

modules/home/programs/waybar/config/config.jsonc

@@ -126,16 +126,28 @@
       "all-outputs": false,
       "format": "{icon}",
       "format-icons": {
-        "urgent": "",
+        "1": "1",
-        "visible": "",
+        "2": "2",
-        "empty": ""
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "default": "_",
+        "active": "_"
       },
       "on-click": "activate",
       "show-special": false,
       "on-scroll-up": "hyprctl dispatch workspace r-1",
       "on-scroll-down": "hyprctl dispatch workspace r+1",
       "persistent-workspaces": {
-        "*": 3
+        "1": [],
+        "2": [],
+        "3": [],
+        "4": [],
+        "5": []
       }
     },
     "niri/workspaces": {

modules/home/programs/waybar/config/style.css

@@ -28,8 +28,8 @@ tooltip label {
   margin: 0 0px;
   background-color: transparent;
   color: #fbf1c7;
-  border-top: 3px solid transparent;
+  border-top: 4px solid transparent;
-  border-bottom: 3px solid transparent;
+  border-bottom: 4px solid transparent;
 }
 
 #workspaces button:hover {
@@ -45,7 +45,7 @@ tooltip label {
   background-image: url("assets/button.svg");
   background-position: center;
   background-repeat: no-repeat;
-  background-size: 18px 15px;
+  background-size: 21px 18px;
 }
 
 #custom-trayicon {

modules/nixos/programs/hyprland/keybinds.nix

@@ -49,20 +49,6 @@ in
           "$mod, P, pseudo,"
           "$mod, J, togglesplit,"
           "$mod, C, exec, hyprctl dispatch exec copyq toggle"
-          "$mod, left, movefocus, l"
-          "$mod, right, movefocus, r"
-          "$mod, up, movefocus, u"
-          "$mod, down, movefocus, d"
-          "$mod, 1, workspace, 1"
-          "$mod, 2, workspace, 2"
-          "$mod, 3, workspace, 3"
-          "$mod, 4, workspace, 4"
-          "$mod, 5, workspace, 5"
-          "$mod, 6, workspace, 6"
-          "$mod, 7, workspace, 7"
-          "$mod, 8, workspace, 8"
-          "$mod, 9, workspace, 9"
-          "$mod, 0, workspace, 10"
           "$mod SHIFT, 1, movetoworkspace, 1"
           "$mod SHIFT, 2, movetoworkspace, 2"
           "$mod SHIFT, 3, movetoworkspace, 3"
@@ -75,6 +61,30 @@ in
           "$mod SHIFT, 0, movetoworkspace, 10"
           "CTRL SHIFT, Escape, exec, ${runOnce "resources"}"
 
+          "$mod, 1, workspace, 1"
+          "$mod, 2, workspace, 2"
+          "$mod, 3, workspace, 3"
+          "$mod, 4, workspace, 4"
+          "$mod, 5, workspace, 5"
+          "$mod, 6, workspace, 6"
+          "$mod, 7, workspace, 7"
+          "$mod, 8, workspace, 8"
+          "$mod, 9, workspace, 9"
+          "$mod, 0, workspace, 10"
+
+          "$mod, left, movefocus, l"
+          "$mod, right, movefocus, r"
+          "$mod, up, movefocus, u"
+          "$mod, down, movefocus, d"
+          "$mod SHIFT, left, resizeactive, -20 0"
+          "$mod SHIFT, right, resizeactive, 20 0"
+          "$mod SHIFT, up, resizeactive, 0 -20"
+          "$mod SHIFT, down, resizeactive, 0 20"
+          "$mod CTRL, left, swapwindow, l"
+          "$mod CTRL, right, swapwindow, r"
+          "$mod CTRL, up, swapwindow, u"
+          "$mod CTRL, down, swapwindow, d"
+
           ",XF86AudioLowerVolume, exec, volume-control.sh --dec"
           ",XF86AudioRaiseVolume, exec, volume-control.sh --inc"
           ",XF86AudioMute, exec, volume-control.sh --toggle"

modules/nixos/programs/hyprland/layout.nix

@@ -21,7 +21,7 @@ in
           let
             resolution =
               if m.width != null && m.height != null then
-                "${toString m.width}x${toString m.height}@${toString m.refreshRate}"
+                "${toString m.width}x${toString m.height}@${m.refreshRate}"
               else
                 "preferred";
 

modules/nixos/programs/pkgs/default.nix

@@ -82,7 +82,6 @@ in
         ]
 
         (mkIf cfg.common.enable [
-          qt6.full
           swappy
           wayfreeze
           imagemagick

modules/nixos/services/kanata/default.nix

@@ -16,14 +16,10 @@ in
     services.kanata = {
       enable = true;
       package = pkgs.kanata-with-cmd;
-      keyboards.hhkbse = {
+      keyboards.default = {
         extraDefCfg = ''
           process-unmapped-keys yes
         '';
-        devices = [
-          "/dev/input/by-id/usb-PFU_Limited_HHKB-Hybrid-event-kbd"
-          "/dev/input/event2"
-        ];
         config = builtins.readFile (./. + "/hhkbse.kbd");
       };
     };

modules/server/infra/authentik/default.nix

@@ -6,7 +6,7 @@
 }: let
   unit = "authentik";
   cfg = config.server.infra.${unit};
-  srv = config.server.infra.www.domain;
+  srv = config.server.infra;
 in {
   options.server.infra.${unit} = {
     enable = lib.mkEnableOption {
@@ -14,7 +14,7 @@ in {
     };
     url = lib.mkOption {
       type = lib.types.str;
-      default = "auth.${srv.www.domain}";
+      default = "auth.${srv.www.url}";
     };
     port = lib.mkOption {
       type = lib.types.port;

modules/server/infra/unbound/default.nix

@@ -20,11 +20,6 @@
     )
     svcNames);
 
-  revParts = lib.lists.reverseList (lib.splitString "." srv.ip);
-  revName = lib.concatStringsSep "." revParts;
-
-  localPTRs = ["${revName}.in-addr.arpa. PTR traefik.${srv.domain}"];
-
   hostIp = hostname:
     if hostname == "ziggy"
     then "192.168.88.12"
@@ -116,10 +111,11 @@ in {
               "255.255.255.255/32"
               "2001:db8::/32"
             ];
-            local-data = localARecords;
+            local-data =
-
+              [
-            # Example PTR entry: "14.88.168.192.in-addr.arpa. PTR traefik.cnix.dev."
+                ''"traefik.${config.settings.accounts.domains.local}. A 192.168.88.14"''
-            # local-data-ptr = localPTRs;
+              ]
+              ++ localARecords;
           };
         };
       };

modules/server/services/ollama/default.nix

@@ -9,6 +9,7 @@
 in {
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
+      ollama
       intel-compute-runtime
       intel-graphics-compiler
       level-zero

modules/settings/monitors/default.nix

@@ -21,8 +21,8 @@ in
             example = 1080;
           };
           refreshRate = mkOption {
-            type = types.int;
+            type = types.str;
-            default = 60;
+            default = "60";
           };
           transform = mkOption {
             type = types.int;

nix/nixpkgs/default.nix

@@ -4,5 +4,8 @@
       allowUnfree = true;
       input-fonts.acceptLicense = true;
     };
+
+    overlays = [
+    ];
   };
 }