Mic92
/
stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stockholm: stockholm-path -> ./.

This commit is contained in:
tv 2016-02-04 03:07:47 +01:00
parent 1745d3efa0
commit fb734eded5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default.nix
View File

@ -17,8 +17,7 @@ let stockholm = {
nlib = import <nixpkgs/lib>; nlib = import <nixpkgs/lib>;
klib = import (slib.kpath "4lib") { lib = nlib; }; klib = import (slib.kpath "4lib") { lib = nlib; };
slib = rec { slib = rec {
stockholm-path = ./.; nspath = ns: p: ./. + "/${ns}/${p}";
nspath = ns: p: stockholm-path + "/${ns}/${p}";
kpath = nspath "krebs"; kpath = nspath "krebs";
upath = nspath current-user-name; upath = nspath current-user-name;
}; };

11
tv/2configs/default.nix
View File

@ -10,14 +10,13 @@ with lib;
target = mkDefault "root@${config.krebs.build.host.name}"; target = mkDefault "root@${config.krebs.build.host.name}";
source-version = 2; source-version = 2;
source = mapAttrs (_: mkDefault) ({ source = mapAttrs (_: mkDefault) ({
nixos-config = "symlink:stockholm-private/1systems/${config.krebs.build.host.name}.nix"; nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix";
nixpkgs = symlink:stockholm-nixpkgs; nixpkgs = symlink:stockholm/nixpkgs;
null = "/home/tv/stockholm/null"; null = "symlink:stockholm/null";
secrets = "/home/tv/secrets/${config.krebs.build.host.name}"; secrets = "/home/tv/secrets/${config.krebs.build.host.name}";
secrets-common = "/home/tv/secrets/common"; secrets-common = "/home/tv/secrets/common";
stockholm-krebs = "/home/tv/stockholm/krebs"; stockholm = "/home/tv/stockholm";
stockholm-nixpkgs = "/home/tv/stockholm/nixpkgs"; stockholm-user = "symlink:stockholm/tv";
stockholm-private = "/home/tv/stockholm/tv";
upstream-nixpkgs = { upstream-nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; rev = "77f8f35d57618c1ba456d968524f2fb2c3448295";