diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 487241c..8878cb2 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,10 +1,10 @@
-set -x MANPAGER 'nvim +Man!'
+set -q MANPAGER; or set -x MANPAGER 'nvim +Man!'
 set -x EDITOR 'nvim'
 
 set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/rbw/ssh-agent-socket
 set -x CHROME_EXECUTABLE /usr/bin/chromium
 
-set -x SUPPLY_KEY_JSON ~/.fastlane/read-maududi-app-b0b713a4a08b.json
+set -x SUPPLY_JSON_KEY ~/.fastlane/read-maududi-app-b0b713a4a08b.json
 
 fish_add_path /opt/android-sdk/platform-tools
 fish_add_path /opt/android-sdk/emulator
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index d19b73c..820e796 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -2479,6 +2479,7 @@
 font_size 13.0
 
 map ctrl+shift+n nop
+map ctrl+shift+w nop
 
 map ctrl+k send_key down
 map ctrl+i send_key up
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index 9b393b0..1bd67af 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -26,6 +26,10 @@ vim.keymap.set({ 'n', 'v', 'o' }, '#', '_', { desc = '# start of line' })
 -- save / quit
 vim.keymap.set('n', '<C-s>', ':w<CR>', { desc = 'ctrl-s save' })
 vim.keymap.set('n', '<C-w>', Snacks.bufdelete.delete, { desc = 'save and close', nowait = true })
+vim.keymap.set('n', '<C-S-w>', function ()
+  Snacks.bufdelete.delete()
+  vim.cmd('q')
+end, { desc = 'save and close', nowait = true })
 
 -- delete word in insert mode
 vim.keymap.set('i', '<C-BS>', '<C-w>', { desc = 'delete word in insert mode' })
diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
index 59d821b..366cd0f 100644
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -56,4 +56,5 @@ package.path = package.path .. ';' .. vim.fn.expand('$HOME') .. '/.luarocks/shar
 package.path = package.path .. ';' .. vim.fn.expand('$HOME') .. '/.luarocks/share/lua/5.1/?.lua;'
 
 vim.env.GIT_EDITOR = 'nvr -cc tabnew --remote-wait-silent'
-vim.env.NVIM_LISTEN_ADDRESS = vim.fn.execute('echo v:servername')
+vim.env.MANPAGER = 'nvr -cc tabnew --remote-wait-silent +Man! -'
+vim.env.NVIM_LISTEN_ADDRESS = vim.v.servername