diff --git a/modules/smb-mounts.nix b/modules/smb-mounts.nix
index 4a87f13..a9fa0f8 100644
--- a/modules/smb-mounts.nix
+++ b/modules/smb-mounts.nix
@@ -87,6 +87,7 @@ in
                     "file_mode=0600"
                     "dir_mode=0700"
                     "credentials=${cfg.credentials}"
+                    "x-systemd.after=network-online.target"
                   ]
                   ++ (optional (!cfg.automatic) "noauto");
               in
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e9e54a9..67df823 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,17 +1,17 @@
 [
   (import ./scripts)
-  (_self: super: {
-    zsh-histdb-skim = super.callPackage ./zsh-histdb-skim.nix { };
-    zsh-histdb = super.callPackage ./zsh-histdb.nix { };
-    actual = super.callPackage ./actual.nix { };
-    pr-tracker = super.callPackage ./pr-tracker.nix { };
-    homebox = super.callPackage ./homebox.nix { };
-    deploy = super.callPackage ./deploy.nix { };
-    mongodb-bin = super.callPackage ./mongodb-bin.nix { };
-    awakened-poe-trade = super.callPackage ./awakened-poe-trade.nix { };
-    neovim-clean = super.neovim-unwrapped.overrideAttrs (
+  (_prev: final: {
+    zsh-histdb-skim = final.callPackage ./zsh-histdb-skim.nix { };
+    zsh-histdb = final.callPackage ./zsh-histdb.nix { };
+    actual = final.callPackage ./actual.nix { };
+    pr-tracker = final.callPackage ./pr-tracker.nix { };
+    homebox = final.callPackage ./homebox.nix { };
+    deploy = final.callPackage ./deploy.nix { };
+    mongodb-bin = final.callPackage ./mongodb-bin.nix { };
+    awakened-poe-trade = final.callPackage ./awakened-poe-trade.nix { };
+    neovim-clean = final.neovim-unwrapped.overrideAttrs (
       _neovimFinal: neovimPrev: {
-        nativeBuildInputs = (neovimPrev.nativeBuildInputs or [ ]) ++ [ super.makeWrapper ];
+        nativeBuildInputs = (neovimPrev.nativeBuildInputs or [ ]) ++ [ final.makeWrapper ];
         postInstall =
           (neovimPrev.postInstall or "")
           + ''
@@ -19,10 +19,18 @@
           '';
       }
     );
-    kanidm = super.kanidm.overrideAttrs (
+    path-of-building = final.path-of-building.overrideAttrs (old: {
+      postFixup =
+        (old.postFixup or "")
+        + ''
+          wrapProgram $out/bin/pobfrontend \
+            --set QT_QPA_PLATFORM xcb
+        '';
+    });
+    kanidm = final.kanidm.overrideAttrs (
       old:
       let
-        provisionSrc = super.fetchFromGitHub {
+        provisionSrc = final.fetchFromGitHub {
           owner = "oddlama";
           repo = "kanidm-provision";
           rev = "v1.1.0";
@@ -38,6 +46,6 @@
         doCheck = false;
       }
     );
-    kanidm-provision = super.callPackage ./kanidm-provision.nix { };
+    kanidm-provision = final.callPackage ./kanidm-provision.nix { };
   })
 ]
diff --git a/users/common/programs/gdb.nix b/users/common/programs/gdb.nix
index 98142de..899485e 100644
--- a/users/common/programs/gdb.nix
+++ b/users/common/programs/gdb.nix
@@ -16,10 +16,10 @@ in
   home.packages = [ pwndbgWithDebuginfod ];
   home.enableDebugInfo = true;
   xdg.configFile.gdbinit = {
-    target = "gdb/gbdinit";
+    target = "gdb/gdbinit";
     text = ''
-      set auto-load safe-path /
       set debuginfod enabled on
+      set auto-load safe-path /
 
       set history save on
       set history filename ~/.local/share/gdb/history