From d866e61c09c906a72a64f6ec81b0e23b8061359a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Fri, 28 Jan 2022 12:28:32 +0100 Subject: [PATCH 1/4] external: add radio.kmein.r --- krebs/3modules/external/kmein.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/3modules/external/kmein.nix b/krebs/3modules/external/kmein.nix index 9ef079090..1e4a68057 100644 --- a/krebs/3modules/external/kmein.nix +++ b/krebs/3modules/external/kmein.nix @@ -123,6 +123,7 @@ in "zaatar.kmein.r" "grocy.kmein.r" "moodle.kmein.r" + "radio.kmein.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- From dc47eaa046091d72d9b74499e4ade078ff3763d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Fri, 28 Jan 2022 16:35:17 +0100 Subject: [PATCH 2/4] krebsdance: add flag to generate directed graph --- krebs/5pkgs/simple/krebsdance/default.nix | 167 +++++++++++++--------- 1 file changed, 103 insertions(+), 64 deletions(-) diff --git a/krebs/5pkgs/simple/krebsdance/default.nix b/krebs/5pkgs/simple/krebsdance/default.nix index bcb859a21..f200625c9 100644 --- a/krebs/5pkgs/simple/krebsdance/default.nix +++ b/krebs/5pkgs/simple/krebsdance/default.nix @@ -2,113 +2,152 @@ writers.writePython3Bin "krebsdance" {} '' import argparse import random + import itertools claws = [ dict( - up='(\\/)', - down='(/\\)', - left='(\\\\)', - right='(//)', + up="(\\/)", + down="(/\\)", + left="(\\\\)", + right="(//)", ), dict( - up='(V)', - down='(A)', - left='>)=', - right='=(<', + up="(V)", + down="(A)", + left=">)=", + right="=(<", ), dict( - up='(U)', - down='(n)', - left=')==', - right='==(', + up="(U)", + down="(n)", + left=")==", + right="==(", ), ] eyes = [ - '°', - '*', - '^', - 'ö', - 'o', - 'O', - 'X', - 'x', - 'U', - 'u', + "°", + "*", + "^", + "ö", + "o", + "O", + "X", + "x", + "U", + "u", ] bodies = [ dict( - left='(', - right=')', + left="(", + right=")", ), dict( - left='{', - right='}', + left="{", + right="}", ), dict( - left='[', - right=']', + left="[", + right="]", ), dict( - left='<', - right='>', + left="<", + right=">", ), dict( - left='|', - right='|', + left="|", + right="|", ), ] mouths = [ - ',,,,', - ',mm,', - '_mm_', - '-mm-', - ';;;;', - ';mm;', - ':mm:', - '::::', - ':ww:', - ':<>:', + ",,,,", + ",mm,", + "_mm_", + "-mm-", + ";;;;", + ";mm;", + ":mm:", + "::::", + ":ww:", + ":<>:", ] + def all_krebses(): + for mouth, body, eye, claw in itertools.product(mouths, bodies, eyes, claws): + yield f'{claw["up"]} {body["left"]}{eye}{mouth}{eye}{body["right"]} {claw["up"]}' + + + def krebs_graph() -> str: + return "\n".join( + ["digraph {"] + + [f'"{krebs}"->"{generate(seed=krebs)}"' for krebs in all_krebses()] + + ["}"] + ) + + + def generate(*, seed: str, dancing: bool = False) -> str: + if seed: + random.seed(seed) + clawstyle = random.choice(claws) + body = random.choice(bodies) + eye = random.choice(eyes) + mouth = random.choice(mouths) + if dancing: + return "\n".join( + [ + f'{clawstyle["down"]} {body["left"]}{eye}{mouth}{eye}{body["right"]}{clawstyle["up"]}', + f'{clawstyle["left"]}{body["left"]}{eye}{mouth}{eye}{body["right"]} {clawstyle["right"]}', + f'{clawstyle["right"]} {body["left"]}{eye}{mouth}{eye}{body["right"]} {clawstyle["left"]}', + f'{clawstyle["down"]}{body["left"]}{eye}{mouth}{eye}{body["right"]}{clawstyle["down"]}', + ] + ) + else: + return f'{clawstyle["up"]} {body["left"]}{eye}{mouth}{eye}{body["right"]} {clawstyle["up"]}' + + + def fixpoints(): + for krebs in all_krebses(): + if generate(seed=krebs) == krebs: + yield krebs + + def main(): parser = argparse.ArgumentParser() parser.add_argument( - 'seed', - nargs='?', - help='random seed to use for generating the krebs variant', + "seed", + nargs="?", + help="random seed to use for generating the krebs variant", ) parser.add_argument( - '--dance', '-d', - dest='dance', - help='if the krebs should dance', + "--dance", + "-d", + dest="dance", + help="if the krebs should dance", default=False, - action='store_true', + action="store_true", + ) + + parser.add_argument( + "--mode", + "-m", + dest="mode", + choices=["graphviz", "plain"], + default="plain", ) args = parser.parse_args() - if args.seed: - random.seed(args.seed) - - clawstyle = random.choice(claws) - body = random.choice(bodies) - eye = random.choice(eyes) - mouth = random.choice(mouths) - if args.dance: - print(f'{clawstyle["down"]} {body["left"]}{eye}{mouth}{eye}{body["right"]}{clawstyle["up"]}') # noqa - print(f' {clawstyle["left"]}{body["left"]}{eye}{mouth}{eye}{body["right"]} {clawstyle["right"]}') # noqa - print(f'{clawstyle["right"]} {body["left"]}{eye}{mouth}{eye}{body["right"]} {clawstyle["left"]}') # noqa - print(f' {clawstyle["down"]}{body["left"]}{eye}{mouth}{eye}{body["right"]}{clawstyle["down"]}') # noqa - else: - print(f'{clawstyle["up"]} {body["left"]}{eye}{mouth}{eye}{body["right"]} {clawstyle["up"]}') # noqa + if args.mode == "plain": + print(generate(seed=args.seed, dancing=args.dance)) + elif args.mode == "graphviz": + print(krebs_graph()) - if __name__ == '__main__': + if __name__ == "__main__": main() '' From 63bccf2200fc9bf04cbfbfbfb44dbd754224d35b Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jan 2022 23:12:22 +0100 Subject: [PATCH 3/4] l sync: add the_playlist sadly a duplicate definition of l/2/radio --- lass/1systems/mors/config.nix | 1 + lass/2configs/sync/the_playlist.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 lass/2configs/sync/the_playlist.nix diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 4d042de22..dd479f267 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -26,6 +26,7 @@ with import ; + # diff --git a/lass/2configs/sync/the_playlist.nix b/lass/2configs/sync/the_playlist.nix new file mode 100644 index 000000000..5bbf790a7 --- /dev/null +++ b/lass/2configs/sync/the_playlist.nix @@ -0,0 +1,9 @@ +{ + services.syncthing.folders.the_playlist = { + path = "/home/lass/tmp/the_playlist"; + devices = [ "mors" "phone" "prism" ]; + }; + lass.acl."/home/lass/tmp/the_playlist"."u:syncthing:X".parents = true; + lass.acl."/home/lass/tmp/the_playlist"."u:syncthing:rwX" = {}; + lass.acl."/home/lass/tmp/the_playlist"."u:lass:rwX" = {}; +} From d8b64c4f1367e21ffea0c68d987e22480f5e8899 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jan 2022 23:13:07 +0100 Subject: [PATCH 4/4] krebsdance: make flake8 happy --- krebs/5pkgs/simple/krebsdance/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/krebs/5pkgs/simple/krebsdance/default.nix b/krebs/5pkgs/simple/krebsdance/default.nix index f200625c9..cdfe23ef2 100644 --- a/krebs/5pkgs/simple/krebsdance/default.nix +++ b/krebs/5pkgs/simple/krebsdance/default.nix @@ -1,5 +1,5 @@ { writers }: -writers.writePython3Bin "krebsdance" {} '' +writers.writePython3Bin "krebsdance" { flakeIgnore = [ "E501" ]; } '' import argparse import random import itertools @@ -80,12 +80,16 @@ writers.writePython3Bin "krebsdance" {} '' yield f'{claw["up"]} {body["left"]}{eye}{mouth}{eye}{body["right"]} {claw["up"]}' + def escape_graph(text): + return text.replace("\\", "\\\\") + + def krebs_graph() -> str: - return "\n".join( - ["digraph {"] - + [f'"{krebs}"->"{generate(seed=krebs)}"' for krebs in all_krebses()] - + ["}"] - ) + return "\n".join(itertools.chain( + ["digraph {"], + [escape_graph(f'"{krebs}"->"{generate(seed=krebs)}"') for krebs in all_krebses()], + "}", + )) def generate(*, seed: str, dancing: bool = False) -> str: