mirror of
https://github.com/danth/stylix
synced 2024-11-10 06:34:15 +00:00
stylix: re-add flake-utils
dependency (#515)
This commit is contained in:
commit
d042af478c
2 changed files with 66 additions and 27 deletions
39
flake.lock
39
flake.lock
|
@ -130,6 +130,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -209,9 +229,26 @@
|
|||
"base16-tmux": "base16-tmux",
|
||||
"base16-vim": "base16-vim",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
54
flake.nix
54
flake.nix
|
@ -37,6 +37,11 @@
|
|||
url = "github:edolstra/flake-compat";
|
||||
};
|
||||
|
||||
flake-utils = {
|
||||
inputs.systems.follows = "systems";
|
||||
url = "github:numtide/flake-utils";
|
||||
};
|
||||
|
||||
gnome-shell = {
|
||||
flake = false;
|
||||
|
||||
|
@ -53,37 +58,34 @@
|
|||
};
|
||||
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
|
||||
# Interface flake systems.
|
||||
systems.url = "github:nix-systems/default";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs, base16, self, ... }@inputs:
|
||||
{
|
||||
packages = nixpkgs.lib.genAttrs [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
] (
|
||||
system:
|
||||
let
|
||||
inherit (nixpkgs) lib;
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
|
||||
universalPackages = {
|
||||
docs = import ./docs { inherit pkgs inputs lib; };
|
||||
palette-generator = pkgs.callPackage ./palette-generator { };
|
||||
};
|
||||
|
||||
# Testbeds are virtual machines based on NixOS, therefore they are
|
||||
# only available for Linux systems.
|
||||
testbedPackages = lib.optionalAttrs
|
||||
(lib.hasSuffix "-linux" system)
|
||||
(import ./stylix/testbed.nix { inherit pkgs inputs lib; });
|
||||
in
|
||||
universalPackages // testbedPackages
|
||||
);
|
||||
inputs.flake-utils.lib.eachDefaultSystem (
|
||||
system: let
|
||||
inherit (nixpkgs) lib;
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
packages = let
|
||||
universalPackages = {
|
||||
docs = import ./docs { inherit pkgs inputs lib; };
|
||||
palette-generator = pkgs.callPackage ./palette-generator { };
|
||||
};
|
||||
|
||||
# Testbeds are virtual machines based on NixOS, therefore they are
|
||||
# only available for Linux systems.
|
||||
testbedPackages = lib.optionalAttrs
|
||||
(lib.hasSuffix "-linux" system)
|
||||
(import ./stylix/testbed.nix { inherit pkgs inputs lib; });
|
||||
in
|
||||
universalPackages // testbedPackages;
|
||||
}
|
||||
)
|
||||
// {
|
||||
nixosModules.stylix = { pkgs, ... }@args: {
|
||||
imports = [
|
||||
(import ./stylix/nixos inputs {
|
||||
|
|
Loading…
Reference in a new issue