This commit is contained in:
dusk 2022-04-09 22:01:44 +03:00
parent 0cab03eeca
commit d1fb0b839f
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 16 additions and 5 deletions

View File

@ -14,8 +14,16 @@
in in
lib.nixosSystem { lib.nixosSystem {
inherit system; inherit system;
modules = baseModules ++ [(import (./. + "/${name}/default.nix"))]; modules =
specialArgs = {inherit inputs lib pkgs;}; baseModules
++ [
{nixpkgs.pkgs = pkgs;}
(import (./. + "/${name}/default.nix"))
];
specialArgs = {
inherit inputs;
tlib = lib;
};
}; };
in { in {
lungmen = mkSystem "lungmen" "x86_64-linux"; lungmen = mkSystem "lungmen" "x86_64-linux";

View File

@ -3,9 +3,11 @@
config, config,
pkgs, pkgs,
lib, lib,
tlib,
... ...
}: let }: let
inherit (lib) fileContents mkIf pkgBin; inherit (lib) fileContents mkIf;
inherit (tlib) pkgBin;
coreBin = v: "${pkgs.coreutils}/bin/${v}"; coreBin = v: "${pkgs.coreutils}/bin/${v}";
nixBin = "${config.nix.package}/bin/nix"; nixBin = "${config.nix.package}/bin/nix";

View File

@ -1,12 +1,13 @@
{ {
pkgs, pkgs,
lib, lib,
tlib,
... ...
} @ globalAttrs: let } @ globalAttrs: let
inherit (lib) mapAttrs' nameValuePair; inherit (lib) mapAttrs' nameValuePair;
inherit (builtins) readDir fetchGit; inherit (builtins) readDir fetchGit;
pkgBin = lib.pkgBin pkgs; pkgBin = tlib.pkgBin pkgs;
nixosConfig = globalAttrs.config; nixosConfig = globalAttrs.config;
in { in {
users.users.patriot = { users.users.patriot = {
@ -238,7 +239,7 @@ in {
../modules/git ../modules/git
../modules/starship ../modules/starship
]; ];
fonts.fontconfig.enable = true; fonts.fontconfig.enable = lib.mkForce true;
home = { home = {
homeDirectory = nixosConfig.users.users.patriot.home; homeDirectory = nixosConfig.users.users.patriot.home;
packages = with pkgs; [ packages = with pkgs; [