teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Revert "utils: now lives in lib.utils globally"

Browse source 
This reverts commit c9944b411e.
Causes infinite recursion, revert for now while exploring possible
solutions.
This commit is contained in:
Timothy DeHerrera 2020-01-05 15:39:59 -07:00
parent c9944b411e
commit 9670fa4b0f
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -16,9 +16,9 @@
overlays = self.overlays; overlays = self.overlays;
}; };
in { in {
nixosConfigurations = nixosConfigurations = let configs = import ./hosts args;
let configs = import ./hosts ({ lib = pkgs.lib; } // args);
in configs; in configs;
overlay = import ./pkgs; overlay = import ./pkgs;

6
hosts/default.nix
View file

@ -1,6 +1,8 @@
args@{ lib, home, nixpkgs, self, ... }: args@{ home, nixpkgs, self, ... }:
let let
inherit (lib.utils) recImport; utils = import ../lib/utils.nix { lib = nixpkgs.lib; };
inherit (utils) recImport;
inherit (builtins) attrValues removeAttrs; inherit (builtins) attrValues removeAttrs;

1
lib/utils.nix
View file

@ -11,7 +11,6 @@ in rec {
# attrs # attrs
mapFilterAttrs = seive: f: attrs: filterAttrs seive (mapAttrs' f attrs); mapFilterAttrs = seive: f: attrs: filterAttrs seive (mapAttrs' f attrs);
# used in hosts/default.nix
recImport = { dir, _import ? base: import "${dir}/${base}.nix" }: recImport = { dir, _import ? base: import "${dir}/${base}.nix" }:
mapFilterAttrs (_: v: v != null) (n: v: mapFilterAttrs (_: v: v != null) (n: v:
if n != "default.nix" && hasSuffix ".nix" n && v == "regular" if n != "default.nix" && hasSuffix ".nix" n && v == "regular"

1
pkgs/default.nix
View file

@ -3,5 +3,4 @@ final: prev: {
prev.callPackage ./applications/display-managers/sddm/themes/chili { }; prev.callPackage ./applications/display-managers/sddm/themes/chili { };
dejavu_nerdfont = prev.callPackage ./data/fonts/dejavu-nerdfont { }; dejavu_nerdfont = prev.callPackage ./data/fonts/dejavu-nerdfont { };
purs = prev.callPackage ./shells/zsh/purs { }; purs = prev.callPackage ./shells/zsh/purs { };
lib = prev.lib // { utils = import ../lib/utils.nix { lib = prev.lib; }; };
} }