remove obsolete config and autoformat

init.lua

@@ -5,6 +5,5 @@ vim.g.mapleader = ' '
 require('settings')
 require('plugins')
 require('lsp')
-require('filetypes')
 require('theme')
 require('keymappings')

lua/filetypes.lua

@@ -1,4 +0,0 @@
-vim.cmd([[
-    autocmd BufRead,BufNewFile *.bu set filetype=yaml
-    autocmd BufRead,BufNewFile *.ign set filetype=json
-]])

lua/lsp.lua

@@ -13,6 +13,9 @@ local on_attach = function(client, bufnr)
     utils.map("n", "<leader>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>")
     utils.map("n", "<leader>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>")
 
+    -- use vim's default coloring
+    client.server_capabilities.semanticTokensProvider = nil
+
     if client.supports_method("textDocument/formatting") then
         vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
         vim.api.nvim_create_autocmd("BufWritePre", {
@@ -41,7 +44,7 @@ local servers = {
     "vimls",
 }
 for _, lsp in ipairs(servers) do
-    nvim_lsp[lsp].setup {capabilities = capabilities, on_attach = on_attach}
+    nvim_lsp[lsp].setup { capabilities = capabilities, on_attach = on_attach }
 end
 
 nvim_lsp.rust_analyzer.setup({

lua/plugins/cmp.lua

@@ -69,24 +69,26 @@ cmp.setup({
         ['<C-f>'] = cmp.mapping.scroll_docs(4),
         ['<C-x><C-o>'] = cmp.mapping.complete(),
         ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+        -- Accept currently selected item.
+        -- Set `select` to `false` to only confirm explicitly selected items.
+        ['<CR>'] = cmp.mapping.confirm({ select = false }),
     }),
     sources = cmp.config.sources({
         { name = 'nvim_lsp' },
-      { name = 'luasnip' }, -- For luasnip users.
+        { name = 'luasnip' },
     }, {
         { name = 'buffer' },
     })
 })
 
 -- Set configuration for specific filetype.
---cmp.setup.filetype('gitcommit', {
+cmp.setup.filetype('gitcommit', {
---    sources = cmp.config.sources({
+    sources = cmp.config.sources({
---        { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
+        { name = 'git' },
---    }, {
+    }, {
---        { name = 'buffer' },
+        { name = 'buffer' },
---    })
+    })
---})
+})
 
 -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
 cmp.setup.cmdline({ '/', '?' }, {

lua/plugins/gitsigns.lua

@@ -13,30 +13,30 @@ require('gitsigns').setup {
             if vim.wo.diff then return ']c' end
             vim.schedule(function() gs.next_hunk() end)
             return '<Ignore>'
-    end, {expr=true})
+        end, { expr = true })
 
         map('n', '[c', function()
             if vim.wo.diff then return '[c' end
             vim.schedule(function() gs.prev_hunk() end)
             return '<Ignore>'
-    end, {expr=true})
+        end, { expr = true })
 
         -- Actions
         map('n', '<leader>hs', gs.stage_hunk)
         map('n', '<leader>hr', gs.reset_hunk)
-    map('v', '<leader>hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+        map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
-    map('v', '<leader>hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+        map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
         map('n', '<leader>hS', gs.stage_buffer)
         map('n', '<leader>hu', gs.undo_stage_hunk)
         map('n', '<leader>hR', gs.reset_buffer)
         map('n', '<leader>hp', gs.preview_hunk)
-    map('n', '<leader>hb', function() gs.blame_line{full=true} end)
+        map('n', '<leader>hb', function() gs.blame_line { full = true } end)
         map('n', '<leader>tb', gs.toggle_current_line_blame)
         map('n', '<leader>hd', gs.diffthis)
         map('n', '<leader>hD', function() gs.diffthis('~') end)
         map('n', '<leader>td', gs.toggle_deleted)
 
         -- Text object
-    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
     end
 }

lua/plugins/init.lua

@@ -1,16 +1,15 @@
 require('plugins.packer_setup')
 
 require('packer').startup(function()
-
     -- Packer can manage itself as an optional plugin
-  use {'wbthomason/packer.nvim', opt = true }
+    use { 'wbthomason/packer.nvim', opt = true }
 
     -- Fuzzy finder
     use {
         'nvim-telescope/telescope.nvim',
         requires = {
-          {'nvim-lua/popup.nvim'},
+            { 'nvim-lua/popup.nvim' },
-          {'nvim-lua/plenary.nvim'},
+            { 'nvim-lua/plenary.nvim' },
         }
     }
 
@@ -25,7 +24,7 @@ require('packer').startup(function()
         }
     }
     use { 'L3MON4D3/LuaSnip',
-      config = function ()
+        config = function()
             local snippet_path = os.getenv("HOME") .. "/.config/nvim/snippets/"
             if not vim.tbl_contains(vim.opt.rtp:get(), snippet_path) then
                 vim.opt.rtp:append(snippet_path)
@@ -82,7 +81,6 @@ require('packer').startup(function()
     -- Misc
     use { 'jbyuki/venn.nvim' } -- ascii diagrams
     use { 'hashivim/vim-terraform' }
-
 end)
 
 require('plugins.cmp')

lua/plugins/neogit.lua

@@ -1,5 +1,5 @@
 local neogit = require('neogit')
 
-neogit.setup { }
+neogit.setup {}
 
 vim.keymap.set('n', '<C-x><C-g>', neogit.open, {})

lua/plugins/packer_setup.lua

@@ -1,7 +1,7 @@
 -- Auto install packer.nvim if not exists
-local install_path = vim.fn.stdpath('data')..'/site/pack/packer/opt/packer.nvim'
+local install_path = vim.fn.stdpath('data') .. '/site/pack/packer/opt/packer.nvim'
 if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
-  vim.api.nvim_command('!git clone https://github.com/wbthomason/packer.nvim '..install_path)
+    vim.api.nvim_command('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path)
 end
 
 vim.cmd [[packadd packer.nvim]]

lua/plugins/venn.lua

@@ -3,19 +3,20 @@ function _G.Toggle_venn()
     local venn_enabled = vim.inspect(vim.b.venn_enabled)
     if venn_enabled == "nil" then
         vim.b.venn_enabled = true
-        vim.cmd[[setlocal ve=all]]
+        vim.cmd [[setlocal ve=all]]
         -- draw a line on HJKL keystokes
-        vim.api.nvim_buf_set_keymap(0, "n", "J", "<C-v>j:VBox<CR>", {noremap = true})
+        vim.api.nvim_buf_set_keymap(0, "n", "J", "<C-v>j:VBox<CR>", { noremap = true })
-        vim.api.nvim_buf_set_keymap(0, "n", "K", "<C-v>k:VBox<CR>", {noremap = true})
+        vim.api.nvim_buf_set_keymap(0, "n", "K", "<C-v>k:VBox<CR>", { noremap = true })
-        vim.api.nvim_buf_set_keymap(0, "n", "L", "<C-v>l:VBox<CR>", {noremap = true})
+        vim.api.nvim_buf_set_keymap(0, "n", "L", "<C-v>l:VBox<CR>", { noremap = true })
-        vim.api.nvim_buf_set_keymap(0, "n", "H", "<C-v>h:VBox<CR>", {noremap = true})
+        vim.api.nvim_buf_set_keymap(0, "n", "H", "<C-v>h:VBox<CR>", { noremap = true })
         -- draw a box by pressing "f" with visual selection
-        vim.api.nvim_buf_set_keymap(0, "v", "f", ":VBox<CR>", {noremap = true})
+        vim.api.nvim_buf_set_keymap(0, "v", "f", ":VBox<CR>", { noremap = true })
     else
-        vim.cmd[[setlocal ve=]]
+        vim.cmd [[setlocal ve=]]
-        vim.cmd[[mapclear <buffer>]]
+        vim.cmd [[mapclear <buffer>]]
         vim.b.venn_enabled = nil
     end
 end
+
 -- toggle keymappings for venn using <leader>v
-vim.api.nvim_set_keymap('n', '<leader>v', ":lua Toggle_venn()<CR>", { noremap = true})
+vim.api.nvim_set_keymap('n', '<leader>v', ":lua Toggle_venn()<CR>", { noremap = true })

lua/settings.lua

@@ -33,3 +33,9 @@ vim.opt.undofile = true
 -- Enable vimrc files per project and disable unsafe commands in project vimrc
 vim.opt.exrc = true
 vim.opt.secure = true
+
+-- unknown filetypes mappings
+vim.cmd([[
+    autocmd BufRead,BufNewFile *.bu set filetype=yaml
+    autocmd BufRead,BufNewFile *.ign set filetype=json
+]])

lua/utils.lua

@@ -1,6 +1,6 @@
-local utils = { }
+local utils = {}
 
-local scopes = {o = vim.o, b = vim.bo, w = vim.wo}
+local scopes = { o = vim.o, b = vim.bo, w = vim.wo }
 
 function utils.opt(scope, key, value)
     scopes[scope][key] = value