diff --git a/.versions/retiolum.json b/.versions/retiolum.json new file mode 100644 index 0000000..54f0ce4 --- /dev/null +++ b/.versions/retiolum.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/krebs/retiolum", + "rev": "15cec63dfbe5b70000372e1cb71f648907de2697", + "date": "2020-10-12T23:02:11+02:00", + "sha256": "1gif6802ady2w7yyl0wb9wfp0jzpxzvp8d34hz4445yfd4wq2bh6", + "fetchSubmodules": false +} diff --git a/deploy.nix b/deploy.nix index 67275fd..4138e3e 100644 --- a/deploy.nix +++ b/deploy.nix @@ -20,6 +20,7 @@ let nixos-unstable.git = gitFromJson .versions/nixpkgs-unstable.json; home-manager.git = gitFromJson .versions/home-manager.json; stockholm.git = gitFromJson .versions/stockholm.json; + retiolum.git = gitFromJson .versions/retiolum.json; system-secrets.pass = { dir = toString ~/.password-store/systems; inherit name; diff --git a/modules/retiolum.nix b/modules/retiolum.nix index 58b6f89..08d183d 100644 --- a/modules/retiolum.nix +++ b/modules/retiolum.nix @@ -46,12 +46,12 @@ in { }; systemd.services."tinc.${netname}" = { preStart = '' - cp -R ${retiolum}/hosts /etc/tinc/retiolum/ || true + cp -R ${toString } /etc/tinc/retiolum/ || true ''; }; networking.extraHosts = - builtins.readFile (toString "${retiolum}/etc.hosts"); + builtins.readFile (toString ); environment.systemPackages = [ config.services.tinc.networks.${netname}.package ]; diff --git a/shell.nix b/shell.nix index 7b1185a..f477aef 100644 --- a/shell.nix +++ b/shell.nix @@ -30,6 +30,11 @@ let url = "https://cgit.krebsco.de/stockholm"; path = toString .versions/stockholm.json; }; + retiolum = { + ref = "refs/heads/master"; + url = "https://github.com/krebs/retiolum"; + path = toString .versions/retiolum.json; + }; }; updateCommand = name: dependency: ''