flake.lock: Update

Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/00e79db0e791b9fd393eb98068135cb08d33684b?narHash=sha256-0r%2Ba%2BL/KCZjeguYyLuog7/7EKqyAbgBmHCRDmUEbom8%3D' (2024-10-09)
  → 'github:nix-community/emacs-overlay/141d26694d12456d2012cbec704a979902ab6ccd?narHash=sha256-g3kUnceXuCz%2BX3LNIJqECdmBWLKmhc3bWUpDLXC%2BjtQ%3D' (2024-10-10)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c31898adf5a8ed202ce5bea9f347b1c6871f32d1?narHash=sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw%3D' (2024-10-06)
  → 'github:nixos/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/c79229c66605b70c9be9d67652d3196b638050c7?narHash=sha256-anD4%2B6yZc7TRuaqPesWJa67Mzyq3ruR6YTpRDt%2BVhHc%3D' (2024-10-09)
  → 'github:oxalica/rust-overlay/94749eee5a2b351b6893d5bddb0a18f7f01251ac?narHash=sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw%3D' (2024-10-10)

flake.lock

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

home-manager/modules/firefox/default.nix

@@ -33,6 +33,7 @@ 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,6 +23,9 @@
         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,6 +9,27 @@ 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 = {
@@ -73,7 +94,10 @@ in
           };
         }) cfg.servers);
 
-      systemPackages = [ cfg.package ];
+      systemPackages = [
+        cfg.package
+        barmanWrapper
+      ];
     };
     systemd = {
       timers.barman = {
@@ -87,16 +111,7 @@ in
 
       services.barman = {
         description = "Run barman maintenance tasks";
-        path = with pkgs; [
+        path = runtimeInputs;
-          cfg.package
-          bash
-          bzip2
-          gzip
-          lz4
-          pigz
-          postgresql
-          zstd
-        ];
         # environment = {
         #   PGPASSFILE = lib.mkIf (cfg.passwordsFile != null) cfg.passwordsFile;
         # };

modules/keycloak/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -22,22 +21,10 @@ in
         hostname = "id.datarift.nl";
         http-host = "127.0.0.1";
         http-port = 8081;
-        proxy = "edge";
+        http-enabled = true;
+        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-OuqECd4Mru6P4WDHf+79C3wSL7H6GvDMZoX70Zim1FI=";
+    hash = "sha256-DQqmgINLQ6wYJPuvYCaQ402U0wVvX0ZRC55ukeoLtYA=";
   };
 
   sourceRoot = "source/integration/admin-client";
 
-  mvnHash = "sha256-uFqCrPTuXZJTZ3cIBqJPKbf0nkWvdtdTeVV8lMYW1xs=";
+  mvnHash = "sha256-vwQ4X01pWX1n+o3RVWasbpAlAVuqzwn5xqh4KNiXzQA=";
   # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
   installPhase = ''