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
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";

View File

@ -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";

View File

@ -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; [