odin: Add iperf3

firefox: re-enable context menu events
flake.lock: Update
2024-06-11 15:26:14 +02:00 · 2024-06-11 15:26:00 +02:00 · 2024-06-11 15:10:48 +02:00 · 2024-06-10 12:10:13 +02:00 · 2024-06-10 11:37:27 +02:00 · 2024-06-10 11:32:11 +02:00
13 changed files with 125 additions and 86 deletions
--- a/flake.lock
+++ b/flake.lock
@ -9,11 +9,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1717563631,
-        "narHash": "sha256-W22hMKD1Qa1ARgLS3zB4EIfOTmPvrAEfd+qZ71QgJyg=",
+        "lastModified": 1717576207,
+        "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=",
        "owner": "Kirottu",
        "repo": "anyrun",
-        "rev": "8c1f7907a4ee51226b1fd20674086fe292e4136e",
+        "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4",
        "type": "github"
      },
      "original": {
@ -55,11 +55,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717533891,
-        "narHash": "sha256-XzvSLzyVmaHjgjLastmsh7HD7QrQD8xOvV8yCTYyivw=",
+        "lastModified": 1718047990,
+        "narHash": "sha256-eHTd7rasshvqnNNjfmB1A0rBchZfiF3M8vSorPuy/u0=",
        "owner": "atuinsh",
        "repo": "atuin",
-        "rev": "9943c53a7012e1a571ed6a66c127884fa3249767",
+        "rev": "55a2fe50f70a5dc7d4a9ee5e1d6ffc213c74291b",
        "type": "github"
      },
      "original": {
@ -81,11 +81,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713279563,
-        "narHash": "sha256-bTVj6mAr+NAqwzVhHBBhOszRpWiNYglp93aNIzukiYE=",
+        "lastModified": 1717860777,
+        "narHash": "sha256-j3hBTCwO0T+fkSLm2jN1MhXuOYLtsLK5nGMz+z44L+g=",
        "owner": "eboskma",
        "repo": "caddy-with-plugins",
-        "rev": "bb26c2e7fa43be39d4d184c0d443d649cda91897",
+        "rev": "c6ff99288a79ed98482759e4feea0b90ade9219b",
        "type": "github"
      },
      "original": {
@ -196,11 +196,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717490821,
-        "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=",
+        "lastModified": 1718008439,
+        "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1",
+        "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82",
        "type": "github"
      },
      "original": {
@ -220,11 +220,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1717552306,
-        "narHash": "sha256-SI42G6mLxgn6vvSNxSuydQl0M41UZFh+Bx+ePjXbuyI=",
+        "lastModified": 1718096975,
+        "narHash": "sha256-Ud33Yz5o2OJ9mjH5rhbrdR+polxq9QyOLLNbtQ63s4E=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "d619b5b5ba751d6e3c16da1ca8178a31ef130047",
+        "rev": "d2404a42ad3ae9c5ee5c481b7c7a4c91627d161f",
        "type": "github"
      },
      "original": {
@ -564,11 +564,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717525419,
-        "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
+        "lastModified": 1717931644,
+        "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
+        "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
        "type": "github"
      },
      "original": {
@ -656,11 +656,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717274471,
-        "narHash": "sha256-mQEWQOak0r8YEXK5IzvSfScmndpdODBKNvN0T8QydEg=",
+        "lastModified": 1717767239,
+        "narHash": "sha256-F/ZA/yhBg1XJYudA6b4ORt5CnEwOu4gR/UbMVq1UYMY=",
        "owner": "nix-community",
        "repo": "nix-ld-rs",
-        "rev": "62d5a9eb8ba0feb1d62292ca29de98785bcef04a",
+        "rev": "3397956280fe8f555ffe11fe3a8115341a0ef460",
        "type": "github"
      },
      "original": {
@ -671,11 +671,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1717515267,
-        "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=",
+        "lastModified": 1717995329,
+        "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa",
+        "rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
        "type": "github"
      },
      "original": {
@ -730,11 +730,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1717159533,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+        "lastModified": 1717880976,
+        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
        "type": "github"
      },
      "original": {
@ -762,11 +762,11 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1717265169,
-        "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
+        "lastModified": 1717880976,
+        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
+        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
        "type": "github"
      },
      "original": {
@ -778,11 +778,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1717196966,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "lastModified": 1717974879,
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
        "type": "github"
      },
      "original": {
@ -830,11 +830,11 @@
        "nixpkgs-stable": "nixpkgs-stable_3"
      },
      "locked": {
-        "lastModified": 1716213921,
-        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
+        "lastModified": 1717664902,
+        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
+        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
        "type": "github"
      },
      "original": {
@ -906,11 +906,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717553884,
-        "narHash": "sha256-+t3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU+pSE=",
+        "lastModified": 1718072316,
+        "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "8795c817dfab19243a33387a16c98d2df4075bb3",
+        "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59",
        "type": "github"
      },
      "original": {
@ -927,11 +927,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1717455931,
-        "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=",
+        "lastModified": 1718058322,
+        "narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0",
+        "rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f",
        "type": "github"
      },
      "original": {
@ -1024,11 +1024,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717278143,
-        "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=",
+        "lastModified": 1717850719,
+        "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706",
+        "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
        "type": "github"
      },
      "original": {
--- a/home-manager/modules/firefox/default.nix
+++ b/home-manager/modules/firefox/default.nix
@ -20,7 +20,6 @@ let
    "browser.tabs.crashReporting.sendReport" = false;
    "browser.translations.enable" = false;
    "browser.urlbar.trimURLs" = false;
-    "dom.event.contextmenu.enabled" = false;
    "devtools.theme" = "dark";
    "experiments.activeExperiment" = false;
    "experiments.enabled" = false;
--- a/home-manager/modules/nushell/default.nix
+++ b/home-manager/modules/nushell/default.nix
@ -17,7 +17,6 @@ in
    programs = {
      nushell = {
        enable = true;
-        package = pkgs.nushellFull;
        configFile.source = ./config.nu;
        envFile.source = ./env.nu;

@ -35,6 +34,7 @@ in

          register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query
          register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats
+          register ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars

          use kink.nu

--- a/home-manager/modules/vscode/default.nix
+++ b/home-manager/modules/vscode/default.nix
@ -35,7 +35,6 @@ in
        # EugenWiens.bitbake
        elixir-lsp.vscode-elixir-ls # this is the one by Jake Becker, not the deprecated one
        # kumar-harsh.graphql-for-vscode
-        matklad.rust-analyzer
        # monokai.theme-monokai-pro-vscode
        ms-azuretools.vscode-docker
        ms-python.python
@ -52,6 +51,7 @@ in
        # pgourlain.erlang
        # phoenixframework.phoenix
        rubymaniac.vscode-paste-and-indent
+        rust-lang.rust-analyzer
        # surajbarkale.ninja
        timonwong.shellcheck
        tuttieee.emacs-mcx
--- a/machines/default.nix
+++ b/machines/default.nix
@ -141,7 +141,6 @@ inputs: {
      # host = "10.0.0.207";
      host = "unifi.barn-beaver.ts.net";
      targetUser = "erwin";
-      tags = [ "container" ];
    };
  };
  valkyrie = {
--- a/machines/gitea/configuration.nix
+++ b/machines/gitea/configuration.nix
@ -1,5 +1,5 @@
-{ self, ... }:
-{ modulesPath, ... }:
+{ self, caddy-with-plugins, ... }:
+{ pkgs, modulesPath, ... }:
 {
  imports = [
    (modulesPath + "/virtualisation/lxc-container.nix")
@ -8,7 +8,6 @@
    ../../users/erwin
    ./backup.nix
    ./forgejo
-    ./caddy.nix
  ];

  eboskma = {
@ -16,6 +15,16 @@
      enable = true;
      server = true;
    };
+    caddy-proxy = {
+      enable = true;
+      package = caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare;
+      proxyHosts = [
+        {
+          externalHostname = "git.datarift.nl";
+          proxyAddress = "localhost:3000";
+        }
+      ];
+    };
    nix-common = {
      enable = true;
      remote-builders = true;
--- a/machines/odin/configuration.nix
+++ b/machines/odin/configuration.nix
@ -112,6 +112,11 @@
        enabledCollectors = [ "systemd" ];
      };
    };
+
+    iperf3 = {
+      enable = true;
+      openFirewall = true;
+    };
  };

  system.stateVersion = "24.05";
--- a/machines/saga/configuration.nix
+++ b/machines/saga/configuration.nix
@ -1,5 +1,6 @@
-{ self, ... }:
+{ self, caddy-with-plugins, ... }:
 {
+  pkgs,
  modulesPath,
  lib,
  config,
@ -22,6 +23,16 @@
      enable = true;
      server = true;
    };
+    caddy-proxy = {
+      enable = true;
+      package = caddy-with-plugins.packages.${pkgs.system}.caddy-with-cloudflare;
+      proxyHosts = [
+        {
+          externalHostname = "saga.datarift.nl";
+          proxyAddress = "localhost:3000";
+        }
+      ];
+    };
    nix-common = {
      enable = true;
      remote-builders = true;
@ -48,7 +59,8 @@
    firewall.trustedInterfaces = [ "tailscale0" ];
  };

-  systemd.network = {
+  systemd = {
+    network = {
      enable = true;

      wait-online.anyInterface = true;
@ -69,6 +81,9 @@
      };
    };

+    services.logrotate-checkconf.enable = false;
+  };
+
  security = {
    sudo-rs = {
      enable = true;
@ -80,6 +95,7 @@

  sops.defaultSopsFile = ./secrets.yaml;
  sops.secrets = {
+    caddy-env = { };
    metrics_ca = {
      owner = config.systemd.services.prometheus.serviceConfig.User;
    };
--- a/machines/saga/secrets.yaml
+++ b/machines/saga/secrets.yaml
@ -2,6 +2,7 @@ metrics_cert: ENC[AES256_GCM,data:hxI6B6h1eOaHlYpUeHcsXMAEPZwuKpAgZ9gYkkqK73guUy
 metrics_key: ENC[AES256_GCM,data:fGpIg3k/PBcq4dVdLL5oNEdbrPTFarDAi9QLw7ViEfzG4jdxOec8rdFNtECX3IdtGIFZ7VtLd7hTISYrklafBqYMyBw0y3dxmbQaG7CQoIPoxnoJlbwAxofjfgFyVa69V6/o1mvCBfw3Tv8akRQel+3lTTB7RgqBsd+JNjiIsrC5r4JAr6KJCkKKLbNJZ79W1PGdKb2VEeVwGmdfWcvKz4TN6Za4cwhc51IAnZBH+2QnNNCYM6JnT0LVIzERS6ljF8MOb2Xmaqb9w6QxxTLX4nheEceWpOMLc71nIGtMSsU+SiRiZtHEdcUsDGBUdriqQ2mP5Q10Yz0K0u1wqXiLiz/wfeFGIvRPNOpP/b/cSFQSp494ZnMdO2bsnXOKQNFVBkkIO2jvB2SOlIJwC329n9vG,iv:jktiYgPJluYrQOpOOTwwpQ9SDJVvsO4lEwDe+l2cn3Q=,tag:rduGq7/XVShG9SqQeWl19g==,type:str]
 metrics_ca: ENC[AES256_GCM,data:nMocCNsco+iYrrZbJxuoWhQ5ytDyy+JjaRTbalTof4CPK3CtWpu2KhHhVJNN+XaThns3jzBEjEDyuPqhb27CaUG871Z8O8BGAEtYWUa886sIdgPgOkL3rsDCELxnnEkCKIcyfu3DZFIcs+hWQGOVQ3KBY44dpwJzm5xm/PbbpiPo7QawAzEhOynmRz1eN+At+aDgBNMRJ9fWg5qaImf6iFL804M7q6mjVAOopvL+I5vMAn4FODWWn93Vm0edHWjhIDb2NHuwSL0WRdt74GMES+ZPvBjpnGsMFteCC1sWGuAMY9S78V54+o95Ijf6j8yzPadyayZb51K2/qGWas/wpaQlmva2mQvv/y1jpDfewLt4ZstzqCamVhhXzZfguf7F+MpbEGpNUl7SvCnS6BtNU7XCaV5bEp8vTKfhYVh+/AqBPYG2BpLB0N/Q198/nTkW82CgP1V4BJ8HD8FiWympZjhLjdglkMZ3h1u9k6VQIAZ9kQS3B60kKBq1mWhDVmZmNTSMf85zfV48XrBPF/ttCfCjd33gxopok5OLMZqVHNKY4PxCLI6e5FKOwwEmrzf6MffGiDWZWMgTaz3OM+d9Yv8yjNDeboGb6TGRn4yXfKlcsl4mYZi+C3IJ0BkmUA9BXaLXhhWKl/e5Xs5Ajtgf3fwSVEgsQ8G3kC2OQT0qoIMKx37K4YmABYVFx0qcJy2diQ3ZoFmvGAwvYb5vKtlyJHnbDz6OyXWfYc1UkAG4mtHNMrsgSL7ruju4QvIeZPwXDsNazI9R3dWaLbnz041JQNRvA0Kpwg3LxHaf4D0Ln7nBokEmvRycuBXljPk35B3CuGoj2qnCJzx057MTQoX/UKtQ/KRbGP0Dmmu+s1cH9dHw8l3ya+zZEKBJHt2w7rmmMiYVXMetjoPIHevePumDeXFRyCvU3mWwj7xUtzbrpTwY0zSYi5brdMRe4NBtmYJsMmH7Jgc+HOgtbm8MC++FApxiKpV2,iv:08lM7WQLcnuC7DvTZ1999sOojo9l35gAZpp4oIMuJBY=,tag:YW0xjTJkycV7xJHZuhE0uQ==,type:str]
 grafana-oauth2-secret: ENC[AES256_GCM,data:D4f/MxiIGaeKD5DNXiCLg2IeFMX0TAkxIR1BY+1z89w=,iv:XNrRSwipAbpQFnXG94zke28gTL22zNf/HfGriChaRgA=,tag:6tsqNc68wHujtlmV4plwPQ==,type:str]
+caddy-env: ENC[AES256_GCM,data:ntuUzIevCFYT6pUmVzcbvaHTdCIhpdtlYHhQynojNI77JqnF3o/OJVugXI0O4DqRLVkzaKcQ,iv:XqWjxR1PrwN/pO3Nh/TLdDlpcm2QfdVIVCACfrsCwEk=,tag:d8FFJ+P4hFrNp/tBckPteQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -35,8 +36,8 @@ sops:
            K1FHaGVOQlo2cjBTQ3ZIYXZ5ZzNsNlEKLZWrUkNXTv8ECwXz1aPdnrpMs6r9Q+yI
            k5rFkaa+ylIk4OqouKRxxlNFdgcdqqYdZEqLrfuLnamzr6LNaoL1dQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-29T15:40:45Z"
-    mac: ENC[AES256_GCM,data:+gH5ZcPlJ1ESdo93Td9BfuMKB1la18ER8OnA65/WERL5bjFai0GRjLxUGOLiJF5ApIj1JMfoqd08awvS8xUVM/4zccYXTeHtngVw2Ra9q3wcvFK4VzQ7kIO0btd6+YSdGGFpWLwBvErsn1yUs67sl69qr4qz0BxMrFn3zac3aQU=,iv:4fxThNrDrOsNNSykVVEmAHfl2VpcZVA58E5lZ+krEpE=,tag:RFigNQQzcZBMiCky5nL3Wg==,type:str]
+    lastmodified: "2024-06-10T09:03:14Z"
+    mac: ENC[AES256_GCM,data:5M837MDd/9ZPyoczsKQ0UJVtFxcX+DsKxZplsZgQA2iKhgzKtWsrz/HciYUnDsYqlTswDWPZhcMpEAhzozUxuKJEoWswmwuKAEBLn5zb6fcvy3H8oMDELR/e3IFZ+5dpxeaWrJwx2mXHdk/aW1AiWjtSpcNlNlF1QM8oFvwjlbA=,iv:h+uRWTlMZlkatS6zBLa9znGb77o8oPA2KC2C/rrVnGw=,tag:8/hTW2BDdTN8V36gSXFMEg==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/machines/valkyrie/blocky/default.nix
+++ b/machines/valkyrie/blocky/default.nix
@ -9,7 +9,7 @@
        };
        upstreams = {
          groups = {
-            default = [ "127.0.0.1:5335" ];
+            default = [ "127.0.0.1:5455" ];
            "100.64.0.0/10" = [ "127.0.0.1:5454" ];
            "fd7a:115c:a1e0::/96" = [ "127.0.0.1:5454" ];
            "fd7a:115c:a1e0:ab12::/64" = [ "127.0.0.1:5454" ];
@ -35,17 +35,6 @@

        customDNS = {
          mapping = {
-            "home.datarift.nl" = "10.0.0.251";
-            "frigate.datarift.nl" = "10.0.0.251";
-            "git.datarift.nl" = "10.0.0.203";
-            "loki.datarift.nl" = "10.0.0.4";
-            "minio.datarift.nl" = "10.0.0.251";
-            "minio-admin.datarift.nl" = "10.0.0.251";
-            "mqtt.datarift.nl" = "10.0.0.254";
-            "nix-cache.datarift.nl" = "10.0.0.209";
-            "saga.datarift.nl" = "10.0.0.251";
-            "vidz.datarift.nl" = "10.0.0.211";
-
            # Horus
            "vaultserver.horus.nu" = "192.168.4.32";
          };
--- a/machines/valkyrie/coredns/datarift.zone
+++ b/machines/valkyrie/coredns/datarift.zone
@ -0,0 +1,14 @@
+$ORIGIN datarift.nl.
+$TTL 3600
+@           IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 3 3600 900 86400 1800
+
+home        IN A 10.0.0.251
+frigate     IN A 10.0.0.251
+git         IN A 10.0.0.203
+loki        IN A 10.0.0.4
+minio       IN A 10.0.0.251
+minio-admin IN A 10.0.0.251
+mqtt        IN A 10.0.0.254
+nix-cache   IN A 10.0.0.209
+saga        IN A 10.0.0.251
+vidz        IN A 10.0.0.211
--- a/machines/valkyrie/coredns/default.nix
+++ b/machines/valkyrie/coredns/default.nix
@ -4,21 +4,28 @@
    enable = true;

    config = ''
-      datarift.nl:5454 {
-        bind 127.0.0.1 ::1
+      .:5454 {
+        bind lo
+        reload 5s
        tailscale datarift.nl {
          authkey {$TS_AUTHKEY}
          fallthrough
        }
        forward . 127.0.0.1:5335
        log
+        debug
        errors
      }

-      .:5454 {
-        bind 127.0.0.1 ::1
+      .:5455 {
+        bind lo
+        reload 5s
+        file ${./datarift.zone} datarift.nl {
+          reload 10s
+        }
        forward . 127.0.0.1:5335
        log
+        debug
        errors
      }
    '';
--- a/modules/keycloak/keycloak-admin-ui.nix
+++ b/modules/keycloak/keycloak-admin-ui.nix
@ -14,12 +14,12 @@ buildMavenPackage {
    owner = "keycloak";
    repo = "keycloak";
    rev = version;
-    sha256 = "+T8Y3/CkWFslhzGH+5uceb7hYJioxivMkLHTBYvq7KM=";
+    sha256 = "ZbI0ekuYOl7SSzoGHGOTs/u3hRHfh9qFH0FB953YxP0=";
  };

  sourceRoot = "source/integration/admin-client";

-  mvnHash = "sha256-6vlH568z0oeBZQu953DNMkpneqzwFh9o7wmG1iOaoxA=";
+  mvnHash = "sha256-Cru48OGrrBSjfHzPrEbRRZXxB75tIn5URw0fFILcTf0=";
  # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";

  installPhase = ''
Author	SHA1	Message	Date
Erwin Boskma	a8d7a0ea35	odin: Add iperf3	2024-06-11 15:26:14 +02:00
Erwin Boskma	14dcde40a3	firefox: re-enable context menu events	2024-06-11 15:26:00 +02:00
Erwin Boskma	39b79325a5	flake.lock: Update Flake lock file updates: • Updated input 'atuin': 'github:atuinsh/atuin/c0d2c961773056eda6a76e5526586a11155180c2?narHash=sha256-3r4TTmI9/c9f088Mgajd6SQyfl7fZvbmOskidyxoihg%3D' (2024-06-10) → 'github:atuinsh/atuin/55a2fe50f70a5dc7d4a9ee5e1d6ffc213c74291b?narHash=sha256-eHTd7rasshvqnNNjfmB1A0rBchZfiF3M8vSorPuy/u0%3D' (2024-06-10) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/e618bb81b46a182758c649c734294f55d73e05bc?narHash=sha256-UdQqYGtvFfovH1PfsNWIuzEXxqpeqILCXIoJIhC3Q9M%3D' (2024-06-10) → 'github:nix-community/emacs-overlay/d2404a42ad3ae9c5ee5c481b7c7a4c91627d161f?narHash=sha256-Ud33Yz5o2OJ9mjH5rhbrdR%2Bpolxq9QyOLLNbtQ63s4E%3D' (2024-06-11) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e?narHash=sha256-4q0s6m0GUcN7q%2BY2DqD27iLvbcd1G50T2lv08kKxkSI%3D' (2024-06-07) → 'github:nixos/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3?narHash=sha256-GTO3C88%2B5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t%2BD8%3D' (2024-06-09) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/abfe5b3126b1b7e9e4daafc1c6478d17f0b584e7?narHash=sha256-24h/qKp0aeI%2BEw13WdRF521kY24PYa5HOvw0mlrABjk%3D' (2024-06-10) → 'github:oxalica/rust-overlay/bedc47af18fc41bb7d2edc2b212d59ca36253f59?narHash=sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps%3D' (2024-06-11) • Updated input 'sops': 'github:Mic92/sops-nix/f0922ad001829b400f0160ba85b47d252fa3d925?narHash=sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w%2BmFd3X0jJs6wiA%3D' (2024-06-09) → 'github:Mic92/sops-nix/d071c74a7de1e26d211b69b6fbae37ae2e31a87f?narHash=sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM%3D' (2024-06-10)	2024-06-11 15:10:48 +02:00
Erwin Boskma	bc4e2930b2	flake.lock: Update Flake lock file updates: • Updated input 'atuin': 'github:atuinsh/atuin/85aa88abab676d32ff6b3996e1ecc37f97b75347?narHash=sha256-KQHpmwM56kUWr4jnRwzYjz5xEb%2B/Ngdi6EOfzv4Wwh0%3D' (2024-06-07) → 'github:atuinsh/atuin/c0d2c961773056eda6a76e5526586a11155180c2?narHash=sha256-3r4TTmI9/c9f088Mgajd6SQyfl7fZvbmOskidyxoihg%3D' (2024-06-10) • Updated input 'disko': 'github:nix-community/disko/398acc470f7c2d68621db01900f053e6000129c4?narHash=sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds%3D' (2024-06-07) → 'github:nix-community/disko/c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82?narHash=sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y%3D' (2024-06-10) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/007b1e192409decce73d39948ae862d1b38c6f20?narHash=sha256-/8IH9iKG5lLlpgqMJD9yy3rcv5YgWvfkGleDOE41RlA%3D' (2024-06-08) → 'github:nix-community/emacs-overlay/e618bb81b46a182758c649c734294f55d73e05bc?narHash=sha256-UdQqYGtvFfovH1PfsNWIuzEXxqpeqILCXIoJIhC3Q9M%3D' (2024-06-10) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/a2e1d0414259a144ebdc048408a807e69e0565af?narHash=sha256-b4Dn%2BPnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs%3D' (2024-06-04) → 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c?narHash=sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz%2BsQ%3D' (2024-06-08) • Updated input 'home-manager': 'github:nix-community/home-manager/a7117efb3725e6197dd95424136f79147aa35e5b?narHash=sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz%2Bhg%2Bx1pCcNkAws%3D' (2024-06-04) → 'github:nix-community/home-manager/3d65009effd77cb0d6e7520b68b039836a7606cf?narHash=sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0%3D' (2024-06-09) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/057a7996d012f342a38a26261ee529cebb1755ef?narHash=sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4%3D' (2024-06-08) → 'github:NixOS/nixos-hardware/58b52b0dd191af70f538c707c66c682331cfdffc?narHash=sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s%3D' (2024-06-10) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e8057b67ebf307f01bdcc8fba94d94f75039d1f6?narHash=sha256-pL9jeus5QpX5R%2B9rsp3hhZ%2BuplVHscNJh8n8VpqscM0%3D' (2024-06-05) → 'github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e?narHash=sha256-4q0s6m0GUcN7q%2BY2DqD27iLvbcd1G50T2lv08kKxkSI%3D' (2024-06-07) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/6dc3e45fe4aee36efeed24d64fc68b1f989d5465?narHash=sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28%3D' (2024-06-08) → 'github:oxalica/rust-overlay/abfe5b3126b1b7e9e4daafc1c6478d17f0b584e7?narHash=sha256-24h/qKp0aeI%2BEw13WdRF521kY24PYa5HOvw0mlrABjk%3D' (2024-06-10) • Updated input 'sops': 'github:Mic92/sops-nix/d4555e80d80d2fa77f0a44201ca299f9602492a0?narHash=sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM%3D' (2024-06-03) → 'github:Mic92/sops-nix/f0922ad001829b400f0160ba85b47d252fa3d925?narHash=sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w%2BmFd3X0jJs6wiA%3D' (2024-06-09) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/3b1b4895b2c5f9f5544d02132896aeb9ceea77bc?narHash=sha256-IITcGd6xpNoyq9SZBigCkv4%2BqMHSqot0RDPR4xsZ2CA%3D' (2024-06-01) → 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c?narHash=sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz%2BsQ%3D' (2024-06-08)	2024-06-10 12:10:13 +02:00
Erwin Boskma	9ec520c6b7	nushell: nushellFull no longer exists, dataframes split to polars plugin	2024-06-10 11:37:27 +02:00
Erwin Boskma	29627df807	gitea: Switch to caddy-proxy module	2024-06-10 11:32:11 +02:00
Erwin Boskma	b232f0a2c8	saga: Add caddy	2024-06-10 11:28:28 +02:00
Erwin Boskma	a46bdfc8d1	keycloak: Update admin-ui hashes	2024-06-08 18:52:44 +02:00
Erwin Boskma	b5f62be6a3	valkyrie: Update DNS config so tailscale plugin is used on tailscale	2024-06-08 17:36:11 +02:00
Erwin Boskma	1db9542cf0	flake.lock: Update Flake lock file updates: • Updated input 'caddy-with-plugins': 'github:eboskma/caddy-with-plugins/bb26c2e7fa43be39d4d184c0d443d649cda91897?narHash=sha256-bTVj6mAr%2BNAqwzVhHBBhOszRpWiNYglp93aNIzukiYE%3D' (2024-04-16) → 'github:eboskma/caddy-with-plugins/c6ff99288a79ed98482759e4feea0b90ade9219b?narHash=sha256-j3hBTCwO0T%2BfkSLm2jN1MhXuOYLtsLK5nGMz%2Bz44L%2Bg%3D' (2024-06-08)	2024-06-08 17:33:32 +02:00
Erwin Boskma	5ba0e9d754	machines: Remove 'container' tag from unifi	2024-06-08 16:48:29 +02:00
Erwin Boskma	0aa5c5db15	vscode: Update rust-analyzer extension id due to deprecation	2024-06-08 16:48:10 +02:00
Erwin Boskma	c8d0c9d11e	flake.lock: Update Flake lock file updates: • Updated input 'anyrun': 'github:Kirottu/anyrun/8c1f7907a4ee51226b1fd20674086fe292e4136e?narHash=sha256-W22hMKD1Qa1ARgLS3zB4EIfOTmPvrAEfd%2BqZ71QgJyg%3D' (2024-06-05) → 'github:Kirottu/anyrun/7aabad8d5bb7d1bffae903ce86427b888ab824b4?narHash=sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw%3D' (2024-06-05) • Updated input 'atuin': 'github:atuinsh/atuin/9943c53a7012e1a571ed6a66c127884fa3249767?narHash=sha256-XzvSLzyVmaHjgjLastmsh7HD7QrQD8xOvV8yCTYyivw%3D' (2024-06-04) → 'github:atuinsh/atuin/85aa88abab676d32ff6b3996e1ecc37f97b75347?narHash=sha256-KQHpmwM56kUWr4jnRwzYjz5xEb%2B/Ngdi6EOfzv4Wwh0%3D' (2024-06-07) • Updated input 'disko': 'github:nix-community/disko/a838e83e21502a211b83373109a260e5ef5fbcf1?narHash=sha256-CivVhYExnMJ2afm%2Bo1ogB231pKW/azhUghMI53MHmOM%3D' (2024-06-04) → 'github:nix-community/disko/398acc470f7c2d68621db01900f053e6000129c4?narHash=sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds%3D' (2024-06-07) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/d619b5b5ba751d6e3c16da1ca8178a31ef130047?narHash=sha256-SI42G6mLxgn6vvSNxSuydQl0M41UZFh%2BBx%2BePjXbuyI%3D' (2024-06-05) → 'github:nix-community/emacs-overlay/007b1e192409decce73d39948ae862d1b38c6f20?narHash=sha256-/8IH9iKG5lLlpgqMJD9yy3rcv5YgWvfkGleDOE41RlA%3D' (2024-06-08) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446?narHash=sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw%3D' (2024-05-31) → 'github:NixOS/nixpkgs/a2e1d0414259a144ebdc048408a807e69e0565af?narHash=sha256-b4Dn%2BPnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs%3D' (2024-06-04) • Updated input 'nix-ld-rs': 'github:nix-community/nix-ld-rs/62d5a9eb8ba0feb1d62292ca29de98785bcef04a?narHash=sha256-mQEWQOak0r8YEXK5IzvSfScmndpdODBKNvN0T8QydEg%3D' (2024-06-01) → 'github:nix-community/nix-ld-rs/3397956280fe8f555ffe11fe3a8115341a0ef460?narHash=sha256-F/ZA/yhBg1XJYudA6b4ORt5CnEwOu4gR/UbMVq1UYMY%3D' (2024-06-07) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/82b2e20fbffe6a5f0555701af136ad3e734a5faa?narHash=sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE%3D' (2024-06-04) → 'github:NixOS/nixos-hardware/057a7996d012f342a38a26261ee529cebb1755ef?narHash=sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4%3D' (2024-06-08) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8?narHash=sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0%3D' (2024-05-31) → 'github:nixos/nixpkgs/e8057b67ebf307f01bdcc8fba94d94f75039d1f6?narHash=sha256-pL9jeus5QpX5R%2B9rsp3hhZ%2BuplVHscNJh8n8VpqscM0%3D' (2024-06-05) • Updated input 'pre-commit-hooks': 'github:cachix/git-hooks.nix/0e8fcc54b842ad8428c9e705cb5994eaf05c26a0?narHash=sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA%3D' (2024-05-20) → 'github:cachix/git-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/8795c817dfab19243a33387a16c98d2df4075bb3?narHash=sha256-%2Bt3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU%2BpSE%3D' (2024-06-05) → 'github:oxalica/rust-overlay/6dc3e45fe4aee36efeed24d64fc68b1f989d5465?narHash=sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28%3D' (2024-06-08) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/3eb96ca1ae9edf792a8e0963cc92fddfa5a87706?narHash=sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw%3D' (2024-06-01) → 'github:numtide/treefmt-nix/4fc1c45a5f50169f9f29f6a98a438fb910b834ed?narHash=sha256-npYqVg%2BWk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE%3D' (2024-06-08)	2024-06-08 16:10:28 +02:00