diff --git a/config/ai.nix b/config/ai.nix
index 27c475f..aada76c 100644
--- a/config/ai.nix
+++ b/config/ai.nix
@@ -40,7 +40,7 @@
     host = "0.0.0.0";
     openFirewall = true;
     # Make sure this path is created and has the permissions of ollama:ollama.
-    models = "/mnt/storage/models";
+    modelsDir = "/mnt/storage/models";
     environmentVariables = {
         OLLAMA_CONTEXT_LENGTH = "8192";
     };
diff --git a/config/logging.nix b/config/logging.nix
index 3743b9f..c1b63fc 100644
--- a/config/logging.nix
+++ b/config/logging.nix
@@ -25,6 +25,9 @@
           http_port = 3000;
           domain = "grafana.randomctf.lan";
       };
+      # Legacy default secret key, kept so existing datasource secrets
+      # in the database remain decryptable.
+      settings.security.secret_key = "SW2YcwTIb9zpOOhoPsMm";
   };
 
   services.nginx = {
diff --git a/config/omen.nix b/config/omen.nix
index 21cf854..751f009 100644
--- a/config/omen.nix
+++ b/config/omen.nix
@@ -57,7 +57,7 @@
 
   # System Packages
   environment.systemPackages = with pkgs; [
-    pinentry-gtk2
+    pinentry-gnome3
     protonmail-bridge
     pass
 
@@ -78,7 +78,7 @@
     path = with pkgs; [
       pass
       gnupg
-      pinentry-gtk2
+      pinentry-gnome3
     ];
     serviceConfig = {
       Restart = "always";
diff --git a/config/shared.nix b/config/shared.nix
index 5fdba74..0cadf98 100644
--- a/config/shared.nix
+++ b/config/shared.nix
@@ -56,7 +56,7 @@
   # Setup Pinentry
   programs.gnupg.agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-gtk2;
+    pinentryPackage = pkgs.pinentry-gnome3;
     enableSSHSupport = true;
   };
 
diff --git a/flake.lock b/flake.lock
index 7a6a26d..04556e9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785119570,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "lastModified": 1788642154,
+        "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786286733,
-        "narHash": "sha256-7dN93WKkEERgutPtTjK7SY3ZarO2LAU33A1+vKu+7cc=",
+        "lastModified": 1788651960,
+        "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "367f7ef80856d18438953d54dda235d42a46ba31",
+        "rev": "2c0350c759688177331b8f5242311fae8877bdb3",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786249295,
-        "narHash": "sha256-Y2mSr+HLKYoOsjiackgilxkHXe8gkJ3z4hFFekjQX3I=",
+        "lastModified": 1788680125,
+        "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "14d55b8069119e3b88da7aa2f6c97f86a2cd3cd6",
+        "rev": "116ad1c2adb642405ef8916f6a94c8626f971344",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
     },
     "nix-unstable": {
       "locked": {
-        "lastModified": 1786106723,
-        "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
+        "lastModified": 1788614874,
+        "narHash": "sha256-7QYjT2vHLuX9Z1pdxHXDKCbh1CR3D/2rywB9Tx0MPRg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
+        "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1786313170,
-        "narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=",
+        "lastModified": 1788797584,
+        "narHash": "sha256-APhAHYS9dgOtYJC0+fGKLhCPflfv96jYBVbz55TpGNw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d",
+        "rev": "b279e6203ee1bf865290fb789e804d83a1e81718",
         "type": "github"
       },
       "original": {
diff --git a/home/modules/emacs.nix b/home/modules/emacs.nix
index a01b8f5..84733a2 100644
--- a/home/modules/emacs.nix
+++ b/home/modules/emacs.nix
@@ -28,7 +28,7 @@
   programs = {
     emacs = {
       enable = true;
-      package = pkgs.emacs30;
+      package = pkgs.emacs;
       extraPackages = epkgs: with epkgs; [
         mu4e
         vterm