From 0c9b25bc43373c67ee128238072f2640793aaafe Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 18 Jul 2024 12:29:31 +0200 Subject: [PATCH] WIP: pr-tracker --- config/services/maddy.nix | 6 ++++++ config/services/octoprint.nix | 2 +- hosts/maddy/default.nix | 3 --- hosts/maddy/net.nix | 8 +++----- hosts/maddy/secrets/generated/pr-tracker.age | Bin 0 -> 749 bytes 5 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 hosts/maddy/secrets/generated/pr-tracker.age diff --git a/config/services/maddy.nix b/config/services/maddy.nix index fe93bd1..4bb4184 100644 --- a/config/services/maddy.nix +++ b/config/services/maddy.nix @@ -17,6 +17,11 @@ in { mode = "0770"; }; }; + age.secrets.pr-tracker = { + generator.script = "alnum"; + inherit (config.services.maddy) group; + mode = "640"; + }; age.secrets.resticpasswd = { generator.script = "alnum"; @@ -90,6 +95,7 @@ in { }; ensureCredentials = { "patrick@${domain}".passwordFile = config.age.secrets.patrickPasswd.path; + "pr-tracker@${domain}".passwordFile = config.age.secrets.pr-tracker.path; }; ensureAccounts = [ "patrick@${domain}" diff --git a/config/services/octoprint.nix b/config/services/octoprint.nix index ee10cc5..6c6ec69 100644 --- a/config/services/octoprint.nix +++ b/config/services/octoprint.nix @@ -6,7 +6,7 @@ services.octoprint = { port = 3000; enable = true; - plugins = ps: with ps; [ender3v2tempfix costestimation themeify dashboard displaylayerprogress]; + plugins = ps: with ps; [ender3v2tempfix]; extraConfig = { accessControl = { addRemoteUser = true; diff --git a/hosts/maddy/default.nix b/hosts/maddy/default.nix index 6926589..17ee751 100644 --- a/hosts/maddy/default.nix +++ b/hosts/maddy/default.nix @@ -8,9 +8,6 @@ ./net.nix ./fs.nix ]; - services.xserver = { - layout = "de"; - }; boot.mode = "bios"; boot.initrd.availableKernelModules = ["virtio_pci" "virtio_net" "virtio_scsi" "virtio_blk"]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/hosts/maddy/net.nix b/hosts/maddy/net.nix index 7ec89ef..a733a9c 100644 --- a/hosts/maddy/net.nix +++ b/hosts/maddy/net.nix @@ -21,12 +21,10 @@ ]; gateway = ["fe80::1"]; routes = [ - {routeConfig = {Destination = "172.31.1.1";};} + {Destination = "172.31.1.1";} { - routeConfig = { - Gateway = "172.31.1.1"; - GatewayOnLink = true; - }; + Gateway = "172.31.1.1"; + GatewayOnLink = true; } ]; matchConfig.MACAddress = icfg.mac; diff --git a/hosts/maddy/secrets/generated/pr-tracker.age b/hosts/maddy/secrets/generated/pr-tracker.age new file mode 100644 index 0000000000000000000000000000000000000000..7bc0096f13363b00e547da5a4241c495e5072268 GIT binary patch literal 749 zcmY+=yNlCs0Kjn<2YU{Jf}A=;9BVI+OWFqHAeTq;OVT!N^Y(G3&AVySOOv!I=peWW z2ZED>94F%9rov4QE;af__eMij!BUnM9UWfI(z zW>^NwrDSHVA6WRP0rWwo3g_D$#zK{V_Oy&HayNz}*pq;nil>hgA;}yNV8L$6`+=NqM(xHFax==xL~EN$K@TIBOqI zv>NuXrBq9*){MzwlR$aUsQBQ!-a{PU24cghdn+IqN}GAq362 zP-nS*Mq_$)&I-}c^Jg8p71MS%hw;8Tj1er*qh`hGiF(jcv<4rC6L~hIba|fJObB!6 zC}tO+(95(QMq!6Kwt|hCpSt$kg~XfV?b=mn=l-30j(=N%t~DxfPGM181&qy5Re&~( zrj>IzsS-|!av+Yp?%y}H8sur7T8c4URm7oDwls&NLu(lqyy*Ip=Qr79w}J3P8gH@{ z^v0*N>-?LqFAv^*c>Mk}R2)A2dFs)V^;fO)zi&O4wfe{X-e%Us)g*7Dch jp80Za|HY3R-yR?j53gK0`la1XjxJtUU*oRt9en=-f`j%V literal 0 HcmV?d00001