Merge remote-tracking branch 'prism/master'

This commit is contained in:
tv 2022-01-03 14:32:14 +01:00
commit e8611251e6
25 changed files with 80 additions and 19 deletions

View File

@ -300,6 +300,11 @@ in {
}; };
yasmin = { yasmin = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets.internet = {
ip4.addr = "131.159.102.7";
ip6.addr = "2a09:80c0:102::7";
aliases = [ "yasmin.i" ];
};
nets.retiolum = { nets.retiolum = {
ip4.addr = "10.243.29.197"; ip4.addr = "10.243.29.197";
aliases = [ aliases = [
@ -674,7 +679,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
ip4.addr = "10.243.29.169";
aliases = [ "bernie.r" ]; aliases = [ "bernie.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

View File

@ -22,6 +22,12 @@ with import <stockholm/lib>;
(krebs.genipv6 "retiolum" "makefu" { inherit hostName; }).address; (krebs.genipv6 "retiolum" "makefu" { inherit hostName; }).address;
}; };
}) })
# Retiolum ed25519 keys
(let
pubkey-path = ./retiolum + "/${hostName}_ed25519.pub";
in optionalAttrs (pathExists pubkey-path) {
nets.retiolum.tinc.pubkey_ed25519 = readFile pubkey-path;
})
# Wiregrill defaults # Wiregrill defaults
(let (let
pubkey-path = ./wiregrill + "/${hostName}.pub"; pubkey-path = ./wiregrill + "/${hostName}.pub";

View File

@ -0,0 +1 @@
zlfSyJdG7vJmvkk1Ul3ZXUix2YduFYUMhM89nRdy8aE

View File

@ -1,4 +1,3 @@
Ed25519PublicKey = Zkh6vtSNBvKYUjCPsMyAFJmxzueglCDoawVPCezKy4F
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAloXLBfZQEVW9mJ7uwOoa+DfV4ek/SG+JQuexJMugei/iNy0NjY66 MIIBCgKCAQEAloXLBfZQEVW9mJ7uwOoa+DfV4ek/SG+JQuexJMugei/iNy0NjY66
OVIkzFmED32c3D7S1+Q+5Mc3eR02k1o7XERpZeZhCtJOBlS4xMzCKH62E4USvH5L OVIkzFmED32c3D7S1+Q+5Mc3eR02k1o7XERpZeZhCtJOBlS4xMzCKH62E4USvH5L

View File

@ -0,0 +1 @@
Zkh6vtSNBvKYUjCPsMyAFJmxzueglCDoawVPCezKy4F

View File

@ -0,0 +1 @@
2YSzoLSQN3k4HC8uozPb/nMmbrTa9eKOD2Ka9Iq8iXM

View File

@ -0,0 +1 @@
aQDHnUzOhf8zhMOB/ufTaP4rQLrizfN135PVgfTLkaC

View File

@ -0,0 +1 @@
3QIlv3vsykhMlsrsHUbU/vneVbYiE6G1U7HPzK2AbRI

View File

@ -0,0 +1 @@
1o7+d8jjitc1vJB1sYFY8qvbcePssD6c+sgfxqq+BXD

View File

@ -0,0 +1 @@
6M/fxVpfUCpbWvOXR9eHjt3o7sgjAEoIT/hXcDN970E

View File

@ -0,0 +1 @@
nL4hL0aJvufqdSvTafAnc/g0wjznIwuHlEq/h/OxEsF

View File

@ -0,0 +1 @@
SVuxrF4CQGRl3evQurw0wh44g72/0qwRACF+/n2i2rE

View File

@ -0,0 +1 @@
OxXCkjs3OzIsMXcSVcr7dJD55iRFRjUc0eERPdU1OjO

View File

@ -0,0 +1 @@
LegGLszL9hZXoanCQnv0VxuoLviT2K/yvQGYuCsloUH

View File

@ -0,0 +1 @@
WLUvBME38jEpXIEFniyVIjyvMw7JTNJBQb/NIXcxmzL

View File

@ -0,0 +1 @@
gzMYJY6/6sgG4ZgYWzeDs6svTvsDIeJEAGxPbrJUFVN

View File

@ -0,0 +1,8 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA+0TIo0dS9LtSdrmH0ClPHLO7dHtV9Dj7gaBAsbyuwxAI5cQgYKwr
4G6t7IcJW+Gu2bh+LKtPP91+zYXq4Qr1nAaKw4ajsify6kpxsCBzknmwi6ibIJMI
AK114dr/XSk/Pc6hOSA8kqDP4c0MZXwitRBiNjrWbTrQh6GJ3CXhmpZ2lJkoAyNP
hjdPerbTUrhQlNW8FanyQQzOgN5I7/PXsZShmb3iNKz1Ban5yWKFCVpn8fjWQs5o
Un2AKowH4Y+/g8faGemL8uy/k5xrHSrn05L92TPDUpAXrcZXzo6ao1OBiwJJVl7s
AVduOY18FU82GUw7edR0e/b2UC6hUONflwIDAQAB
-----END RSA PUBLIC KEY-----

View File

@ -0,0 +1 @@
fRPhdsYqwPuYgL2p/CmAUCVykU9GbiRfHQ8SULPQNGE

View File

@ -0,0 +1 @@
b3uia4Sns0ljQrccLE0QxzeAB4APTiJEB98neQQosdF

View File

@ -0,0 +1 @@
81FOjlXXS22WWZzLnL4sDCuXmvMoYkbhy0wlBlr60zM

View File

@ -222,12 +222,6 @@ with import <stockholm/lib>;
nameValuePair netname {} nameValuePair netname {}
) config.krebs.tinc; ) config.krebs.tinc;
environment.etc = mapAttrs' (netname: cfg:
nameValuePair "tinc/${netname}" {
source = cfg.confDir;
}
) config.krebs.tinc;
krebs.systemd.services = mapAttrs (netname: cfg: { krebs.systemd.services = mapAttrs (netname: cfg: {
}) config.krebs.tinc; }) config.krebs.tinc;
@ -239,8 +233,6 @@ with import <stockholm/lib>;
cfg.iproutePackage cfg.iproutePackage
cfg.tincPackage cfg.tincPackage
]; ];
reloadIfChanged = true;
restartTriggers = [ cfg.confDir ];
serviceConfig = { serviceConfig = {
Restart = "always"; Restart = "always";
LoadCredential = filter (x: x != "") [ LoadCredential = filter (x: x != "") [
@ -249,6 +241,13 @@ with import <stockholm/lib>;
) )
"rsa_key:${cfg.privkey}" "rsa_key:${cfg.privkey}"
]; ];
ExecStartPre = pkgs.writers.writeDash "init-tinc-${netname}" ''
${pkgs.coreutils}/bin/mkdir -p /etc/tinc
${pkgs.rsync}/bin/rsync -vaL --delete \
--chown ${cfg.user.name} \
--chmod u=rwX,g=rX \
${cfg.confDir}/ /etc/tinc/${netname}/
'';
ExecStart = toString [ ExecStart = toString [
"${cfg.tincPackage}/sbin/tincd" "${cfg.tincPackage}/sbin/tincd"
"-D" "-D"

View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "ac169ec6371f0d835542db654a65e0f2feb07838", "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
"date": "2021-12-26T18:43:05+01:00", "date": "2021-12-31T15:09:52+01:00",
"path": "/nix/store/l1qmvpx4pj24ijsm44n64vw2fnl9dpc7-nixpkgs", "path": "/nix/store/wy2iidg15nwgmn8xir8fbr1lfz1hqphb-nixpkgs",
"sha256": "0bwjyz15sr5f7z0niwls9127hikp2b6fggisysk0cnk3l6fa8abh", "sha256": "18akd1chfvniq1q774rigfxgmxwi0wyjljpa1j9ls59szpzr316d",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

View File

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/NixOS/nixpkgs", "url": "https://github.com/NixOS/nixpkgs",
"rev": "573095944e7c1d58d30fc679c81af63668b54056", "rev": "d1e59cfc49961e121583abe32e2f3db1550fbcff",
"date": "2021-12-10T10:33:46-08:00", "date": "2022-01-01T22:20:39+08:00",
"path": "/nix/store/c0bvhzf1xsjrmzrda8jasa1da76x0zyk-nixpkgs", "path": "/nix/store/azrxsxpszjwgg75jk1pkzlzjcj0qnw8d-nixpkgs",
"sha256": "07s5cwhskqvy82b4rld9b14ljc0013pig23i3jx3l3f957rk95pg", "sha256": "03ldf1dlxqf3g8qh9x5vp6vd9zvvr481fyjds111imll69y60wpm",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

View File

@ -12,7 +12,6 @@
evince evince
# replacement for mirage: # replacement for mirage:
sxiv sxiv
tightvnc
gnome3.dconf gnome3.dconf
xdotool xdotool
xorg.xbacklight xorg.xbacklight

View File

@ -0,0 +1,30 @@
{ lib, stdenv, fetchFromGitHub, curl
}:
stdenv.mkDerivation rec {
name = "pkgrename";
version = "1.03";
src = fetchFromGitHub {
owner = "hippie68";
repo = "pkgrename";
rev = "c3e5c47ed9367273bd09577af46d3d9bf87b2a50";
sha256 = "0cphxdpj04h1i0qf5mji3xqdsbyilvd5b4gwp4vx914r6k5f0xf3";
};
buildInputs = [ curl.dev ];
buildPhase = ''
cd pkgrename.c
gcc pkgrename.c src/*.c -o pkgrename -lcurl -s -O1 $(curl-config --cflags --libs)
'';
installPhase = ''
install -D pkgrename $out/bin/pkgrename
'';
meta = {
description = "Tool to rename ps4 .pkg files";
homepage = "https://github.com/hippie68/pkgrename";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ makefu ];
};
}