All my system configs and packages in one repo

chore: update nixpkgs (26.05 woo!)

pluie.me b7956228 57ec5a33

verified
+83 -54
+66 -42
flake.lock
··· 3 3 "flake-compat": { 4 4 "flake": false, 5 5 "locked": { 6 - "lastModified": 1747046372, 7 - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", 6 + "lastModified": 1761588595, 7 + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", 8 8 "owner": "edolstra", 9 9 "repo": "flake-compat", 10 - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", 10 + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", 11 11 "type": "github" 12 12 }, 13 13 "original": { ··· 53 53 ] 54 54 }, 55 55 "locked": { 56 - "lastModified": 1760948891, 57 - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", 56 + "lastModified": 1765495779, 57 + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", 58 58 "owner": "hercules-ci", 59 59 "repo": "flake-parts", 60 - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", 60 + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", 61 61 "type": "github" 62 62 }, 63 63 "original": { ··· 71 71 "nixpkgs-lib": "nixpkgs-lib" 72 72 }, 73 73 "locked": { 74 + "lastModified": 1759362264, 75 + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", 76 + "owner": "hercules-ci", 77 + "repo": "flake-parts", 78 + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", 79 + "type": "github" 80 + }, 81 + "original": { 82 + "owner": "hercules-ci", 83 + "repo": "flake-parts", 84 + "type": "github" 85 + } 86 + }, 87 + "flake-parts_3": { 88 + "inputs": { 89 + "nixpkgs-lib": "nixpkgs-lib_2" 90 + }, 91 + "locked": { 74 92 "lastModified": 1756770412, 75 93 "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", 76 94 "owner": "hercules-ci", ··· 113 131 "zon2nix": "zon2nix" 114 132 }, 115 133 "locked": { 116 - "lastModified": 1761017224, 117 - "narHash": "sha256-ETFcYfgn8TgRG/Z/y/tX8C2Ef1q0GoQuwt5cYiwPpyw=", 134 + "lastModified": 1765500842, 135 + "narHash": "sha256-ZL7hJE2xQqmL9ZRltMSZ7mRO0qPX/v4AlFS/o+AD3CI=", 118 136 "owner": "pluiedev", 119 137 "repo": "ghostty", 120 - "rev": "3548acfac63e7674b5e25896f6b393474fe8ea65", 138 + "rev": "5aefb4b0a8ca50c87ed062b41f5fe6c984ccd52a", 121 139 "type": "github" 122 140 }, 123 141 "original": { ··· 160 178 "treefmt-nix": "treefmt-nix" 161 179 }, 162 180 "locked": { 163 - "lastModified": 1760438204, 164 - "narHash": "sha256-5IG9Jr4DyMQEQam2XIBephCZlPgPnjON5A51gdo6ePQ=", 181 + "lastModified": 1764275753, 182 + "narHash": "sha256-zMnEd4R5uxETmsCvAUZvvI4/xs8y13KMA/4sOg2Bmr8=", 165 183 "owner": "snugnug", 166 184 "repo": "hjem-rum", 167 - "rev": "9bacfa32baf24255a01944b33f3aa4ece1145bea", 185 + "rev": "9ba6af8f1d6d2a22966c21861f7f71c30fc3ab4e", 168 186 "type": "github" 169 187 }, 170 188 "original": { ··· 198 216 "ndg": { 199 217 "inputs": { 200 218 "flake-compat": "flake-compat_2", 219 + "flake-parts": "flake-parts_2", 201 220 "nixpkgs": [ 202 221 "hjem", 203 222 "nixpkgs" 204 223 ] 205 224 }, 206 225 "locked": { 207 - "lastModified": 1760777965, 208 - "narHash": "sha256-PHmDh1GxoBixpgtRCrBCvXJee/tCb6T57MLbwKfIURg=", 226 + "lastModified": 1760102695, 227 + "narHash": "sha256-DyamtLt6KW/qkNs/kMnF/E+xlf6iFBMMF3m54boTHeY=", 209 228 "owner": "feel-co", 210 229 "repo": "ndg", 211 - "rev": "30b955582f0cd869a86007f491252bbffde48f8b", 230 + "rev": "6319eb4afa6fd42be5c8c9ed012e95e3f32c16eb", 212 231 "type": "github" 213 232 }, 214 233 "original": { ··· 220 239 "ndg_2": { 221 240 "inputs": { 222 241 "flake-compat": "flake-compat_3", 223 - "flake-parts": "flake-parts_2", 242 + "flake-parts": "flake-parts_3", 224 243 "nixpkgs": [ 225 244 "hjem-rum", 226 245 "nixpkgs" ··· 247 266 ] 248 267 }, 249 268 "locked": { 250 - "lastModified": 1760846226, 251 - "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", 269 + "lastModified": 1765267181, 270 + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", 252 271 "owner": "nix-community", 253 272 "repo": "nix-index-database", 254 - "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", 273 + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", 255 274 "type": "github" 256 275 }, 257 276 "original": { ··· 283 302 ] 284 303 }, 285 304 "locked": { 286 - "lastModified": 1751903740, 287 - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", 305 + "lastModified": 1764234087, 306 + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", 288 307 "owner": "nix-community", 289 308 "repo": "nixos-generators", 290 - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", 309 + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", 291 310 "type": "github" 292 311 }, 293 312 "original": { ··· 314 333 }, 315 334 "nixpkgs": { 316 335 "locked": { 317 - "lastModified": 1758360447, 318 - "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", 319 - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", 336 + "lastModified": 1765472234, 337 + "narHash": "sha256-yMgWBfeR/K9Tdk7wSxLZHJ+UUCuPVzu/rk4Ujtp0kDA=", 338 + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", 320 339 "type": "tarball", 321 - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" 340 + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre910362.2fbfb1d73d23/nixexprs.tar.xz" 322 341 }, 323 342 "original": { 324 343 "type": "tarball", ··· 340 359 "type": "github" 341 360 } 342 361 }, 343 - "nixpkgs_2": { 362 + "nixpkgs-lib_2": { 344 363 "locked": { 345 - "lastModified": 1760921689, 346 - "narHash": "sha256-u0JUo46QSoXnjLaezAM75wRNuxVMVbm5OxHH122TeTY=", 347 - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", 348 - "type": "tarball", 349 - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre880095.5e2a59a5b1a8/nixexprs.tar.xz" 364 + "lastModified": 1754788789, 365 + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", 366 + "owner": "nix-community", 367 + "repo": "nixpkgs.lib", 368 + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", 369 + "type": "github" 350 370 }, 351 371 "original": { 352 - "type": "tarball", 353 - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" 372 + "owner": "nix-community", 373 + "repo": "nixpkgs.lib", 374 + "type": "github" 354 375 } 355 376 }, 356 377 "root": { ··· 362 383 "nix-index-database": "nix-index-database", 363 384 "nixos-generators": "nixos-generators", 364 385 "nixos-hardware": "nixos-hardware", 365 - "nixpkgs": "nixpkgs_2" 386 + "nixpkgs": "nixpkgs" 366 387 } 367 388 }, 368 389 "rust-overlay": { ··· 420 441 "systems": "systems_2" 421 442 }, 422 443 "locked": { 423 - "lastModified": 1760525934, 424 - "narHash": "sha256-1HtxuA45R/jExzE9iuimuECHWbV2c+CBdJmr/RtluaI=", 444 + "lastModified": 1759458325, 445 + "narHash": "sha256-NY9sQlRPVVY7JWcZHtrK0T0RlH676NhaqR7Lco+FhTQ=", 425 446 "owner": "feel-co", 426 447 "repo": "smfh", 427 - "rev": "7123a00cc3c3e90ba703a37ca8d997be95c62d99", 448 + "rev": "c29b22c328d6b03acaa6b879bf7f3c8ff82ca2d3", 428 449 "type": "github" 429 450 }, 430 451 "original": { ··· 539 560 ] 540 561 }, 541 562 "locked": { 542 - "lastModified": 1760401936, 543 - "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", 563 + "lastModified": 1763295135, 564 + "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", 544 565 "owner": "mitchellh", 545 566 "repo": "zig-overlay", 546 - "rev": "365085b6652259753b598d43b723858184980bbe", 567 + "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", 547 568 "type": "github" 548 569 }, 549 570 "original": { ··· 554 575 }, 555 576 "zon2nix": { 556 577 "inputs": { 557 - "nixpkgs": "nixpkgs" 578 + "nixpkgs": [ 579 + "ghostty", 580 + "nixpkgs" 581 + ] 558 582 }, 559 583 "locked": { 560 584 "lastModified": 1758405547,
+1 -1
modules/hjem-ext/default.nix
··· 2 2 imports = [ 3 3 ./programs/hyfetch.nix 4 4 ./programs/jujutsu.nix 5 - ./programs/moar.nix 5 + ./programs/moor.nix 6 6 ./programs/swaylock.nix 7 7 ./programs/swayosd.nix 8 8 ./programs/vesktop.nix
+6 -6
modules/hjem-ext/programs/moar.nix modules/hjem-ext/programs/moor.nix
··· 5 5 ... 6 6 }: 7 7 let 8 - cfg = config.ext.programs.moar; 8 + cfg = config.ext.programs.moor; 9 9 10 10 toFlag = 11 11 k: v: ··· 18 18 19 19 in 20 20 { 21 - options.ext.programs.moar = { 22 - enable = lib.mkEnableOption "Moar"; 21 + options.ext.programs.moor = { 22 + enable = lib.mkEnableOption "Moor"; 23 23 24 - package = lib.mkPackageOption pkgs "moar" { }; 24 + package = lib.mkPackageOption pkgs "moor" { }; 25 25 26 26 settings = lib.mkOption { 27 27 type = lib.types.submodule { ··· 39 39 config = lib.mkIf cfg.enable { 40 40 packages = [ cfg.package ]; 41 41 environment.sessionVariables = { 42 - PAGER = "moar"; 43 - MOAR = lib.concatStringsSep " " (lib.mapAttrsToList toFlag cfg.settings); 42 + PAGER = "moor"; 43 + moor = lib.concatStringsSep " " (lib.mapAttrsToList toFlag cfg.settings); 44 44 }; 45 45 }; 46 46 }
+1 -1
users/leah/appearance.nix
··· 38 38 adwaita-icon-theme 39 39 ]; 40 40 41 - ext.programs.moar.settings.style = "catppuccin-${flavor}"; 41 + ext.programs.moor.settings.style = "catppuccin-${flavor}"; 42 42 }; 43 43 44 44 programs.vivid = {
+7 -2
users/leah/programs/default.nix
··· 22 22 programs = { 23 23 localsend.enable = true; 24 24 nix-index-database.comma.enable = true; 25 - nekoray = { 25 + throne = { 26 26 enable = true; 27 27 tunMode.enable = true; 28 28 }; ··· 67 67 settings = { 68 68 preset = "lesbian"; 69 69 mode = "rgb"; 70 + auto_detect_light_dark = true; 71 + light_dark = "dark"; 72 + pride_month_disable = false; 70 73 lightness = 0.6; 71 74 color_align.mode = "horizontal"; 75 + args = null; 76 + distro = null; 72 77 backend = "fastfetch"; 73 78 }; 74 79 }; 75 80 76 - moar = { 81 + moor = { 77 82 enable = true; 78 83 settings = { 79 84 no-statusbar = true;
+1 -1
users/leah/programs/ghostty.nix
··· 13 13 14 14 rum.programs.ghostty = { 15 15 enable = true; 16 - package = inputs.ghostty.packages.${pkgs.system}.ghostty; 16 + package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.ghostty; 17 17 18 18 settings = { 19 19 font-family = "Iosevka";
+1 -1
users/leah/programs/vcs.nix
··· 60 60 ui = { 61 61 default-command = [ "log" ]; 62 62 diff-formatter = "difft"; 63 - pager = "${lib.getExe pkgs.moar} -no-linenumbers"; 63 + pager = "${lib.getExe pkgs.moor} -no-linenumbers"; 64 64 log-word-wrap = true; 65 65 }; 66 66