fix
This commit is contained in:
parent
0cab03eeca
commit
d1fb0b839f
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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; [
|
||||
|
Loading…
Reference in New Issue
Block a user