stylix: switch to PR 244

This commit is contained in:
NullBite 2024-05-23 02:32:57 -04:00
parent c716457192
commit 60d486da70
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
2 changed files with 26 additions and 4 deletions

7
flake.lock generated
View File

@ -711,15 +711,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716206302, "lastModified": 1716384443,
"narHash": "sha256-5Qc3aQGVyPEOuN82zVamStaV81HebHvLjk3fGfpyCPY=", "narHash": "sha256-utea2y5nEwzMM9rWJXDN0qmV4tJjRcMERQEcgk/ng00=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "81df8443556335016d6f0bc22630a95776a56d8b", "rev": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }

View File

@ -60,7 +60,7 @@
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
stylix = { stylix = {
url = "github:danth/stylix"; url = "github:danth/stylix?ref=e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
@ -172,6 +172,27 @@
# TODO rewrite this so it follows the same wrapper pattern as mkHome # TODO rewrite this so it follows the same wrapper pattern as mkHome
# This function produces a nixosSystem which imports configuration.nix and # This function produces a nixosSystem which imports configuration.nix and
# a Home Manager home.nix for the given user from ./hosts/${hostname}/ # a Home Manager home.nix for the given user from ./hosts/${hostname}/
mkSystemN = let
_username = username;
_overlays = overlays;
in { nixpkgs ? inputs.nixpkgs,
home-manager ? inputs.home-manager,
username ? _username,
entrypoint ? ./system,
modules ? [ ],
stateVersion ? null,
config ? { },
overlays ? _overlays,
system,
... }@args: let
_modules = [ entrypoint config ] ++ modules ++ [{
nixpkgs.config = {
inherit overlays;
allowUnfree = true;
};
}] ++ lib.optional (args ? stateVersion) { config.system.stateVersion = stateVersion; };
in nixpkgs.lib.nixosSystem {
};
mkSystem = let _username=username; _overlays=overlays; _nixpkgs=nixpkgs; mkSystem = let _username=username; _overlays=overlays; _nixpkgs=nixpkgs;
in { system, in { system,
nixpkgs ? _nixpkgs, nixpkgs ? _nixpkgs,