1 files changed, 73 insertions, 25 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index df90607..9e0d4be 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,15 +1,20 @@
-require("plugins")
-
-vim.cmd("let mapleader = ' '")
-vim.cmd("set relativenumber")
-vim.cmd("set number")
-vim.cmd("colorscheme duskfox")
-vim.cmd("set nowrap")
-vim.cmd("set clipboard=unnamedplus") -- Use system clipboard
-vim.cmd("set background=dark")
-vim.cmd("set shm+=I")	-- Disable intro message
-vim.cmd("autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o") -- Disable auto-comment
--- vim.cmd("set list")	-- Show spaces tabs etc.
+local ok, err = pcall(require, "plugins")
+if ok then
+  	-- Plugin settings
+	vim.keymap.set('n', '<leader>e', '<cmd>Neotree toggle right<CR>', { noremap = true, silent = true })
+	vim.cmd.colorscheme("duskfox")
+else
+  vim.notify("Error loading plugins: " .. err, vim.log.levels.WARN)
+end
+
+vim.g.mapleader = ' '
+vim.opt.background = "dark"
+vim.opt.clipboard = "unnamedplus" -- Use system clipboard
+-- vim.opt.list = true            -- Show spaces, tabs, etc.
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.shortmess:append("I")     -- Disable intro message
+vim.opt.wrap = false
 
 vim.opt.fillchars = {
     vert = "|",
@@ -22,16 +27,59 @@ vim.opt.fillchars = {
     foldclose = ">",
 }
 
-vim.keymap.set('n', '<leader><leader>', ':w!<CR>')
-vim.keymap.set('n', '<leader>q', ':wq!<CR>')
-vim.keymap.set('n', '<C-t>', ':tabnew<CR>')
-vim.keymap.set('n', 'J', ':tabn<CR>')
-vim.keymap.set('n', 'K', ':tabp<CR>')
-vim.keymap.set('n', '<C-n>', ':vsplit<CR>')
-vim.keymap.set('n', 'H', ':wincmd h<CR>')
-vim.keymap.set('n', 'L', ':wincmd l<CR>')
-vim.keymap.set('n', '<leader>e', ':Neotree toggle right<CR>')
-vim.keymap.set('n', '<leader>o', '<C-W>w')
-vim.keymap.set('i', '<C-h>', '<Left>')
-vim.keymap.set('i', '<C-l>', '<Right>')
-vim.keymap.set('i', '<C-space>', '<ESC>')
+-- Remove trailing whitespace on all lines before saving, excluding markdown files
+vim.api.nvim_create_autocmd("BufWritePre", {
+  pattern = "*",
+  callback = function()
+    if vim.bo.filetype == "markdown" then
+      return
+    end
+    vim.cmd([[%s/\s\+$//e]])
+  end,
+})
+
+-- Disable auto-comment
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "*",
+  callback = function()
+    vim.opt_local.formatoptions:remove({ "c", "r", "o" })
+  end,
+})
+
+-- Enable spellcheck for certain file types
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = {
+    "gitcommit", "markdown", "text", "rst",
+    "asciidoc", "org", "norg", "latex", "tex", "mail", "pandoc"
+  },
+  callback = function()
+    vim.opt_local.spell = true
+  end,
+})
+
+-- NOTE: On some terminal emulators, the keybinds
+-- <C-j> and <C-k> don't work either in normal or insert mode.
+
+-- Tabs
+vim.keymap.set('n', '<C-t>', '<cmd>tabnew<CR>'  , { noremap = true, silent = true })
+vim.keymap.set('n', 'J'    , '<cmd>tabn<CR>'    , { noremap = true, silent = true })
+vim.keymap.set('n', 'K'    , '<cmd>tabp<CR>'    , { noremap = true, silent = true })
+
+-- Windows
+vim.keymap.set('n', '<C-Down>' , '<cmd>split<CR>' , { noremap = true, silent = true })
+vim.keymap.set('n', '<C-Right>', '<cmd>vsplit<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<C-h>'    , '<C-w>h'         , { noremap = true })
+vim.keymap.set('n', '<C-j>'    , '<C-w>j'         , { noremap = true })
+vim.keymap.set('n', '<C-k>'    , '<C-w>k'         , { noremap = true })
+vim.keymap.set('n', '<C-l>'    , '<C-w>l'         , { noremap = true })
+
+-- Imitate normal mode in insert mode
+vim.keymap.set('i', '<C-h>'    , '<Left>' , { noremap = true })
+vim.keymap.set('i', '<C-l>'    , '<Right>', { noremap = true })
+vim.keymap.set('i', '<C-j>'    , '<Down>' , { noremap = true })
+vim.keymap.set('i', '<C-k>'    , '<Up>'   , { noremap = true })
+vim.keymap.set('i', '<C-space>', '<ESC>'  , { noremap = true })
+
+-- Other
+vim.keymap.set('n', '<leader><leader>', '<cmd>w!<CR>' , { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>q'       , '<cmd>wq!<CR>', { noremap = true, silent = true })