diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index 8e651627..025d2b5f 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -8,6 +8,14 @@ set completeopt=menuone,noinsert,noselect
 " Avoid showing extra messages when using completion
 set shortmess+=c
 
+function AddTemplate(tmpl_file)
+    exe "0read " . a:tmpl_file
+    set nomodified
+    6
+endfunction
+
+autocmd BufNewFile shell.nix call AddTemplate("$XDG_DATA_HOME/nvim/templates/shell.nix.tmpl")
+
 " Configure neovim 0.6+ experimental LSPs
 " https://github.com/neovim/nvim-lspconfig
 " https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
@@ -46,6 +54,22 @@ lua <<EOF
     vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
 
+    -- Show diagnostic popup on cursor hold
+    vim.api.nvim_create_autocmd("CursorHold", {
+      buffer = bufnr,
+      callback = function()
+        local opts = {
+          focusable = false,
+          close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
+          border = 'rounded',
+          source = 'always',
+          prefix = ' ',
+          scope = 'cursor',
+        }
+        vim.diagnostic.open_float(nil, opts)
+      end
+    })
+
   end
 
   -- Add additional capabilities supported by nvim-cmp
@@ -197,9 +221,6 @@ for type, icon in pairs(signs) do
 end
 EOF
 
-" Show diagnostic popup on cursor hold
-autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, { focus = false, scope = "cursor" })
-
 " have a fixed column for the diagnostics to appear in
 " this removes the jitter when warnings/errors flow in
 set signcolumn=yes:2
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index c53377ea..daf437e2 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -84,6 +84,10 @@ in
     stty -ixon
     stty erase '^?'
 
+    precmd () {
+      echo -e "\e]2;$(pwd)\e\\"
+    }
+
     # If a command is not found, show me where it is
     source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
   ''
diff --git a/profiles/base-user/home.nix b/profiles/base-user/home.nix
index d8a331a9..6cb59b11 100644
--- a/profiles/base-user/home.nix
+++ b/profiles/base-user/home.nix
@@ -54,6 +54,20 @@ in
     # Ensure nvim backup directory gets created
     # Workaround for E510: Can't make backup file (add ! to override)
     xdg.dataFile."nvim/backup/.keep".text = "";
+    xdg.dataFile."nvim/templates/.keep".text = "";
+    xdg.dataFile."shell.nix.tmpl" = {
+      text = ''
+        let
+          unstable = import (fetchTarball https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz) { };
+        in
+        { nixpkgs ? import <nixpkgs> {} }:
+        with nixpkgs; mkShell {
+          buildInputs = [
+          ];
+        }
+      '';
+      target = "nvim/templates/shell.nix.tmpl";
+    };
 
     # Allow unfree packages only on a user basis, not on a system-wide basis
     xdg.configFile."nixpkgs/config.nix".text = " { allowUnfree = true; } ";