separate keymap from settings

init.lua

@@ -11,8 +11,9 @@ vim.pack.add({
 	{ src = "https://github.com/rafamadriz/friendly-snippets" },
 })
 
-require('lspconf')
-require('settings')
 require('lualineconf')
+require('settings')
+require('lspconf')
+require('keymaps')
 require('mini')
 require('ui')

lua/keymaps.lua

@@ -0,0 +1,24 @@
+vim.keymap.set('n', '<leader>o', ':update<CR> :source<CR>')
+vim.keymap.set('n', '<ESC>', "<cmd>nohlsearch<CR>")
+vim.keymap.set('n', '<leader>lf', vim.lsp.buf.format)
+
+vim.keymap.set({ 'n', 'v', 'x' }, '<leader>y', '"+y<CR>')
+vim.keymap.set({ 'n', 'v', 'x' }, '<leader>d', '"+d<CR>')
+
+-- delete without yanking
+vim.keymap.set("n", "d", '"_d', opts)
+vim.keymap.set("v", "d", '"_d', opts)
+vim.keymap.set("n", "x", '"_x', opts)
+vim.keymap.set("n", "D", '"_D', opts)
+
+-- delete with leader to yank
+vim.keymap.set("n", "<leader>d", '""d')
+vim.keymap.set("n", "<leader>D", '""D')
+vim.keymap.set("v", "<leader>d", '""d')
+
+-- Plugin Keybinds
+vim.keymap.set('n', '<leader>e', '<cmd>Oil<CR>', { desc = "Open parent directory" })
+vim.keymap.set('n', '<leader>D', '<cmd>Alpha<CR>', { desc = "Open dashboard" })
+
+-- Fuzzy find files and open them (or their directory in Oil)
+vim.keymap.set('n', '<leader>ff', "<cmd>FzfLua files<CR>", { desc = "Fuzzy Find Files" })

lua/mini.lua

@@ -3,6 +3,7 @@ require('mini.comment').setup()
 require('mini.surround').setup()
 require('mini.icons').setup()
 
+-- Notifications
 require('mini.notify').setup({
  -- only show messages
  content = {
@@ -12,10 +13,12 @@ require('mini.notify').setup({
  },
 })
 
+-- Commandline
 require('mini.cmdline').setup({
   autocorrect = { enable = false }
 })
 
+-- Autocompletion
 local MiniCompletion = require('mini.completion')
 MiniCompletion.setup({
   lsp_completion = {

lua/settings.lua

@@ -10,39 +10,15 @@ vim.o.tabstop = 2
 vim.o.shiftwidth = 2
 vim.o.expandtab = true
 vim.o.breakindent = true
+vim.o.smartindent = true
 vim.o.undofile = true
-vim.o.swapfile = false 
+vim.o.swapfile = false
 vim.o.backup = false
 
 vim.o.clipboard = 'unnamedplus'
 
-vim.keymap.set('n', '<leader>o', ':update<CR> :source<CR>')
-vim.keymap.set('n', '<ESC>', "<cmd>nohlsearch<CR>")
-vim.keymap.set('n', '<leader>lf', vim.lsp.buf.format)
-
-vim.keymap.set({ 'n', 'v', 'x' }, '<leader>y', '"+y<CR>')
-vim.keymap.set({ 'n', 'v', 'x' }, '<leader>d', '"+d<CR>')
-
--- delete without yanking
-vim.keymap.set("n", "d", '"_d', opts)
-vim.keymap.set("v", "d", '"_d', opts)
-vim.keymap.set("n", "x", '"_x', opts)
-vim.keymap.set("n", "D", '"_D', opts)
-
--- delete with leader to yank
-vim.keymap.set("n", "<leader>d", '""d')
-vim.keymap.set("n", "<leader>D", '""D')
-vim.keymap.set("v", "<leader>d", '""d')
-
--- Plugin Keybinds
-vim.keymap.set('n', '<leader>e', '<cmd>Oil<CR>', { desc = "Open parent directory" })
-vim.keymap.set('n', '<leader>D', '<cmd>Alpha<CR>', { desc = "Open dashboard" })
-
--- Fuzzy find files and open them (or their directory in Oil)
-vim.keymap.set('n', '<leader>ff', "<cmd>FzfLua files<CR>", { desc = "Fuzzy Find Files" })
-
 vim.o.autocomplete = true
-vim.opt.completeopt = { 'menuone', 'noselect' }
+vim.opt.completeopt = { 'menuone', 'noselect', 'noinsert' }
 vim.opt.shortmess:append('c')
 
 vim.keymap.set('n', 'gl', vim.diagnostic.open_float)
@@ -54,13 +30,12 @@ vim.g.vimtex_view_method = "zathura"
 vim.cmd("filetype plugin indent on")
 
 vim.api.nvim_create_autocmd('LspAttach', {
-      group = vim.api.nvim_create_augroup('my.lsp', {}),
+  group = vim.api.nvim_create_augroup('my.lsp', {}),
-      callback = function(ev)
+  callback = function(ev)
-        local client = assert(vim.lsp.get_client_by_id(ev.data.client_id))
+    local client = assert(vim.lsp.get_client_by_id(ev.data.client_id))
-        if client:supports_method('textDocument/completion') then
+    if client:supports_method('textDocument/completion') then
-          vim.lsp.completion.enable(true, client.id, ev.buf, {autotrigger = true})
+      vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true })
-        end
+    end
-      end,
+  end,
-    })
+})
 vim.cmd("syntax enable")
-