maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Use gitfetch for cdarknet

Browse source
This commit is contained in:
Malte Brandy 2019-02-06 00:49:11 +01:00
parent ba3e99b688
commit 281f6585e2
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
5 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hosts/apollo/configuration.nix
View file

@ -111,12 +111,10 @@ services = {
cdark_net = { cdark_net = {
enable = true; enable = true;
hostName = "${me.user}_${config.networking.hostName}"; hostName = "${me.user}_${config.networking.hostName}";
ed25519PrivateKeyFile = builtins.toPath "/etc/nixos/hosts/${config.networking.hostName}/secret/tinc/ed25519_key.priv"; ed25519PrivateKeyFile = /etc/nixos/hosts + "/${config.networking.hostName}" + /secret/tinc/ed25519_key.priv;
hostsDirectory = /etc/nixos/system/modules/cdarknet/hosts; hostsDirectory = (builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/hosts");
ip6address = "fd23:42:cda:4342::2"; ip6address = "fd23:42:cda:4342::2";
ip4address = "172.20.71.2"; ip4address = "172.20.71.2";
}; };
} }

5
system/default.nix
View file

@ -1,17 +1,14 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let let
me = config.m-0.private.me; me = config.m-0.private.me;
unstable = import <unstable> {};
in { in {
# channel = 18.03
imports = [ imports = [
<home-manager/nixos> <home-manager/nixos>
../common ../common
./modules/laptop.nix ./modules/laptop.nix
./modules/server ./modules/server
./modules/standalone ./modules/standalone
./modules/cdarknet "${builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/nixdark"}/default.nix"
./modules/loginctl-linger.nix ./modules/loginctl-linger.nix
]; ];

1
system/modules/cdarknet/default.nix
View file

@ -1 +0,0 @@
nixdark/default.nix

1
system/modules/cdarknet/hosts

@ -1 +0,0 @@
Subproject commit 6a05b795d7333f23212427501c6d9dfbe1b73170

1
system/modules/cdarknet/nixdark

@ -1 +0,0 @@
Subproject commit 8f95a4a050889afe687fceb6875fd0d4006630df