diff --git a/users/tsv/home.nix b/users/tsv/home.nix
index 49d58c4..286af18 100644
--- a/users/tsv/home.nix
+++ b/users/tsv/home.nix
@@ -11,6 +11,7 @@
 
   home.sessionVariables = {
     EDITOR = "nvim";
+    MOZ_ENABLE_WAYLAND = 1;
   };
 
   home.packages = with pkgs; [
@@ -71,6 +72,7 @@
     wine
     winetricks
     wireplumber
+    wl-clipboard
     wlr-randr
     zoom-us
   ];
diff --git a/users/tsv/nvim/init.lua b/users/tsv/nvim/init.lua
index 06b6624..844a4af 100644
--- a/users/tsv/nvim/init.lua
+++ b/users/tsv/nvim/init.lua
@@ -17,6 +17,12 @@ require("gruvbox").setup({
 })
 vim.cmd([[colorscheme gruvbox]])
 
+-- Improve terminal setup
+vim.api.nvim_command("autocmd TermOpen * startinsert")
+vim.api.nvim_command("autocmd TermOpen * setlocal nonumber norelativenumber")
+vim.api.nvim_command("autocmd TermEnter * setlocal signcolumn=no")
+vim.keymap.set('t', '<esc>', "<C-\\><C-n>")
+
 -- Git
 vim.g.fugitive_gitlab_domains = {'https://git.foxsoft.co.uk'}