move all plugin related code to plugins module

lua/plugins/cmp.lua

@@ -0,0 +1,71 @@
+-- Completion plugin config
+
+local utils = require('utils')
+
+--vim.cmd [[set shortmess+=c]]
+--utils.opt('o', 'completeopt', 'menuone,noselect')
+
+local cmp = require('cmp')
+
+cmp.setup({
+    snippet = {
+      -- REQUIRED - you must specify a snippet engine
+      expand = function(args)
+        vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+        -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+        -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+        -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+      end,
+    },
+    window = {
+      completion = cmp.config.window.bordered(),
+      documentation = cmp.config.window.bordered(),
+    },
+    completion = {
+        autocomplete = false,
+    },
+    mapping = cmp.mapping.preset.insert({
+      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+      ['<C-f>'] = cmp.mapping.scroll_docs(4),
+      ['<C-n>'] = cmp.mapping.complete(),
+      ['<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.
+    }),
+    sources = cmp.config.sources({
+      { name = 'nvim_lsp' },
+      { name = 'vsnip' }, -- For vsnip users.
+      -- { name = 'luasnip' }, -- For luasnip users.
+      -- { name = 'ultisnips' }, -- For ultisnips users.
+      -- { name = 'snippy' }, -- For snippy users.
+    }, {
+      { name = 'buffer' },
+    })
+})
+
+-- Set configuration for specific filetype.
+cmp.setup.filetype('gitcommit', {
+    sources = cmp.config.sources({
+        { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
+    }, {
+        { name = 'buffer' },
+    })
+})
+
+-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ '/', '?' }, {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = {
+        { name = 'buffer' }
+    }
+})
+
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+    mapping = cmp.mapping.preset.cmdline(),
+    sources = cmp.config.sources({
+        { name = 'path' }
+    }, {
+        { name = 'cmdline' }
+    })
+})

lua/plugins/init.lua

@@ -0,0 +1,57 @@
+require('packer').startup(function()
+
+  -- Packer can manage itself as an optional plugin
+  use {'wbthomason/packer.nvim', opt = true }
+
+  -- Fuzzy finder
+  use {
+      'nvim-telescope/telescope.nvim',
+      requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}}
+  }
+
+  -- Autocomplete and snippets
+  use {
+      'hrsh7th/nvim-cmp',
+      requires = {
+          { 'hrsh7th/cmp-nvim-lsp' },
+          { 'hrsh7th/cmp-buffer' },
+          { 'hrsh7th/cmp-path' },
+          { 'hrsh7th/cmp-cmdline' },
+          { 'hrsh7th/vim-vsnip' },
+          { 'hrsh7th/vim-vsnip-integ' },
+      }
+  }
+
+  -- Statusbar, colors and syntax
+  use { 'jacoborus/tender.vim' }
+  use { 'nvim-treesitter/nvim-treesitter' }
+  use { 'vim-airline/vim-airline' }
+  use { 'vim-airline/vim-airline-themes' }
+
+  -- LSP and related
+  use { 'neovim/nvim-lspconfig' }
+  use { 'weilbith/nvim-code-action-menu', cmd = 'CodeActionMenu' }
+  use { 'folke/trouble.nvim' } -- lsp diagnostics
+
+  -- Languages
+  use { 'cespare/vim-toml' }
+  use { 'gleam-lang/gleam.vim' }
+  use { 'rust-lang/rust.vim' }
+  use { 'tjdevries/nlua.nvim' }
+
+  -- Git
+  use { 'tpope/vim-fugitive' }
+
+  -- Filesystem in a nvim buffer
+  use { 'stevearc/oil.nvim' }
+
+  -- Misc
+  use { 'RRethy/vim-illuminate' } -- highlight all words same as the one under cursor
+  use { 'vim-scripts/DrawIt' } -- ascii diagrams
+  use { 'nathom/filetype.nvim' }
+end)
+
+require('plugins.cmp')
+require('plugins.treesitter')
+require('plugins.telescope')
+require('plugins.oil')

lua/plugins/oil.lua

@@ -0,0 +1,132 @@
+require('oil').setup({
+    default_file_explorer = true,
+    -- Id is automatically added at the beginning, and name at the end
+    -- See :help oil-columns
+    columns = {
+        "icon",
+        -- "permissions",
+        -- "size",
+        -- "mtime",
+    },
+    -- Buffer-local options to use for oil buffers
+    buf_options = {
+        buflisted = false,
+        bufhidden = "hide",
+    },
+    -- Window-local options to use for oil buffers
+    win_options = {
+        wrap = false,
+        signcolumn = "no",
+        cursorcolumn = false,
+        foldcolumn = "0",
+        spell = false,
+        list = false,
+        conceallevel = 3,
+        concealcursor = "nvic",
+    },
+    -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash)
+    delete_to_trash = false,
+    -- Skip the confirmation popup for simple operations
+    skip_confirm_for_simple_edits = false,
+    -- Change this to customize the command used when deleting to trash
+    trash_command = "trash-put",
+    -- Selecting a new/moved/renamed file or directory will prompt you to save changes first
+    prompt_save_on_select_new_entry = true,
+    -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap
+    -- options with a `callback` (e.g. { callback = function() ... end, desc = "", nowait = true })
+    -- Additionally, if it is a string that matches "actions.<name>",
+    -- it will use the mapping at require("oil.actions").<name>
+    -- Set to `false` to remove a keymap
+    -- See :help oil-actions for a list of all available actions
+    keymaps = {
+        ["g?"] = "actions.show_help",
+        ["<CR>"] = "actions.select",
+        ["<C-s>"] = "actions.select_vsplit",
+        ["<C-h>"] = "actions.select_split",
+        ["<C-t>"] = "actions.select_tab",
+        ["<C-p>"] = "actions.preview",
+        ["<C-c>"] = "actions.close",
+        ["<C-l>"] = "actions.refresh",
+        ["-"] = "actions.parent",
+        ["_"] = "actions.open_cwd",
+        ["`"] = "actions.cd",
+        ["~"] = "actions.tcd",
+        ["gs"] = "actions.change_sort",
+        ["gx"] = "actions.open_external",
+        ["g."] = "actions.toggle_hidden",
+    },
+    -- Set to false to disable all of the above keymaps
+    use_default_keymaps = true,
+    view_options = {
+        -- Show files and directories that start with "."
+        show_hidden = false,
+        -- This function defines what is considered a "hidden" file
+        is_hidden_file = function(name, bufnr)
+            return vim.startswith(name, ".")
+        end,
+        -- This function defines what will never be shown, even when `show_hidden` is set
+        is_always_hidden = function(name, bufnr)
+            return false
+        end,
+        sort = {
+            -- sort order can be "asc" or "desc"
+            -- see :help oil-columns to see which columns are sortable
+            { "type", "asc" },
+            { "name", "asc" },
+        },
+    },
+    -- Configuration for the floating window in oil.open_float
+    float = {
+        -- Padding around the floating window
+        padding = 2,
+        max_width = 0,
+        max_height = 0,
+        border = "rounded",
+        win_options = {
+            winblend = 0,
+        },
+        -- This is the config that will be passed to nvim_open_win.
+        -- Change values here to customize the layout
+        override = function(conf)
+            return conf
+        end,
+    },
+    -- Configuration for the actions floating preview window
+    preview = {
+        -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
+        -- min_width and max_width can be a single value or a list of mixed integer/float types.
+        -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total"
+        max_width = 0.9,
+        -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total"
+        min_width = { 40, 0.4 },
+        -- optionally define an integer/float for the exact width of the preview window
+        width = nil,
+        -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
+        -- min_height and max_height can be a single value or a list of mixed integer/float types.
+        -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total"
+        max_height = 0.9,
+        -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total"
+        min_height = { 5, 0.1 },
+        -- optionally define an integer/float for the exact height of the preview window
+        height = nil,
+        border = "rounded",
+        win_options = {
+            winblend = 0,
+        },
+    },
+    -- Configuration for the floating progress window
+    progress = {
+        max_width = 0.9,
+        min_width = { 40, 0.4 },
+        width = nil,
+        max_height = { 10, 0.9 },
+        min_height = { 5, 0.1 },
+        height = nil,
+        border = "rounded",
+        minimized_border = "none",
+        win_options = {
+            winblend = 0,
+        },
+    },
+
+})

lua/plugins/telescope.lua

@@ -0,0 +1,19 @@
+local builtin = require('telescope.builtin')
+
+local find_files_workspace = function()
+    builtin.find_files({
+        search_dirs = vim.lsp.buf.list_workspace_folders(),
+        prompt_prefix = "🔍",
+    })
+end
+local live_grep_workspace = function()
+    builtin.live_grep({
+        search_dirs = vim.lsp.buf.list_workspace_folders(),
+    })
+end
+
+vim.keymap.set('n', '<leader>ff', find_files_workspace, {})
+vim.keymap.set('n', '<leader>fg', live_grep_workspace, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+vim.keymap.set('n', '<leader>fl', builtin.git_files, {})

lua/plugins/treesitter.lua

@@ -0,0 +1,19 @@
+require('nvim-treesitter.configs').setup {
+  ensure_installed = { "lua", "rust", "elm", "python", "yaml", "toml" },
+  auto_install = true,
+  highlight = {
+    enable = true,
+    additional_vim_regex_highlighting=false,
+  },
+  ident = {
+      enable = true,
+  },
+  rainbow = {
+    enable = true,
+    extended_mode = false,
+    max_file_lines = nil,
+  }
+}
+
+vim.api.nvim_set_hl(0, "@variable", { })
+vim.api.nvim_set_hl(0, "@parameter", { })