+2 -2

config/desktop/home-manager.nix

··· 1 1 { 2 2 nixcord, 3 3 - firefox-addons, 3 3 + pkgs-firefox-addons, 4 4 ... 5 5 }: 6 6 ··· 16 16 ]; 17 17 18 18 extraSpecialArgs = { 19 19 - inherit firefox-addons; 19 19 + inherit pkgs-firefox-addons; 20 20 }; 21 21 }; 22 22 }

+68 -31

flake.lock

··· 150 150 }, 151 151 "flake-utils_2": { 152 152 "inputs": { 153 153 - "systems": "systems_3" 153 153 + "systems": "systems_2" 154 154 + }, 155 155 + "locked": { 156 156 + "lastModified": 1731533236, 157 157 + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", 158 158 + "owner": "numtide", 159 159 + "repo": "flake-utils", 160 160 + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", 161 161 + "type": "github" 162 162 + }, 163 163 + "original": { 164 164 + "owner": "numtide", 165 165 + "repo": "flake-utils", 166 166 + "type": "github" 167 167 + } 168 168 + }, 169 169 + "flake-utils_3": { 170 170 + "inputs": { 171 171 + "systems": "systems_4" 154 172 }, 155 173 "locked": { 156 174 "lastModified": 1731533236, ··· 205 223 }, 206 224 "gomod2nix": { 207 225 "inputs": { 208 208 - "flake-utils": "flake-utils_2", 226 226 + "flake-utils": "flake-utils_3", 209 227 "nixpkgs": [ 210 228 "tangled", 211 229 "nixpkgs" ··· 396 414 "url": "https://cdn.jsdelivr.net/npm/mermaid@11.12.3/dist/mermaid.min.js" 397 415 } 398 416 }, 417 417 + "nix-firefox-addons": { 418 418 + "inputs": { 419 419 + "flake-utils": "flake-utils_2", 420 420 + "nixpkgs": [ 421 421 + "nixpkgs" 422 422 + ] 423 423 + }, 424 424 + "locked": { 425 425 + "lastModified": 1772773319, 426 426 + "narHash": "sha256-TsEJMhnDa+6b1TgOIqoUZ0ZautYpTdy3CS4nB1C5fyM=", 427 427 + "owner": "encode42", 428 428 + "repo": "nix-firefox-addons", 429 429 + "rev": "01808237798cd3fe49065ef24da6c2b493272544", 430 430 + "type": "github" 431 431 + }, 432 432 + "original": { 433 433 + "owner": "encode42", 434 434 + "repo": "nix-firefox-addons", 435 435 + "type": "github" 436 436 + } 437 437 + }, 399 438 "nix-jetbrains-plugins": { 400 439 "inputs": { 401 440 "flake-compat": "flake-compat_2", 402 441 "nixpkgs": [ 403 442 "nixpkgs" 404 443 ], 405 405 - "systems": "systems_2" 444 444 + "systems": "systems_3" 406 445 }, 407 446 "locked": { 408 447 "lastModified": 1772266606, ··· 427 466 ] 428 467 }, 429 468 "locked": { 430 430 - "lastModified": 1772671545, 431 431 - "narHash": "sha256-7CFg6ppK000u+bd87+6HSVkFSC8PKm/N22MMZMtYla4=", 469 469 + "lastModified": 1772758160, 470 470 + "narHash": "sha256-IH059AfbEIUFOV66Mun7ePAWuvBeetNbgzHoghSvxNg=", 432 471 "owner": "kaylorben", 433 472 "repo": "nixcord", 434 434 - "rev": "9c048e21aa13ab529f00ab1f13c3793ba0b49b7c", 473 473 + "rev": "080389b419797d964ce3309c4b5d2ded793f510c", 435 474 "type": "github" 436 475 }, 437 476 "original": { ··· 458 497 }, 459 498 "nixpkgs": { 460 499 "locked": { 461 461 - "lastModified": 1764522689, 462 462 - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", 500 500 + "lastModified": 1772598333, 501 501 + "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", 463 502 "owner": "NixOS", 464 503 "repo": "nixpkgs", 465 465 - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", 504 504 + "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", 466 505 "type": "github" 467 506 }, 468 507 "original": { ··· 489 528 }, 490 529 "nixpkgs-unstable": { 491 530 "locked": { 492 492 - "lastModified": 1772542754, 493 493 - "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", 531 531 + "lastModified": 1772624091, 532 532 + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", 494 533 "owner": "NixOS", 495 534 "repo": "nixpkgs", 496 496 - "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", 535 535 + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", 497 536 "type": "github" 498 537 }, 499 538 "original": { ··· 503 542 "type": "github" 504 543 } 505 544 }, 506 506 - "nixpkgs_2": { 507 507 - "locked": { 508 508 - "lastModified": 1772598333, 509 509 - "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", 510 510 - "owner": "NixOS", 511 511 - "repo": "nixpkgs", 512 512 - "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", 513 513 - "type": "github" 514 514 - }, 515 515 - "original": { 516 516 - "owner": "NixOS", 517 517 - "ref": "nixos-25.11", 518 518 - "repo": "nixpkgs", 519 519 - "type": "github" 520 520 - } 521 521 - }, 522 545 "pre-commit": { 523 546 "inputs": { 524 547 "flake-compat": "flake-compat", ··· 545 568 "root": { 546 569 "inputs": { 547 570 "disko": "disko", 548 548 - "emby-flake": "emby-flake", 549 549 - "firefox-addons": "firefox-addons", 550 571 "home-manager": "home-manager", 551 572 "lanzaboote": "lanzaboote", 552 573 "lix-module": "lix-module", 574 574 + "nix-firefox-addons": "nix-firefox-addons", 553 575 "nix-jetbrains-plugins": "nix-jetbrains-plugins", 554 576 "nixcord": "nixcord", 555 577 "nixos-hardware": "nixos-hardware", 556 556 - "nixpkgs": "nixpkgs_2", 578 578 + "nixpkgs": "nixpkgs", 557 579 "nixpkgs-unstable": "nixpkgs-unstable", 558 580 "tangled": "tangled", 559 581 "vpn-confinement": "vpn-confinement" ··· 624 646 } 625 647 }, 626 648 "systems_3": { 649 649 + "locked": { 650 650 + "lastModified": 1681028828, 651 651 + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 652 652 + "owner": "nix-systems", 653 653 + "repo": "default", 654 654 + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 655 655 + "type": "github" 656 656 + }, 657 657 + "original": { 658 658 + "owner": "nix-systems", 659 659 + "repo": "default", 660 660 + "type": "github" 661 661 + } 662 662 + }, 663 663 + "systems_4": { 627 664 "locked": { 628 665 "lastModified": 1681028828, 629 666 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

+2 -2

flake.nix

··· 39 39 inputs.nixpkgs.follows = "nixpkgs"; 40 40 }; 41 41 42 42 - firefox-addons = { 43 43 - url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; 42 42 + nix-firefox-addons = { 43 43 + url = "github:encode42/nix-firefox-addons"; 44 44 45 45 inputs.nixpkgs.follows = "nixpkgs"; 46 46 };

+2 -2

homes/encode42/desktop/firefox.nix

··· 1 1 - { firefox-addons, pkgs, ... }: 1 1 + { pkgs-firefox-addons, ... }: 2 2 3 3 let 4 4 nixosIcon = "https://wiki.nixos.org/favicon.ico"; ··· 49 49 50 50 # TODO: configure them too 51 51 extensions = { 52 52 - packages = with firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [ 52 52 + packages = with pkgs-firefox-addons; [ 53 53 fastforwardteam 54 54 indie-wiki-buddy 55 55 linkwarden

+3 -1

lib/mkSystem.nix

··· 26 26 27 27 pkgs-flake = flake.packages.${system}; 28 28 29 29 + pkgs-firefox-addons = inputs.nix-firefox-addons.addons.${system}; 30 30 + 29 31 lib = inputs.nixpkgs.lib; 30 32 31 33 flakeLib = import ./default.nix { ··· 61 63 flakeLib 62 64 pkgs-unstable 63 65 pkgs-flake 66 66 + pkgs-firefox-addons 64 67 isLaptop 65 68 hostName 66 69 ; ··· 69 72 lanzaboote = inputs.lanzaboote; 70 73 nixos-hardware = inputs.nixos-hardware; 71 74 home-manager = inputs.home-manager; 72 72 - firefox-addons = inputs.firefox-addons; 73 75 nixcord = inputs.nixcord; 74 76 }; 75 77 }