From aede016cf2ef7b03be7e647131eec1b9f093702c Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 2 Nov 2020 12:09:02 +0100 Subject: reaktor2: move .nix to dir --- krebs/5pkgs/haskell/reaktor2.nix | 28 ---------------------------- krebs/5pkgs/haskell/reaktor2/default.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 krebs/5pkgs/haskell/reaktor2.nix create mode 100644 krebs/5pkgs/haskell/reaktor2/default.nix diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix deleted file mode 100644 index ae242efe..00000000 --- a/krebs/5pkgs/haskell/reaktor2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ mkDerivation, aeson, async, attoparsec, base, blessings -, bytestring, containers, data-default, fetchgit, filepath -, hashable, lens, lens-aeson, network, network-simple -, network-simple-tls, network-uri, pcre-light, process, random -, servant-server, stdenv, string-conversions, stringsearch, text -, time, transformers, unagi-chan, unix, unordered-containers -, vector, wai, warp -}: -mkDerivation { - pname = "reaktor2"; - version = "0.3.0"; - src = fetchgit { - url = "https://cgit.krebsco.de/reaktor2"; - sha256 = "02hqpq8wcfd6rvi8qk10zy3f3lrzzqnjwqal4cbvksjn3vahz36h"; - rev = "a6893c00f78a8acd0a4bfe7da87ab6889eabcf21"; - fetchSubmodules = true; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async attoparsec base blessings bytestring containers - data-default filepath hashable lens lens-aeson network - network-simple network-simple-tls network-uri pcre-light process - random servant-server string-conversions stringsearch text time - transformers unagi-chan unix unordered-containers vector wai warp - ]; - license = stdenv.lib.licenses.mit; -} diff --git a/krebs/5pkgs/haskell/reaktor2/default.nix b/krebs/5pkgs/haskell/reaktor2/default.nix new file mode 100644 index 00000000..ae242efe --- /dev/null +++ b/krebs/5pkgs/haskell/reaktor2/default.nix @@ -0,0 +1,28 @@ +{ mkDerivation, aeson, async, attoparsec, base, blessings +, bytestring, containers, data-default, fetchgit, filepath +, hashable, lens, lens-aeson, network, network-simple +, network-simple-tls, network-uri, pcre-light, process, random +, servant-server, stdenv, string-conversions, stringsearch, text +, time, transformers, unagi-chan, unix, unordered-containers +, vector, wai, warp +}: +mkDerivation { + pname = "reaktor2"; + version = "0.3.0"; + src = fetchgit { + url = "https://cgit.krebsco.de/reaktor2"; + sha256 = "02hqpq8wcfd6rvi8qk10zy3f3lrzzqnjwqal4cbvksjn3vahz36h"; + rev = "a6893c00f78a8acd0a4bfe7da87ab6889eabcf21"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base blessings bytestring containers + data-default filepath hashable lens lens-aeson network + network-simple network-simple-tls network-uri pcre-light process + random servant-server string-conversions stringsearch text time + transformers unagi-chan unix unordered-containers vector wai warp + ]; + license = stdenv.lib.licenses.mit; +} -- cgit v1.2.3 From 7d29d2258b12106bac80514ef6a25dd4dcea0670 Mon Sep 17 00:00:00 2001 From: rtjure Date: Mon, 2 Nov 2020 14:59:07 +0200 Subject: external: add nxbg.r --- krebs/3modules/external/default.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index f9a7e7f3..4f22e92b 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -432,6 +432,32 @@ in { }; }; }; + nxbg = { + owner = config.krebs.users.rtjure; + nets = { + retiolum = { + ip4.addr = "10.243.122.123"; + aliases = [ + "nxbg.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEArnkpu+oD59Shu9xcppkcelMT/uHsKvMKdudr67WZG/4F0xhd/5ex + an8v3OWClztIsnB+5uwl0dgamfKDAfIdg5ll2ZHcXo7dAdAN7q8DkegJD9k/Pmmi + YGsEwyENhAcX0/L1xHD5rGqH+6qQ/HrXPKPquoWCIlDDX41dyZQxJCTzkKlRGWhl + uwEMHkR4sfGgsD/OFmTVHMqygWbQIBIrUKXcHahsVj5k0LZW+ejVAQwNlzuKZi2B + n4maa6R0s4kRk2N8TPW11BcCl+rZlaX7RSn8vi+lA0Aq+A5SL1kXaKkKQT/9j2+n + G/uCDpQ6ruXaNycDkemqZg/MHDanbm5SUtjqZarfT6tRr3bwvpndxeGCeOZHkehw + iDiRsXszdwVDziRBlHs4WvFHTZUBLBsetOeo/LaB3Lt069nF5Cs6SZDi3z17ZMow + 5IU66KLQBDnSHqJWvAkBZsWrlZHMr3Csefaqli+qGpPr2gVgiwh3BrH8Ie1DBWJM + ysY0XK98s3jhLfWtc8Fg99H7QYenrh9IwfiIr5kRTmYxLBoGHO7GBRovuziJYzj+ + G1D160xnRSqVdbIg9Az9OMBHfv9/HwYwwLpQ/154SRTY6f4H3iFMt+0lJwSS6nIl + yN7HY7PKXieun8OsS3GhV/+r8UVcRmVk+who3x8Hw8MQJHp8lUNGjLUCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; ada = { owner = config.krebs.users.filly; nets = { -- cgit v1.2.3 From 091c4ee5428df38883f12317f842669a0ddc1ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 29 Oct 2020 20:38:35 +0100 Subject: external: change kmein email, scardanelli -> zaatar --- krebs/3modules/external/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 4f22e92b..0a3d69e6 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -260,8 +260,8 @@ in { retiolum = { ip4.addr = "10.243.2.2"; aliases = [ - "scardanelli.r" - "scardanelli.kmein.r" + "zaatar.r" + "zaatar.kmein.r" ]; tinc.pubkey = '' -----BEGIN PUBLIC KEY----- @@ -522,7 +522,7 @@ in { mail = "jacek.galowicz@gmail.com"; }; kmein = { - mail = "kieran.meinhardt@gmail.com"; + mail = "kmein@posteo.de"; pubkey = ssh-for "kmein"; }; mic92 = { -- cgit v1.2.3 From b4f455b6eadd86e5da06cf789787e3b043ed8661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 3 Nov 2020 18:45:40 +0100 Subject: external: add makanek.r (kmein) --- krebs/3modules/external/default.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 0a3d69e6..49cf7c9d 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -197,6 +197,33 @@ in { }; }; }; + makanek = { + owner = config.krebs.users.kmein; + nets = { + retiolum = { + ip4.addr = "10.243.2.84"; + aliases = [ + "makanek.r" + "makanek.kmein.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAwvtxCG7Vua6+WoStGrkL+H/g4BABidL2eikDBtbxWN+oGv2Bjrwb + VzXB8lMTCsu6M2wb3YTXXzAkc5oI4gE1sSOiCKyhYnQRrndc91KewquxTPfKL19u + JiRqax/E49IvWKARPRPXUhPfU/NNw1oIxhbcFkjwJmqDvh9SWhl5VZVynCE28ov5 + hjjhqNXZHOR8CQqPJeY8v38OAAwTWvJ6rhEQwp5dLBqmRAbvPXj7OOzCxKluDY2X + Dl4k6QAjI6NddJXsXHRYRNGiB0CP1UBC91NDtW2+HIjf1Q1Lip5agO4/SkkSUt39 + de7uYKrNcfyDUBb9Suconw0HvW+Dv4Ce5um+aa1RUrWIQdqBCOECbsXYKp66vAnK + Hidf2uznFseWxiyxz1ow8AvvSseABej5GuHI/56lywnFlnHEZLREUF/4PT+BZ0vE + uPRkzqeSNybsYYFieK8aany/RmJaoIsduGutgAiKBvkCCHru895n02xuLhZVkM2G + zfVjA2le+Gxr21/sVPrHfxResLUh4RA8fkS7erWMRF4a3IOpIS4yrM+p4pZTlTxO + Ya8buh4RgyE/0hp4QNpa4K7fvntriK+k6zHs7BcZcG2aMWP3O9/4DgjzBR3eslQV + oou23ajP11wyfrmZK0/PQGTpsU472Jj+06KtMAaH0zo4vAR8s2kV1ukCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; qubasa = { owner = config.krebs.users.qubasa; nets = { -- cgit v1.2.3 From 01433539afb727459a1f7838e51f548d52ee680c Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 3 Nov 2020 18:54:23 +0100 Subject: l prism.r: kmein RIP --- lass/1systems/prism/config.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index b335353b..944a68be 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -90,13 +90,6 @@ with import ; ]; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQFaYOWRUvHP6I37q9Dd4PJOq8FNQqAeJZ8pLx0G62uC450kbPGcG80rHHvXmk7HqQP6biJmMg48bOsvXAScPot2Qhp1Qc35CuUqVhLiTvUAsi8l/iJjhjZ23yRGDCAmW5+JIOzIvECkcbMnG7YoYAQ9trNGHe9qwGzQGhpt3QVClE23WtE3PVKRLQx1VbiabSnAm6tXVd2zpUoSdpWt8Gpi2taM4XXJ5+l744MNxFHvDapN5xqpYzwrA34Ii13jNLWcGbtgxESpR+VjnamdWByrkBsW4X5/xn2K1I1FrujaM/DBHV1QMaDKst9V8+uL5X7aYNt0OUBu2eyZdg6aujY2BYovB9uRyR1JIuSbA/a54MM96yN9WirMUufJF/YZrV0L631t9EW8ORyWUo1GRzMuBHVHQlfApj7NCU/jEddUuTqKgwyRgTmMFMUI4M0tRULAB/7pBE1Vbcx9tg6RsKIk8VkskfbBJW9Y6Sx6YoFlxPdgMNIrBefqEjIV62piP7YLMlvfIDCJ7TNd9dLN86XGggZ/nD5zt6SL1o61vVnw9If8pHosppxADPJsJvcdN6fOe16/tFAeE0JRo0jTcyFVTBGfhpey+rFfuW8wtUyuO5WPUxkOn7xMHGMWHJAtWX2vwVIDtLxvqn48B4SmEOpPD6ii+vcpwqAex3ycqBUQ==" ]; }; - users.users.kmein = { - uid = genid_uint31 "kmein"; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - config.krebs.users.kmein.pubkey - ]; - }; } { #hotdog -- cgit v1.2.3