flake.lock

@@ -217,11 +217,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1728551800,
+        "lastModified": 1728439462,
-        "narHash": "sha256-g3kUnceXuCz+X3LNIJqECdmBWLKmhc3bWUpDLXC+jtQ=",
+        "narHash": "sha256-0r+a+L/KCZjeguYyLuog7/7EKqyAbgBmHCRDmUEbom8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "141d26694d12456d2012cbec704a979902ab6ccd",
+        "rev": "00e79db0e791b9fd393eb98068135cb08d33684b",
         "type": "github"
       },
       "original": {
@@ -780,11 +780,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728492678,
+        "lastModified": 1728241625,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {
@@ -880,11 +880,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728527353,
+        "lastModified": 1728440948,
-        "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=",
+        "narHash": "sha256-anD4+6yZc7TRuaqPesWJa67Mzyq3ruR6YTpRDt+VhHc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac",
+        "rev": "c79229c66605b70c9be9d67652d3196b638050c7",
         "type": "github"
       },
       "original": {

home-manager/modules/firefox/default.nix

@@ -33,7 +33,6 @@ let
     "media.ffmpeg.vaapi.enabled" = true;
     "media.rdd-ffmpeg.enabled" = true;
     "network.allow-experimens" = false;
-    "pdfjs.defaultZoomValue" = "page-fit";
     "privacy.query_stripping" = true;
     "privacy.webrtc.allowSilencingNotifications" = true;
     "privacy.webrtc.legacyGlobalIndicator" = false;

machines/loki/barman.nix

@@ -23,9 +23,6 @@
         streaming_archiver = true;
         backup_method = "postgres";
         slot_name = "barman";
-        bandwidth_limit = 0;
-        last_backup_maximum_age = "3 DAYS";
-        minimum_redundancy = 3;
         retention_policy = "RECOVERY WINDOW OF 4 WEEKS";
       };
     };

modules/barman/default.nix

@@ -9,27 +9,6 @@ let
   iniFormat = pkgs.formats.ini { };
   defaultUser = "barman";
   defaultHome = "/var/lib/barman";
-
-  runtimeInputs = with pkgs; [
-    cfg.package
-    bash
-    bzip2
-    gzip
-    lz4
-    pigz
-    postgresql
-    zstd
-  ];
-
-  barmanWrapper = pkgs.writeShellApplication {
-    name = "bm";
-
-    inherit runtimeInputs;
-
-    text = ''
-      sudo --set-home --user ${cfg.settings.barman.barman_user} -- ${cfg.package}/bin/barman "$@"
-    '';
-  };
 in
 {
   options.services.barman = {
@@ -94,10 +73,7 @@ in
           };
         }) cfg.servers);
 
-      systemPackages = [
+      systemPackages = [ cfg.package ];
-        cfg.package
-        barmanWrapper
-      ];
     };
     systemd = {
       timers.barman = {
@@ -111,7 +87,16 @@ in
 
       services.barman = {
         description = "Run barman maintenance tasks";
-        path = runtimeInputs;
+        path = with pkgs; [
+          cfg.package
+          bash
+          bzip2
+          gzip
+          lz4
+          pigz
+          postgresql
+          zstd
+        ];
         # environment = {
         #   PGPASSFILE = lib.mkIf (cfg.passwordsFile != null) cfg.passwordsFile;
         # };

modules/keycloak/default.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   lib,
   ...
@@ -21,10 +22,22 @@ in
         hostname = "id.datarift.nl";
         http-host = "127.0.0.1";
         http-port = 8081;
-        http-enabled = true;
+        proxy = "edge";
-        proxy-headers = "xforwarded";
         features = "docker";
       };
+
+      plugins = [
+        (pkgs.callPackage ./keycloak-orgs.nix {
+          inherit (pkgs) fetchFromGitHub;
+          inherit (pkgs.maven) buildMavenPackage;
+        })
+        (pkgs.callPackage ./keycloak-admin-ui.nix {
+          inherit (pkgs) fetchFromGitHub;
+          inherit (pkgs.maven) buildMavenPackage;
+          keycloak = config.services.keycloak.package;
+        })
+        (pkgs.callPackage ./phasetwo-admin-ui.nix { inherit (pkgs) stdenv fetchFromGitHub; })
+      ];
     };
 
     services.caddy = {

modules/keycloak/keycloak-admin-ui.nix

@@ -14,12 +14,12 @@ buildMavenPackage {
     owner = "keycloak";
     repo = "keycloak";
     rev = version;
-    hash = "sha256-DQqmgINLQ6wYJPuvYCaQ402U0wVvX0ZRC55ukeoLtYA=";
+    hash = "sha256-OuqECd4Mru6P4WDHf+79C3wSL7H6GvDMZoX70Zim1FI=";
   };
 
   sourceRoot = "source/integration/admin-client";
 
-  mvnHash = "sha256-vwQ4X01pWX1n+o3RVWasbpAlAVuqzwn5xqh4KNiXzQA=";
+  mvnHash = "sha256-uFqCrPTuXZJTZ3cIBqJPKbf0nkWvdtdTeVV8lMYW1xs=";
   # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
   installPhase = ''