Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2022-11-23 18:41:11 +01:00
commit c345613cf0
110 changed files with 48 additions and 33 deletions

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }:
let
hostDefaults = hostName: host: flip recursiveUpdate host ({

15
kartei/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ config, lib, ... }: {
config = lib.mkMerge (map (path: { krebs = import path { inherit config; }; }) [
./dbalan
./jeschli
./kmein
./krebs
./lass
./makefu
./mic92
./others
./palo
./rtunreal
./tv
]);
}

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
hostDefaults = hostName: host: flip recursiveUpdate host ({

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }:
let
maybeEmpty = attrset: key: if (attrset?key) then attrset.${key} else [];

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
hostDefaults = hostName: host: flip recursiveUpdate host ({

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
r6 = ip: (krebs.genipv6 "retiolum" "lass" ip).address;

View file

@ -2,7 +2,7 @@
# tinc generate-keys
# ssh-keygen -f ssh.id_ed25519 -t ed25519 -C host
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
hostDefaults = hostName: host: foldl' recursiveUpdate {} [

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
hostDefaults = hostName: host: flip recursiveUpdate host ({
ci = false;
@ -955,4 +955,10 @@ in {
};
};
};
users = {
mic92 = {
mail = "joerg@thalheim.io";
pubkey = builtins.readFile ./ssh/mic92.pub;
};
};
}

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
hostDefaults = hostName: host: flip recursiveUpdate host ({
@ -816,10 +816,6 @@ in {
jonge = {
mail = "jacek.galowicz@gmail.com";
};
mic92 = {
mail = "joerg@thalheim.io";
pubkey = ssh-for "mic92";
};
pinpox = {
mail = "main@pablo.tools";
};
@ -862,6 +858,7 @@ in {
pubkey = ssh-for "xq";
};
xkey = {
mail = "xkey@krebsco.de";
pubkey = ssh-for "xkey";
};
miaoski = {

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }: let
hostDefaults = hostName: host: flip recursiveUpdate host ({
@ -12,8 +12,6 @@ with import <stockholm/lib>;
nets.wiregrill.ip6.addr =
(krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
});
ssh-for = name: builtins.readFile (./ssh + "/${name}.pub");
tinc-for = name: builtins.readFile (./tinc + "/${name}.pub");
in {
hosts = mapAttrs hostDefaults {
@ -24,7 +22,7 @@ in {
ip4.addr = "10.243.23.1";
tinc.port = 720;
aliases = [ "pepe.r" ];
tinc.pubkey = tinc-for "palo";
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};
@ -35,7 +33,7 @@ in {
ip4.addr = "10.243.23.2";
tinc.port = 720;
aliases = [ "schasch.r" ];
tinc.pubkey = tinc-for "palo";
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
syncthing.id = "FLY7DHI-TJLEQBJ-JZNC4YV-NBX53Z2-ZBRWADL-BKSFXYZ-L4FMDVH-MOSEVAQ";
@ -49,7 +47,7 @@ in {
aliases = [
"sterni.r"
];
tinc.pubkey = tinc-for "palo";
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};
@ -60,7 +58,7 @@ in {
ip4.addr = "10.243.23.5";
tinc.port = 720;
aliases = [ "workhorse.r" ];
tinc.pubkey = tinc-for "palo";
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};
@ -71,7 +69,7 @@ in {
ip4.addr = "10.243.23.4";
tinc.port = 720;
aliases = [ "workout.r" ];
tinc.pubkey = tinc-for "palo";
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};

View file

@ -1,4 +1,4 @@
with import <stockholm/lib>;
with import ../../lib;
{ config, ... }:
let
hostDefaults = hostName: host: flip recursiveUpdate host ({

View file

@ -1,4 +1,4 @@
with import ../../../lib;
with import ../../lib;
{ config, ... }: let
evalHost = hostName: hostConfig: evalSubmodule types.host [

Some files were not shown because too many files have changed in this diff Show more