+10 -2

hosts/default.nix

··· 14 14 in 15 15 lib.nixosSystem { 16 16 inherit system; 17 17 - modules = baseModules ++ [(import (./. + "/${name}/default.nix"))]; 18 18 - specialArgs = {inherit inputs lib pkgs;}; 17 17 + modules = 18 18 + baseModules 19 19 + ++ [ 20 20 + {nixpkgs.pkgs = pkgs;} 21 21 + (import (./. + "/${name}/default.nix")) 22 22 + ]; 23 23 + specialArgs = { 24 24 + inherit inputs; 25 25 + tlib = lib; 26 26 + }; 19 27 }; 20 28 in { 21 29 lungmen = mkSystem "lungmen" "x86_64-linux";

+3 -1

modules/base/default.nix

··· 3 3 config, 4 4 pkgs, 5 5 lib, 6 6 + tlib, 6 7 ... 7 8 }: let 8 8 - inherit (lib) fileContents mkIf pkgBin; 9 9 + inherit (lib) fileContents mkIf; 10 10 + inherit (tlib) pkgBin; 9 11 10 12 coreBin = v: "${pkgs.coreutils}/bin/${v}"; 11 13 nixBin = "${config.nix.package}/bin/nix";

+3 -2

users/patriot/default.nix

··· 1 1 { 2 2 pkgs, 3 3 lib, 4 4 + tlib, 4 5 ... 5 6 } @ globalAttrs: let 6 7 inherit (lib) mapAttrs' nameValuePair; 7 8 inherit (builtins) readDir fetchGit; 8 9 9 9 - pkgBin = lib.pkgBin pkgs; 10 10 + pkgBin = tlib.pkgBin pkgs; 10 11 nixosConfig = globalAttrs.config; 11 12 in { 12 13 users.users.patriot = { ··· 238 239 ../modules/git 239 240 ../modules/starship 240 241 ]; 241 241 - fonts.fontconfig.enable = true; 242 242 + fonts.fontconfig.enable = lib.mkForce true; 242 243 home = { 243 244 homeDirectory = nixosConfig.users.users.patriot.home; 244 245 packages = with pkgs; [