use better path notation
This commit is contained in:
parent
ef5bc33856
commit
ba7763801f
5 changed files with 7 additions and 7 deletions
|
|
@ -24,7 +24,7 @@
|
|||
# ./legacy-imports.nix
|
||||
|
||||
# user configuration
|
||||
(import (root + "/nixpkgs.nix"))
|
||||
(import /${root}/nixpkgs.nix)
|
||||
# options declarations
|
||||
(import ./nixpkgs.nix (args // {contextName = "hosts";}))
|
||||
|
||||
|
|
|
|||
|
|
@ -33,15 +33,15 @@ in {
|
|||
users =
|
||||
config.users.users
|
||||
|> attrNames
|
||||
|> filter (x: pathExists (root + "/homes/${x}"))
|
||||
|> filter (x: pathExists /${root}/homes/${x})
|
||||
|> (x:
|
||||
lib.genAttrs x (y:
|
||||
import (root + "/homes/${y}")));
|
||||
import /${root}/homes/${y}));
|
||||
|
||||
extraSpecialArgs = _cerulean.specialArgs;
|
||||
sharedModules = [
|
||||
# user configuration
|
||||
(import (root + "/nixpkgs.nix"))
|
||||
(import /${root}/nixpkgs.nix)
|
||||
# options declarations
|
||||
(import ./nixpkgs.nix (args // {contextName = "homes";}))
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ in
|
|||
modules =
|
||||
[
|
||||
self.nixosModules.default
|
||||
(findImport (root + "/hosts/${name}"))
|
||||
(findImport /${root}/hosts/${name})
|
||||
]
|
||||
++ (groupModules root)
|
||||
++ node.modules
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
# flatten recursion result
|
||||
|> concatLists
|
||||
# find import location
|
||||
|> map (group: nt.findImport (root + "/groups/${group._name}"))
|
||||
|> map (group: nt.findImport (/${root}/groups/${group._name})
|
||||
# filter by uniqueness
|
||||
|> nt.prim.unique
|
||||
# ignore missing groups
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@
|
|||
}: {
|
||||
imports = [
|
||||
./nodes
|
||||
(snow.findImport (root + "/snow"))
|
||||
(snow.findImport /${root}/snow)
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue