diff --git a/flake.nix b/flake.nix
index 304b22e..9c5ea4a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -235,16 +235,16 @@
           hardware.nixosModules.framework-13-7040-amd
 
           common
+          password-manager
           graphical-workstation
           laptop
           gaming
 
           ./nixos/foxtrot.nix
 
-          {
+          ({pkgs, ...}: {
             home-manager.users.daniel = {
               imports = with homeManagerModules; [
-                pass
                 senpai
                 iex
                 cargo
@@ -252,7 +252,19 @@
                 linux-desktop-environment-config
               ];
             };
-          }
+            environment.systemPackages = with pkgs; [
+              fw-ectool
+              (writeShellApplication
+                {
+                  name = "reset-wifi-module";
+                  runtimeInputs = with pkgs; [kmod];
+                  text = ''
+                    modprobe -rv mt7921e
+                    modprobe -v mt7921e
+                  '';
+                })
+            ];
+          })
         ];
       };
 
@@ -263,6 +275,7 @@
           hardware.nixosModules.lenovo-thinkpad-x1-yoga
 
           common
+          password-manager
           graphical-workstation
           laptop
           gaming
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index bf0a528..6a6ef30 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -161,9 +161,10 @@
   };
 
   password-manager = {pkgs, ...}: {
-    programs.goldwarden = {
-      enable = true;
-    };
+    # programs.goldwarden = {
+    # NOTE: This didn't seem to work for me, but would be awesome!
+    #   enable = true;
+    # };
 
     home-manager.users.daniel = {
       imports = with homeManagerModules; [
@@ -238,6 +239,7 @@
     imports = with nixosModules; [
       postgres
       podman
+      troubleshooting-tools
     ];
 
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
@@ -334,6 +336,7 @@
       bottom
       nmap
       dogdns
+      inetutils
       dnsutils
     ];
   };
@@ -342,7 +345,6 @@
     imports = with nixosModules; [
       plasma6
       fonts
-      troubleshooting-tools
       development-tools
       printing
     ];