pluie.me / flake
All my system configs and packages in one repo
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

refactor: don't spill all inputs into module inputs

So if you have an input called "lanzaboote", now you have to refer to it
with `inputs.lanzaboote` in module code instead of just `lanzaboote`.
IMO this is clearer.

Leah Amelia Chen 2f6edab8 2e87e833

+47 -208
+7 -163
flake.lock
··· 1 1 { 2 2 "nodes": { 3 - "agenix": { 4 - "inputs": { 5 - "darwin": "darwin", 6 - "home-manager": "home-manager_2", 7 - "nixpkgs": [ 8 - "ragenix", 9 - "nixpkgs" 10 - ], 11 - "systems": "systems_2" 12 - }, 13 - "locked": { 14 - "lastModified": 1707830867, 15 - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", 16 - "owner": "ryantm", 17 - "repo": "agenix", 18 - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", 19 - "type": "github" 20 - }, 21 - "original": { 22 - "owner": "ryantm", 23 - "repo": "agenix", 24 - "type": "github" 25 - } 26 - }, 27 3 "blender-bin": { 28 4 "inputs": { 29 5 "nixpkgs": [ ··· 80 56 "type": "github" 81 57 } 82 58 }, 83 - "crane_2": { 84 - "inputs": { 85 - "nixpkgs": [ 86 - "ragenix", 87 - "nixpkgs" 88 - ] 89 - }, 90 - "locked": { 91 - "lastModified": 1708794349, 92 - "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", 93 - "owner": "ipetkov", 94 - "repo": "crane", 95 - "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", 96 - "type": "github" 97 - }, 98 - "original": { 99 - "owner": "ipetkov", 100 - "repo": "crane", 101 - "type": "github" 102 - } 103 - }, 104 59 "ctp-discord-compiled": { 105 60 "flake": false, 106 61 "locked": { ··· 135 90 "type": "github" 136 91 } 137 92 }, 138 - "darwin": { 139 - "inputs": { 140 - "nixpkgs": [ 141 - "ragenix", 142 - "agenix", 143 - "nixpkgs" 144 - ] 145 - }, 146 - "locked": { 147 - "lastModified": 1700795494, 148 - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", 149 - "owner": "lnl7", 150 - "repo": "nix-darwin", 151 - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", 152 - "type": "github" 153 - }, 154 - "original": { 155 - "owner": "lnl7", 156 - "ref": "master", 157 - "repo": "nix-darwin", 158 - "type": "github" 159 - } 160 - }, 161 93 "firefox-addons": { 162 94 "inputs": { 163 95 "flake-utils": [ 164 - "ragenix", 165 96 "flake-utils" 166 97 ], 167 98 "nixpkgs": [ ··· 240 171 }, 241 172 "flake-utils_2": { 242 173 "inputs": { 243 - "systems": "systems_3" 174 + "systems": "systems_2" 244 175 }, 245 176 "locked": { 246 - "lastModified": 1705309234, 247 - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", 177 + "lastModified": 1710146030, 178 + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", 248 179 "owner": "numtide", 249 180 "repo": "flake-utils", 250 - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", 181 + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", 251 182 "type": "github" 252 183 }, 253 184 "original": { ··· 298 229 "type": "github" 299 230 } 300 231 }, 301 - "home-manager_2": { 302 - "inputs": { 303 - "nixpkgs": [ 304 - "ragenix", 305 - "agenix", 306 - "nixpkgs" 307 - ] 308 - }, 309 - "locked": { 310 - "lastModified": 1703113217, 311 - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", 312 - "owner": "nix-community", 313 - "repo": "home-manager", 314 - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", 315 - "type": "github" 316 - }, 317 - "original": { 318 - "owner": "nix-community", 319 - "repo": "home-manager", 320 - "type": "github" 321 - } 322 - }, 323 232 "krunner-nix": { 324 233 "inputs": { 325 234 "nixpkgs": [ ··· 347 256 "flake-parts": [ 348 257 "flake-parts" 349 258 ], 350 - "flake-utils": "flake-utils", 259 + "flake-utils": "flake-utils_2", 351 260 "nixpkgs": [ 352 261 "nixpkgs" 353 262 ], ··· 512 421 "type": "github" 513 422 } 514 423 }, 515 - "ragenix": { 516 - "inputs": { 517 - "agenix": "agenix", 518 - "crane": "crane_2", 519 - "flake-utils": "flake-utils_2", 520 - "nixpkgs": [ 521 - "nixpkgs" 522 - ], 523 - "rust-overlay": "rust-overlay" 524 - }, 525 - "locked": { 526 - "lastModified": 1709831932, 527 - "narHash": "sha256-WsP8rOFa/SqYNbVtYJ/l2mWWOgyDTJFbITMV8tv0biI=", 528 - "owner": "yaxitech", 529 - "repo": "ragenix", 530 - "rev": "06de099ef02840ec463419f12de73729d458e1eb", 531 - "type": "github" 532 - }, 533 - "original": { 534 - "owner": "yaxitech", 535 - "repo": "ragenix", 536 - "type": "github" 537 - } 538 - }, 539 424 "root": { 540 425 "inputs": { 541 426 "blender-bin": "blender-bin", ··· 544 429 "ctp-vscode-compiled": "ctp-vscode-compiled", 545 430 "firefox-addons": "firefox-addons", 546 431 "flake-parts": "flake-parts", 432 + "flake-utils": "flake-utils", 547 433 "home-manager": "home-manager", 548 434 "krunner-nix": "krunner-nix", 549 435 "lanzaboote": "lanzaboote", ··· 552 438 "nixos-hardware": "nixos-hardware", 553 439 "nixpkgs": "nixpkgs", 554 440 "plasma-manager": "plasma-manager", 555 - "ragenix": "ragenix", 556 - "rust-overlay": "rust-overlay_2" 441 + "rust-overlay": "rust-overlay" 557 442 } 558 443 }, 559 444 "rust-overlay": { 560 445 "inputs": { 561 446 "flake-utils": [ 562 - "ragenix", 563 - "flake-utils" 564 - ], 565 - "nixpkgs": [ 566 - "ragenix", 567 - "nixpkgs" 568 - ] 569 - }, 570 - "locked": { 571 - "lastModified": 1708740535, 572 - "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", 573 - "owner": "oxalica", 574 - "repo": "rust-overlay", 575 - "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", 576 - "type": "github" 577 - }, 578 - "original": { 579 - "owner": "oxalica", 580 - "repo": "rust-overlay", 581 - "type": "github" 582 - } 583 - }, 584 - "rust-overlay_2": { 585 - "inputs": { 586 - "flake-utils": [ 587 - "ragenix", 588 447 "flake-utils" 589 448 ], 590 449 "nixpkgs": [ ··· 621 480 } 622 481 }, 623 482 "systems_2": { 624 - "locked": { 625 - "lastModified": 1681028828, 626 - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 627 - "owner": "nix-systems", 628 - "repo": "default", 629 - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 630 - "type": "github" 631 - }, 632 - "original": { 633 - "owner": "nix-systems", 634 - "repo": "default", 635 - "type": "github" 636 - } 637 - }, 638 - "systems_3": { 639 483 "locked": { 640 484 "lastModified": 1681028828, 641 485 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+5 -7
flake.nix
··· 29 29 url = "sourcehut:~rycee/nur-expressions?dir=pkgs/firefox-addons"; 30 30 inputs = { 31 31 nixpkgs.follows = "nixpkgs"; 32 - flake-utils.follows = "ragenix/flake-utils"; 32 + flake-utils.follows = "flake-utils"; 33 33 }; 34 34 }; 35 35 ··· 37 37 url = "github:hercules-ci/flake-parts"; 38 38 inputs.nixpkgs-lib.follows = "nixpkgs"; 39 39 }; 40 + 41 + # Only for input deduplication 42 + flake-utils.url = "github:numtide/flake-utils"; 40 43 41 44 krunner-nix = { 42 45 url = "github:pluiedev/krunner-nix"; ··· 77 80 }; 78 81 }; 79 82 80 - ragenix = { 81 - url = "github:yaxitech/ragenix"; 82 - inputs.nixpkgs.follows = "nixpkgs"; 83 - }; 84 - 85 83 rust-overlay = { 86 84 url = "github:oxalica/rust-overlay"; 87 85 inputs.nixpkgs.follows = "nixpkgs"; 88 - inputs.flake-utils.follows = "ragenix/flake-utils"; 86 + inputs.flake-utils.follows = "flake-utils"; 89 87 }; 90 88 }; 91 89
+2 -2
roles/boot/lanzaboote/default.nix
··· 1 1 { 2 2 config, 3 3 lib, 4 - lanzaboote, 4 + inputs, 5 5 ... 6 6 }: { 7 - imports = [lanzaboote.nixosModules.lanzaboote]; 7 + imports = [inputs.lanzaboote.nixosModules.lanzaboote]; 8 8 9 9 options.roles.boot.lanzaboote.enable = lib.mkEnableOption "Lanzaboote, a secure boot implementation for NixOS"; 10 10
+4 -4
roles/catppuccin/default.nix
··· 1 1 { 2 2 config, 3 3 lib, 4 - catppuccin, 4 + inputs, 5 5 ... 6 6 }: let 7 - inherit (lib) mkEnableOption mkIf mkDefault mkOption types; 7 + inherit (lib) mkEnableOption mkIf mkOption types; 8 8 inherit (config.roles.catppuccin) enable flavour accent; 9 9 in { 10 10 imports = [ 11 - catppuccin.nixosModules.catppuccin 11 + inputs.catppuccin.nixosModules.catppuccin 12 12 ./discord.nix 13 13 ./sddm.nix 14 14 ]; ··· 32 32 enable = true; 33 33 }; 34 34 hm = { 35 - imports = [catppuccin.homeManagerModules.catppuccin]; 35 + imports = [inputs.catppuccin.homeManagerModules.catppuccin]; 36 36 37 37 catppuccin = { 38 38 inherit accent flavour;
+3 -4
roles/catppuccin/discord.nix
··· 1 1 { 2 2 config, 3 3 lib, 4 - ctp-discord-compiled, 5 - ctp-vscode-compiled, 4 + inputs, 6 5 ... 7 6 }: let 8 7 inherit (lib) mkEnableOption mkIf; ··· 10 9 cfg = config.hm.programs.discord.catppuccin; 11 10 12 11 vencord.settings = { 13 - themeLinks = ["https://raw.githubusercontent.com/catppuccin/discord/${ctp-discord-compiled.rev}/dist/catppuccin-${flavour}-${accent}.theme.css"]; 12 + themeLinks = ["https://raw.githubusercontent.com/catppuccin/discord/${inputs.ctp-discord-compiled.rev}/dist/catppuccin-${flavour}-${accent}.theme.css"]; 14 13 15 - plugins.ShikiCodeblocks.theme = "https://raw.githubusercontent.com/catppuccin/vscode/${ctp-vscode-compiled.rev}/${flavour}.json"; 14 + plugins.ShikiCodeblocks.theme = "https://raw.githubusercontent.com/catppuccin/vscode/${inputs.ctp-vscode-compiled.rev}/${flavour}.json"; 16 15 }; 17 16 in { 18 17 # TODO: make these "catppuccin-plus" options
+4 -4
roles/nix/default.nix
··· 1 1 { 2 2 lib, 3 - nixpkgs, 3 + inputs, 4 4 ... 5 - } @ inputs: let 5 + }: let 6 6 inherit (lib) mkDefault; 7 7 in { 8 8 nix = { 9 9 registry = { 10 - nixpkgs.flake = nixpkgs; 11 - n.flake = nixpkgs; 10 + nixpkgs.flake = inputs.nixpkgs; 11 + n.flake = inputs.nixpkgs; 12 12 }; 13 13 nixPath = let 14 14 toNixPath = input: "${input}=${inputs.${input}.outPath}";
+2 -2
roles/nix/nixos.nix
··· 1 1 { 2 - self, 3 2 config, 4 3 pkgs, 5 4 lib, 5 + inputs, 6 6 ... 7 7 }: { 8 8 system = { ··· 22 22 flags = ["--refresh"]; 23 23 }; 24 24 25 - configurationRevision = self.rev or self.dirtyRev or "unknown-dirty"; 25 + configurationRevision = inputs.self.rev or inputs.self.dirtyRev or "unknown-dirty"; 26 26 }; 27 27 }
+3 -4
roles/plasma/nixos.nix
··· 2 2 config, 3 3 lib, 4 4 pkgs, 5 - plasma-manager, 6 - krunner-nix, 5 + inputs, 7 6 ... 8 7 }: let 9 8 cfg = config.roles.plasma; ··· 25 24 roles.qt.platform = "kde"; 26 25 27 26 hm = { 28 - imports = [plasma-manager.homeManagerModules.plasma-manager]; 27 + imports = [inputs.plasma-manager.homeManagerModules.plasma-manager]; 29 28 30 - home.packages = lib.optional cfg.krunner-nix.enable krunner-nix.packages.${pkgs.system}.default; 29 + home.packages = lib.optional cfg.krunner-nix.enable inputs.krunner-nix.packages.${pkgs.system}.default; 31 30 32 31 # Janky workaround 33 32 # https://github.com/nix-community/home-manager/issues/1586
+2 -2
roles/rust/default.nix
··· 2 2 lib, 3 3 pkgs, 4 4 config, 5 - rust-overlay, 5 + inputs, 6 6 ... 7 7 }: let 8 8 cfg = config.roles.rust; ··· 54 54 toTOMLFile = pkgs.formats.toml {}; 55 55 in 56 56 mkIf cfg.enable { 57 - nixpkgs.overlays = [rust-overlay.overlays.default]; 57 + nixpkgs.overlays = [inputs.rust-overlay.overlays.default]; 58 58 59 59 hm = { 60 60 home.packages = [cfg.package];
+3 -3
systems/machines/fettuccine/default.nix
··· 1 - {nixos-hardware, ...}: { 2 - imports = with nixos-hardware.nixosModules; [ 1 + {inputs, ...}: { 2 + imports = with inputs.nixos-hardware.nixosModules; [ 3 3 ./hardware-configuration.nix 4 4 5 5 common-hidpi ··· 8 8 9 9 roles = { 10 10 boot.lanzaboote.enable = true; 11 - nvidia.enable = true; 11 + #nvidia.enable = true; 12 12 }; 13 13 14 14 hardware.bluetooth.enable = true;
+2 -2
systems/machines/tagliatelle/default.nix
··· 1 - {nixos-hardware, ...}: { 2 - imports = with nixos-hardware.nixosModules; [ 1 + {inputs, ...}: { 2 + imports = with inputs.nixos-hardware.nixosModules; [ 3 3 ./hardware-configuration.nix 4 4 5 5 common-pc
+1 -1
systems/profiles/personal-mac/default.nix
··· 14 14 15 15 {system.stateVersion = 4;} 16 16 ]; 17 - specialArgs = inputs; 17 + specialArgs = {inherit inputs;}; 18 18 }
+1 -1
systems/profiles/personal/default.nix
··· 14 14 15 15 {system.stateVersion = "24.05";} 16 16 ]; 17 - specialArgs = inputs; 17 + specialArgs = {inherit inputs;}; 18 18 }
+4 -5
users/leah/default.nix
··· 1 1 { 2 2 config, 3 3 pkgs, 4 - nix-index-database, 5 - self, 4 + inputs, 6 5 ... 7 6 }: { 8 7 imports = [ ··· 12 11 ]; 13 12 14 13 hm.imports = [ 15 - nix-index-database.hmModules.nix-index 16 - self.hmModules.hm-plus 14 + inputs.nix-index-database.hmModules.nix-index 15 + inputs.self.hmModules.hm-plus 17 16 ]; 18 17 19 18 roles.base = { ··· 71 70 72 71 defaults = { 73 72 serif = ["Libertinus Serif" "LXGW WenKai"]; 74 - sansSerif = ["Rubik" "LXGW Neo XiHei"]; 73 + sansSerif = ["Rethink Sans" "LXGW Neo XiHei"]; 75 74 emoji = ["Noto Color Emoji"]; 76 75 monospace = ["Iosevka Nerd Font" "LXGW Neo XiHei"]; 77 76 };
+2 -2
users/leah/programs/default.nix
··· 2 2 config, 3 3 pkgs, 4 4 lib, 5 - blender-bin, 5 + inputs, 6 6 ... 7 7 }: { 8 8 imports = [ ··· 17 17 18 18 hm.home.packages = with pkgs; [ 19 19 # Apps 20 - (blender-bin.packages.${pkgs.system}.default) 20 + (inputs.blender-bin.packages.${pkgs.system}.default) 21 21 chromium 22 22 gimp 23 23 inkscape-with-extensions
+2 -2
users/leah/programs/firefox/default.nix
··· 2 2 config, 3 3 lib, 4 4 pkgs, 5 - firefox-addons, 5 + inputs, 6 6 ... 7 7 }: { 8 8 hm.programs.firefox = { ··· 21 21 meta.license.free = true; 22 22 }; 23 23 in 24 - with firefox-addons.packages.${pkgs.system}; 24 + with inputs.firefox-addons.packages.${pkgs.system}; 25 25 map gaslight [ 26 26 # Essentials 27 27 auto-tab-discard