diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index b5e9d99..60a835c 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -59,15 +59,19 @@ vim.g.loaded_vimballPlugin    = 1
 vim.g.loaded_zipPlugin        = 1
 
 -- Map leader
-vim.g.mapleader      = " "
-vim.g.maplocalleader = ","
-
--- dispatch
-vim.g.dispatch_no_maps            = 1
-
+vim.g.mapleader                     = " "
+vim.g.maplocalleader                = ","
+-- vim-dispatch
+vim.g.dispatch_no_maps              = 1
 -- vim-matchup
-vim.g.matchup_matchparen_offscreen = { method = 'popup', fullwidth = true }
-vim.g.matchup_surround_enabled     = 1
+vim.g.matchup_matchparen_offscreen  = { method = 'popup', fullwidth = true }
+vim.g.matchup_surround_enabled      = 1
+-- No default mappings for tmux navigator
+vim.g.tmux_navigator_no_mappings    = 1
+-- Write the current buffer, but only if changed before navigating from Vim to tmux pane
+vim.g.tmux_navigator_save_on_switch = 1
+-- Disable ]]/[[ style bindings
+vim.g.no_rust_maps                  = 1
 
 if os.getenv("SSH_CONNECTION") then
   local osc52 = require('vim.ui.clipboard.osc52')
@@ -98,14 +102,6 @@ else
   }
 end
 
--- No default mappings for tmux navigator
-vim.g.tmux_navigator_no_mappings    = 1
--- Write the current buffer, but only if changed before navigating from Vim to tmux pane
-vim.g.tmux_navigator_save_on_switch = 1
-
--- Disable ]]/[[ style bindings
-vim.g.no_rust_maps = 1
-
 -- We do this to prevent the loading of the system fzf.vim plugin. This is
 -- present at least on Arch/Manjaro
 vim.cmd.set{ args = { 'rtp-=/usr/share/vim/vimfiles' } }