nvim: init.lua added

3 files changed, 33 insertions, 36 deletions

diff --git a/Makefile b/Makefile
index 0ad5cd7..eff5735 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ config:
 	$(COPY) config/qutebrowser 		$(CONFDIR)
 	$(COPY) config/shell 			$(CONFDIR)
 	$(COPY) config/vim			$(CONFDIR)
+	$(COPY) config/nvim			$(CONFDIR)
 	$(COPY) config/x11 			$(CONFDIR)
 	$(COPY) config/zathura 			$(CONFDIR)
 	$(COPY) config/mimeapps.list 		$(CONFDIR)
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
new file mode 100644
index 0000000..7dbb0a1
--- /dev/null
+++ b/config/nvim/init.lua
@@ -0,0 +1,32 @@
+vim.cmd("let mapleader = ' '")
+vim.cmd("set relativenumber")
+vim.cmd("set number")
+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.
+
+vim.opt.fillchars = {
+    vert = "|",
+    fold = " ",
+    eob = " ",
+    diff = "/",
+    msgsep = "-",
+    foldopen = "▾",
+    foldsep = "|",
+    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('i','<C-h>','<Left>')
+vim.keymap.set('i','<C-l>','<Right>')
+vim.keymap.set('i','<C-space>','<ESC>')
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
deleted file mode 100644
index 7c66eef..0000000
--- a/config/nvim/init.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-" Suleyman's minimal vim config for servers
-" at https://git.farajli.net/slcf
-
-let mapleader = " "
-set number
-set scrolloff=5 			" Smooth scroll
-set clipboard=unnamedplus		" Use system clipboard
-set shortmess+=I 			" Deactivate intro text
-set fillchars=eob:\  			" Remove "~" for empty lines (`eob:\` must end with a trailing space)
-:set nowrap				" Disable wrapping
-autocmd BufwritePost * %s/\s\+$//e 	" Remove useless trailing spaces when saving
-autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Disable autocomments
-
-" Different cursor shapes for insert and normal modes
-let &t_SI = "\e[6 q"
-let &t_EI = "\e[2 q"
-set ttimeout
-set ttimeoutlen=1
-set ttyfast
-
-" Normal mode maps
-map <leader><leader> :w!<CR>
-map <leader>q :wqa!<CR>
-map <C-t> :tabnew<CR>
-map <C-w> :tabclose!<CR>
-map J :tabn <CR>
-map K :tabp <CR>
-
-" Insert mode maps
-inoremap <C-h> <Left>
-inoremap <C-l> <Right>
-inoremap <C-j> <C-o>gj
-inoremap <C-k> <C-o>gk
-inoremap <C-o> <C-o>o
-
-set background=dark