From 60d486da701d38fcdcaf192c134bc59faa52976a Mon Sep 17 00:00:00 2001 From: NullBite Date: Thu, 23 May 2024 02:32:57 -0400 Subject: [PATCH] stylix: switch to PR 244 --- flake.lock | 7 ++++--- flake.nix | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f1caab6..f3525b5 100644 --- a/flake.lock +++ b/flake.lock @@ -711,15 +711,16 @@ ] }, "locked": { - "lastModified": 1716206302, - "narHash": "sha256-5Qc3aQGVyPEOuN82zVamStaV81HebHvLjk3fGfpyCPY=", + "lastModified": 1716384443, + "narHash": "sha256-utea2y5nEwzMM9rWJXDN0qmV4tJjRcMERQEcgk/ng00=", "owner": "danth", "repo": "stylix", - "rev": "81df8443556335016d6f0bc22630a95776a56d8b", + "rev": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8", "type": "github" }, "original": { "owner": "danth", + "ref": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 7f804e8..8b4223e 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ impermanence.url = "github:nix-community/impermanence"; stylix = { - url = "github:danth/stylix"; + url = "github:danth/stylix?ref=e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; @@ -172,6 +172,27 @@ # TODO rewrite this so it follows the same wrapper pattern as mkHome # This function produces a nixosSystem which imports configuration.nix and # 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; in { system, nixpkgs ? _nixpkgs,