diff --git a/modules/gui.nix b/modules/gui.nix
index 2ddb513..eed82ca 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -45,6 +45,7 @@ with pkgs;
       export GTK_THEME=Adapta-Eta
       export XDG_SESSION_TYPE=wayland
       export XDG_CURRENT_DESKTOP=sway
+      export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
     '';
     wrapperFeatures.gtk = true;
   };
diff --git a/modules/software.nix b/modules/software.nix
index 182b8a5..ccccf78 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -36,6 +36,7 @@ in {
     texlab
     # Text editors
     neovim
+    neovim-remote
     emacs-vterm
     (ripgrep.override { withPCRE2 = true; })
     fd