pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge pull request #15 from jtojnar/check-fixes

Browse source 
flake: Fix `nix flake check`
This commit is contained in:
Timothy DeHerrera 2020-06-09 13:11:42 -06:00 committed by GitHub
parent d0e263afa5 a7749005bc
commit df88ef7bb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
flake.nix
View file

@ -6,13 +6,25 @@
outputs = inputs@{ self, home, nixpkgs }: outputs = inputs@{ self, home, nixpkgs }:
let let
inherit (builtins) listToAttrs baseNameOf attrNames readDir; inherit (builtins) listToAttrs baseNameOf attrNames attrValues readDir;
inherit (nixpkgs.lib) removeSuffix; inherit (nixpkgs.lib) removeSuffix;
system = "x86_64-linux"; system = "x86_64-linux";
# Generate an attribute set by mapping a function over a list of values.
genAttrs' = values: f: listToAttrs (map f values);
# Convert a list to file paths to attribute set
# that has the filenames stripped of nix extension as keys
# and imported content of the file as value.
pathsToImportedAttrs = paths:
genAttrs' paths (path: {
name = removeSuffix ".nix" (baseNameOf path);
value = import path;
});
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = self.overlays; overlays = attrValues self.overlays;
config = { allowUnfree = true; }; config = { allowUnfree = true; };
}; };
@ -23,28 +35,25 @@
overlay = import ./pkgs; overlay = import ./pkgs;
overlays = let overlays =
overlays = map (name: import (./overlays + "/${name}")) let
(attrNames (readDir ./overlays)); overlayDir = ./overlays;
in overlays; fullPath = name: overlayDir + "/${name}";
overlayPaths = map fullPath (attrNames (readDir overlayDir));
in pathsToImportedAttrs overlayPaths;
packages.x86_64-linux = { packages.x86_64-linux = {
inherit (pkgs) sddm-chili dejavu_nerdfont purs pure; inherit (pkgs) sddm-chili dejavu_nerdfont purs pure;
}; };
nixosModules = let nixosModules = let
prep = map (path: {
name = removeSuffix ".nix" (baseNameOf path);
value = import path;
});
# modules # modules
moduleList = import ./modules/list.nix; moduleList = import ./modules/list.nix;
modulesAttrs = listToAttrs (prep moduleList); modulesAttrs = pathsToImportedAttrs moduleList;
# profiles # profiles
profilesList = import ./profiles/list.nix; profilesList = import ./profiles/list.nix;
profilesAttrs = { profiles = listToAttrs (prep profilesList); }; profilesAttrs = { profiles = pathsToImportedAttrs profilesList; };
in modulesAttrs // profilesAttrs; in modulesAttrs // profilesAttrs;
}; };