diff options
-rw-r--r-- | lua/default-config.lua | 59 | ||||
-rw-r--r-- | lua/lv-utils/init.lua | 56 | ||||
-rw-r--r-- | utils/installer/lv-config.example.lua | 2 |
3 files changed, 64 insertions, 53 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua index cd49c136..830a77d4 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -4,6 +4,7 @@ CACHE_PATH = vim.fn.stdpath "cache" TERMINAL = vim.fn.expand "$TERMINAL" O = { + auto_close_tree = 0, auto_complete = true, colorscheme = "lunar", @@ -76,6 +77,10 @@ O = { tabnine = { active = false }, }, + user_autocommands = { + { "FileType", "qf", "set nobuflisted" }, + }, + lang = { python = { linter = "", @@ -247,56 +252,4 @@ O = { }, } --- TODO find a new home for these autocommands -require("lv-utils").define_augroups { - _general_settings = { - { - "TextYankPost", - "*", - "lua require('vim.highlight').on_yank({higroup = 'Search', timeout = 200})", - }, - { - "BufWinEnter", - "*", - "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", - }, - { - "BufRead", - "*", - "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", - }, - { - "BufNewFile", - "*", - "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", - }, - { "VimLeavePre", "*", "set title set titleold=" }, - { "FileType", "qf", "set nobuflisted" }, - }, - -- _solidity = { - -- {'BufWinEnter', '.sol', 'setlocal filetype=solidity'}, {'BufRead', '*.sol', 'setlocal filetype=solidity'}, - -- {'BufNewFile', '*.sol', 'setlocal filetype=solidity'} - -- }, - -- _gemini = { - -- {'BufWinEnter', '.gmi', 'setlocal filetype=markdown'}, {'BufRead', '*.gmi', 'setlocal filetype=markdown'}, - -- {'BufNewFile', '*.gmi', 'setlocal filetype=markdown'} - -- }, - _markdown = { - { "FileType", "markdown", "setlocal wrap" }, - { "FileType", "markdown", "setlocal spell" }, - }, - _buffer_bindings = { - { "FileType", "floaterm", "nnoremap <silent> <buffer> q :q<CR>" }, - }, - _auto_resize = { - -- will cause split windows to be resized evenly if main window is resized - {'VimResized ', '*', 'wincmd ='}, - }, - _mode_switching = { - -- will switch between absolute and relative line numbers depending on mode - {'InsertEnter', '*', 'if &relativenumber | let g:ms_relativenumberoff = 1 | setlocal number norelativenumber | endif'}, - {'InsertLeave', '*', 'if exists("g:ms_relativenumberoff") | setlocal relativenumber | endif'}, - {'InsertEnter', '*', 'if &cursorline | let g:ms_cursorlineoff = 1 | setlocal nocursorline | endif'}, - {'InsertLeave', '*', 'if exists("g:ms_cursorlineoff") | setlocal cursorline | endif'}, - }, -} + diff --git a/lua/lv-utils/init.lua b/lua/lv-utils/init.lua index c836af97..db3deb87 100644 --- a/lua/lv-utils/init.lua +++ b/lua/lv-utils/init.lua @@ -22,4 +22,60 @@ function lv_utils.define_augroups(definitions) -- {{{1 end end +lv_utils.define_augroups { + + _user_autocommands = O.user_autocommands, + _general_settings = { + { + "TextYankPost", + "*", + "lua require('vim.highlight').on_yank({higroup = 'Search', timeout = 200})", + }, + { + "BufWinEnter", + "*", + "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", + }, + { + "BufRead", + "*", + "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", + }, + { + "BufNewFile", + "*", + "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", + }, + { "VimLeavePre", "*", "set title set titleold=" }, + }, + -- _solidity = { + -- {'BufWinEnter', '.sol', 'setlocal filetype=solidity'}, {'BufRead', '*.sol', 'setlocal filetype=solidity'}, + -- {'BufNewFile', '*.sol', 'setlocal filetype=solidity'} + -- }, + -- _gemini = { + -- {'BufWinEnter', '.gmi', 'setlocal filetype=markdown'}, {'BufRead', '*.gmi', 'setlocal filetype=markdown'}, + -- {'BufNewFile', '*.gmi', 'setlocal filetype=markdown'} + -- }, + _markdown = { + { "FileType", "markdown", "setlocal wrap" }, + { "FileType", "markdown", "setlocal spell" }, + }, + _buffer_bindings = { + { "FileType", "floaterm", "nnoremap <silent> <buffer> q :q<CR>" }, + }, + _auto_resize = { + -- will cause split windows to be resized evenly if main window is resized + {'VimResized ', '*', 'wincmd ='}, + }, + -- _mode_switching = { + -- -- will switch between absolute and relative line numbers depending on mode + -- {'InsertEnter', '*', 'if &relativenumber | let g:ms_relativenumberoff = 1 | setlocal number norelativenumber | endif'}, + -- {'InsertLeave', '*', 'if exists("g:ms_relativenumberoff") | setlocal relativenumber | endif'}, + -- {'InsertEnter', '*', 'if &cursorline | let g:ms_cursorlineoff = 1 | setlocal nocursorline | endif'}, + -- {'InsertLeave', '*', 'if exists("g:ms_cursorlineoff") | setlocal cursorline | endif'}, + -- }, +} + return lv_utils + +-- TODO find a new home for these autocommands diff --git a/utils/installer/lv-config.example.lua b/utils/installer/lv-config.example.lua index c68a9bda..ba4bedb2 100644 --- a/utils/installer/lv-config.example.lua +++ b/utils/installer/lv-config.example.lua @@ -97,6 +97,8 @@ O.lang.php.filetypes = { "php", "phtml" } -- TODO Autocommands -- https://neovim.io/doc/user/autocmd.html +-- local test = { "BufWinEnter", "*", "echo \"hi again\""} +-- table.insert(O.user_autocommands, test) -- TODO Additional Plugins |