diff --git a/home/neovim.nix b/home/neovim.nix
index a5405fe..66c8655 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -100,7 +100,7 @@ in {
       " Close vim is Nerdtree is the only buffer left
       autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 
-      if empty($AERC_ACCOUNT)
+      if empty($AERC_ACCOUNT) && empty($MOZ_APP_LAUNCHER)
         autocmd VimEnter * NERDTree " Autostart nerdtree on vim startup
         autocmd VimEnter * wincmd p " Unselect nerdtree window
       endif
diff --git a/hosts/sisko/configuration.nix b/hosts/sisko/configuration.nix
index 9dda58f..cb8b604 100644
--- a/hosts/sisko/configuration.nix
+++ b/hosts/sisko/configuration.nix
@@ -29,16 +29,23 @@
 
   users.users.felixalb.extraGroups = [ "dialout" ];
 
-  programs.gamemode.enable = true;
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-  };
+  programs = {
+    gamemode.enable = true;
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+    };
 
-  programs.alvr = {
-    enable = true;
-    package = pkgs.unstable.alvr;
-    openFirewall = true;
+    alvr = {
+      enable = true;
+      package = pkgs.unstable.alvr;
+      openFirewall = true;
+    };
+
+    firefox = {
+      enable = true;
+      nativeMessagingHosts.tridactyl = true;
+    };
   };
 
   nixpkgs.config = {
diff --git a/hosts/sisko/home.nix b/hosts/sisko/home.nix
index 4930b5c..d472d35 100644
--- a/hosts/sisko/home.nix
+++ b/hosts/sisko/home.nix
@@ -75,7 +75,6 @@
       enable = true;
       settings.window.opacity = 0.92;
     };
-    firefox.enable = true;
     ncmpcpp.enable = true;
     neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];
     rbw = {