diff --git a/flake.lock b/flake.lock
index 6050029..73733f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -241,6 +241,24 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -493,6 +511,41 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1686277352,
+        "narHash": "sha256-quryYLnntwZZrwJ4Vsx24hiCkwiYZAEttiOu983akGg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a9fa8f8450a2ae296f152a9b3d52df68d24b7cfc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixseparatedebuginfod": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1687629384,
+        "narHash": "sha256-p0m0AXL2s1RhymW7BXfcR6oYfZhYDNmnSiuTQoyP/2o=",
+        "owner": "symphorien",
+        "repo": "nixseparatedebuginfod",
+        "rev": "08d4f56a656c38eb414aeedecd9f02cb57ffb2a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "symphorien",
+        "repo": "nixseparatedebuginfod",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -534,8 +587,9 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-wayland": "nixpkgs-wayland",
+        "nixseparatedebuginfod": "nixseparatedebuginfod",
         "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "templates": "templates"
       }
     },
@@ -585,6 +639,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "templates": {
       "locked": {
         "lastModified": 1685790891,
diff --git a/flake.nix b/flake.nix
index 034d8bc..678375a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,6 +71,7 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixseparatedebuginfod.url = "github:symphorien/nixseparatedebuginfod";
   };
 
   outputs = {
diff --git a/hosts/desktopnix/default.nix b/hosts/desktopnix/default.nix
index 5c641f6..69f5263 100644
--- a/hosts/desktopnix/default.nix
+++ b/hosts/desktopnix/default.nix
@@ -8,8 +8,6 @@
     ../../modules/config
     ../../modules/dev
 
-    ../../modules/impermanence
-
     ../../modules/hardware/bluetooth.nix
     ../../modules/hardware/intel.nix
     ../../modules/hardware/nintendo.nix
diff --git a/hosts/patricknix/default.nix b/hosts/patricknix/default.nix
index 0c27cdb..bca23ae 100644
--- a/hosts/patricknix/default.nix
+++ b/hosts/patricknix/default.nix
@@ -8,11 +8,8 @@
     ../../modules/config
     ../../modules/dev
 
-    ../../modules/impermanence
-
     ../../modules/hardware/bluetooth.nix
     ../../modules/hardware/laptop.nix
-    #../../modules/hardware/nintendo.nix
     ../../modules/hardware/intel.nix
     ../../modules/hardware/nvidia.nix
     ../../modules/hardware/physical.nix
diff --git a/modules/config/default.nix b/modules/config/default.nix
index bdc1a24..3cc6607 100644
--- a/modules/config/default.nix
+++ b/modules/config/default.nix
@@ -17,12 +17,14 @@
     ../secrets.nix
     ../meta.nix
     ../smb-mounts.nix
+    ../impermanence
 
     inputs.home-manager.nixosModules.default
     inputs.impermanence.nixosModules.impermanence
     inputs.agenix.nixosModules.default
     inputs.agenix-rekey.nixosModules.default
     inputs.disko.nixosModules.disko
+    inputs.nixseparatedebuginfod.nixosModules.default
   ];
   age.identityPaths = ["/state/etc/ssh/ssh_host_ed25519_key"];
 }
diff --git a/modules/dev/default.nix b/modules/dev/default.nix
index abd5598..acc22d7 100644
--- a/modules/dev/default.nix
+++ b/modules/dev/default.nix
@@ -3,6 +3,7 @@
     ./docs.nix
   ];
   environment.enableDebugInfo = true;
+  services.nixseparatedebuginfod.enable = true;
   environment.shellInit = ''
     gpg-connect-agent /bye
     export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
diff --git a/modules/optional/streamdeck.nix b/modules/optional/streamdeck.nix
index 9fc29fe..ee19129 100644
--- a/modules/optional/streamdeck.nix
+++ b/modules/optional/streamdeck.nix
@@ -13,9 +13,6 @@
     ;
   settingsFormat = pkgs.formats.json {};
 in {
-  # broken on nixpkgs currently. How fun
-  programs.streamdeck-ui.enable = true;
-
   home-manager.sharedModules = [
     ({config, ...}: {
       options.programs.streamdeck-ui = {
@@ -33,7 +30,7 @@ in {
         };
       };
       config = mkIf config.programs.streamdeck-ui.enable {
-        home.sessionVariables.STREAMDECK_UI_CONFIG = "${config.xdg.configHome}/streamdeck-ui/config.json";
+        home.packages = [pkgs.streamdeck-ui];
         xdg.configFile.streamdeck-ui = {
           target = "streamdeck-ui/config.json";
           source = settingsFormat.generate "config.json" {
@@ -47,7 +44,8 @@ in {
               Description = "Start streamdeck-ui";
             };
             Service = {
-              ExecStart = "${config.programs.streamdeck-ui.package}/bin/streamdeck-ui --no-ui";
+              Environment = "STREAMDECK_UI_CONFIG=${config.xdg.configHome}/streamdeck-ui/config.json";
+              ExecStart = "${config.programs.streamdeck-ui.package}/bin/streamdeck --no-ui";
             };
             Install = {
               WantedBy = ["default.target"];
diff --git a/users/common/programs/thunderbird.nix b/users/common/programs/thunderbird.nix
new file mode 100644
index 0000000..365e270
--- /dev/null
+++ b/users/common/programs/thunderbird.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.thunderbird];
+
+  home.persistence."/state".directories = [".thunderbird"];
+}
diff --git a/users/patrick/default.nix b/users/patrick/default.nix
index 446bec6..7088782 100644
--- a/users/patrick/default.nix
+++ b/users/patrick/default.nix
@@ -47,6 +47,7 @@
       ../common/programs/streamdeck.nix
       ../common/programs/firefox.nix
       ../common/programs/kitty.nix
+      ../common/programs/thunderbird.nix
     ];
   };
 }