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

Fix paths

Browse source
This commit is contained in:
Malte Brandy 2020-07-02 22:03:06 +02:00
parent 2e60b57cf9
commit 730e490e67
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
common/secret/default.nix
View file

Binary file not shown.

8
nixos/machines/apollo/configuration.nix
View file

@ -28,7 +28,7 @@ in {
m0wire = { m0wire = {
allowedIPsAsRoutes = false; allowedIPsAsRoutes = false;
ips = [ "${hosts.apollo-wg}/112" ]; ips = [ "${hosts.apollo-wg}/112" ];
privateKeyFile = "/etc/nixosnixos/machinesapollo/secret/wireguard-private"; privateKeyFile = "/etc/nixos/nixos/machines/apollo/secret/wireguard-private";
peers = [{ peers = [{
publicKey = wireguard.pub.hera; publicKey = wireguard.pub.hera;
allowedIPs = [ "::/0" ]; allowedIPs = [ "::/0" ];
@ -77,8 +77,8 @@ in {
openDefaultPorts = true; openDefaultPorts = true;
declarative = syncthing.declarativeWith [ "hera" ] "/home/maralorn/media" declarative = syncthing.declarativeWith [ "hera" ] "/home/maralorn/media"
// { // {
cert = "/etc/nixosnixos/machinesapollo/secret/syncthing/cert.pem"; cert = "/etc/nixos/nixos/machines/apollo/secret/syncthing/cert.pem";
key = "/etc/nixosnixos/machinesapollo/secret/syncthing/key.pem"; key = "/etc/nixos/nixos/machines/apollo/secret/syncthing/key.pem";
}; };
}; };
gnome3.chrome-gnome-shell.enable = true; gnome3.chrome-gnome-shell.enable = true;
@ -93,7 +93,7 @@ in {
cdark_net = { cdark_net = {
enable = true; enable = true;
hostName = "${me.user}_${config.networking.hostName}"; hostName = "${me.user}_${config.networking.hostName}";
ed25519PrivateKeyFile = /etc/nixos/hosts + "/${config.networking.hostName}" ed25519PrivateKeyFile = /etc/nixos/nixos/machines + "/${config.networking.hostName}"
+ /secret/tinc/ed25519_key.priv; + /secret/tinc/ed25519_key.priv;
hostsDirectory = hostsDirectory =
(builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/hosts"); (builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/hosts");

8
nixos/machines/hera/configuration.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
# You need pw-files for every configured user in ./secret/pw-useralias for login to work. # You need pw-files for every configured user in ./secret/pw-useralias for login to work.
# dropbearkey -t rsa -f /etc/nixosnixos/machines<hostname>/secret/boot_rsa # dropbearkey -t rsa -f /etc/nixos/nixos/machines/<hostname>/secret/boot_rsa
let let
inherit (config.m-0.private) me; inherit (config.m-0.private) me;
@ -103,8 +103,8 @@ in {
user = "maralorn"; user = "maralorn";
openDefaultPorts = true; openDefaultPorts = true;
declarative = syncthing.declarativeWith [ "apollo" ] "/media" // { declarative = syncthing.declarativeWith [ "apollo" ] "/media" // {
cert = "/etc/nixosnixos/machineshera/secret/syncthing/cert.pem"; cert = "/etc/nixos/nixos/machines/hera/secret/syncthing/cert.pem";
key = "/etc/nixosnixos/machineshera/secret/syncthing/key.pem"; key = "/etc/nixos/nixos/machines/hera/secret/syncthing/key.pem";
}; };
}; };
}; };
@ -117,7 +117,7 @@ in {
isNormalUser = true; isNormalUser = true;
uid = 1001; uid = 1001;
extraGroups = [ "wheel" "systemd-journal" ]; extraGroups = [ "wheel" "systemd-journal" ];
passwordFile = "/etc/nixosnixos/machineshera/secret/pw-choreutes"; passwordFile = "/etc/nixos/nixos/machines/hera/secret/pw-choreutes";
}; };
# This value determines the NixOS release with which your system is to be # This value determines the NixOS release with which your system is to be

2
nixos/machines/hera/network.nix
View file

@ -54,7 +54,7 @@ in {
wireguard.interfaces = { wireguard.interfaces = {
m0wire = { m0wire = {
ips = [ "${hosts.hera-wg}/112" ]; ips = [ "${hosts.hera-wg}/112" ];
privateKeyFile = "/etc/nixosnixos/machineshera/secret/wireguard-private"; privateKeyFile = "/etc/nixos/nixos/machines/hera/secret/wireguard-private";
listenPort = wireguard.port; listenPort = wireguard.port;
peers = [{ peers = [{
publicKey = wireguard.pub.apollo; publicKey = wireguard.pub.apollo;