diff --git a/hosts/default.nix b/hosts/default.nix index 1424914..02e5a55 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -14,8 +14,16 @@ in lib.nixosSystem { inherit system; - modules = baseModules ++ [(import (./. + "/${name}/default.nix"))]; - specialArgs = {inherit inputs lib pkgs;}; + modules = + baseModules + ++ [ + {nixpkgs.pkgs = pkgs;} + (import (./. + "/${name}/default.nix")) + ]; + specialArgs = { + inherit inputs; + tlib = lib; + }; }; in { lungmen = mkSystem "lungmen" "x86_64-linux"; diff --git a/modules/base/default.nix b/modules/base/default.nix index 18e53c0..f716dd6 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -3,9 +3,11 @@ config, pkgs, lib, + tlib, ... }: let - inherit (lib) fileContents mkIf pkgBin; + inherit (lib) fileContents mkIf; + inherit (tlib) pkgBin; coreBin = v: "${pkgs.coreutils}/bin/${v}"; nixBin = "${config.nix.package}/bin/nix"; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index b637856..33d9474 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -1,12 +1,13 @@ { pkgs, lib, + tlib, ... } @ globalAttrs: let inherit (lib) mapAttrs' nameValuePair; inherit (builtins) readDir fetchGit; - pkgBin = lib.pkgBin pkgs; + pkgBin = tlib.pkgBin pkgs; nixosConfig = globalAttrs.config; in { users.users.patriot = { @@ -238,7 +239,7 @@ in { ../modules/git ../modules/starship ]; - fonts.fontconfig.enable = true; + fonts.fontconfig.enable = lib.mkForce true; home = { homeDirectory = nixosConfig.users.users.patriot.home; packages = with pkgs; [