File tree 5 files changed +21
-14
lines changed
5 files changed +21
-14
lines changed Original file line number Diff line number Diff line change 10
10
11
11
( import ./pkgs/top-level { inherit pkgs ; } ) // {
12
12
# The `lib`, `modules`, and `overlay` names are special
13
- # lib = import ./lib { inherit pkgs; }; # functions
13
+ lib = import ./lib { inherit pkgs ; } ; # functions
14
14
# modules = import ./modules; # NixOS modules
15
15
overlays = import ./overlays ; # nixpkgs overlays
16
16
}
Original file line number Diff line number Diff line change 19
19
persistent = "/persistent" ;
20
20
args = { inherit hostname username persistent ; } ;
21
21
pkgs = nixpkgs . legacyPackages . ${ system } ;
22
+ # https://github.com/NixOS/nixpkgs/issues/156312
23
+ # https://github.com/NixOS/nixpkgs/pull/157056
24
+ lib = nixpkgs . lib . extend (
25
+ final : prev : prev // ( import ./lib { inherit pkgs ; } )
26
+ ) ;
22
27
in
23
28
{
24
29
nixosConfigurations = {
25
- ${ hostname } = nixpkgs . lib . nixosSystem {
26
- inherit system ;
30
+ ${ hostname } = lib . nixosSystem {
31
+ inherit system lib ;
27
32
modules = [
28
- ( import ./home.nix { path = "nixos" ; } )
33
+ ( lib . importDir "nixos" )
29
34
home-manager . nixosModules . home-manager
30
35
{
31
36
home-manager = {
32
37
useGlobalPkgs = true ;
33
38
useUserPackages = true ;
34
- users . ${ username } = import ./home.nix { path = "config" ; } ;
39
+ users . ${ username } = lib . importDir "config" ;
35
40
sharedModules = [
36
41
"${ impermanence } /home-manager.nix"
37
42
{ _module = { inherit args ; } ; }
48
53
} ;
49
54
} ;
50
55
legacyPackages . ${ system } = import ./. { inherit pkgs ; } ;
51
- packages . ${ system } = nixpkgs . lib . filterAttrs
52
- ( _ : v : nixpkgs . lib . isDerivation v )
56
+ packages . ${ system } = lib . filterAttrs ( _ : v : lib . isDerivation v )
53
57
self . legacyPackages . ${ system } ;
54
58
inherit ( self . legacyPackages . ${ system } ) overlays ;
55
59
formatter . ${ system } = pkgs . nixpkgs-fmt ;
Load Diff This file was deleted.
Original file line number Diff line number Diff line change
1
+ { pkgs } :
2
+
3
+ {
4
+ importDir = path : {
5
+ # loads *.nix files and directories with default.nix
6
+ imports = map ( name : ../${ path } /${ name } )
7
+ ( builtins . attrNames ( builtins . readDir ../${ path } ) ) ;
8
+ } ;
9
+ }
Original file line number Diff line number Diff line change 1
1
{
2
2
pkgs = final : prev : import ../pkgs/top-level { pkgs = final ; } ;
3
+ lib = final : prev : { lib = prev . lib // ( import ../lib { pkgs = final ; } ) ; } ;
3
4
maintainers = import ./maintainers.nix ;
4
5
}
You can’t perform that action at this time.
0 commit comments