diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lspconfigconf.lua | 53 | ||||
| -rw-r--r-- | lua/nvimlintconf.lua | 34 | ||||
| -rw-r--r-- | lua/settings.lua | 115 | ||||
| -rw-r--r-- | lua/telescopeconf.lua | 52 | ||||
| -rw-r--r-- | lua/treesitterconf.lua | 18 |
5 files changed, 0 insertions, 272 deletions
diff --git a/lua/lspconfigconf.lua b/lua/lspconfigconf.lua deleted file mode 100644 index 2272bf0..0000000 --- a/lua/lspconfigconf.lua +++ /dev/null @@ -1,53 +0,0 @@ -local nvim_lsp = require('lspconfig') - ---nvim_lsp.pylsp.setup{} -local present, ts_config = pcall(require, "nvim-treesitter.configs") -if not present then - return -end - --- Use an on_attach function to only map the following keys --- after the language server attaches to the current buffer -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - - -- Enable completion triggered by <c-x><c-o> - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - local opts = { noremap=true, silent=true } - - -- See `:help vim.lsp.*` for documentation on any of the below functions - buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) - buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) - buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) - buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) - buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) - buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) - buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) - buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) - buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) - buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) - buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts) - buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) - buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts) - buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts) - buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) - buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) - buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts) - -end - --- Use a loop to conveniently call 'setup' on multiple servers and --- map buffer local keybindings when the language server attaches --- local servers = { 'pyls', 'rust_analyzer', 'tsserver' } -local servers = { 'pylsp' } -for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - on_attach = on_attach, - flags = { - debounce_text_changes = 150, - } - } -end diff --git a/lua/nvimlintconf.lua b/lua/nvimlintconf.lua deleted file mode 100644 index 026ebe1..0000000 --- a/lua/nvimlintconf.lua +++ /dev/null @@ -1,34 +0,0 @@ -local null_ls = require("null-ls") -local helpers = require("null-ls.helpers") - -local blacklint = { - method = null_ls.methods.DIAGNOSTICS, - filetypes = { "python" }, - -- null_ls.generator creates an async source - -- that spawns the command with the given arguments and options - generator = null_ls.generator({ - command = "black", - args = { "--stdin" }, - to_stdin = true, - from_stderr = true, - -- choose an output format (raw, json, or line) - format = "line", - check_exit_code = function(code) - return code <= 1 - end, - -- use helpers to parse the output from string matchers, - -- or parse it manually with a function - on_output = helpers.diagnostics.from_patterns({ - { - pattern = [[:(%d+):(%d+) [%w-/]+ (.*)]], - groups = { "row", "col", "message" }, - }, - { - pattern = [[:(%d+) [%w-/]+ (.*)]], - groups = { "row", "message" }, - }, - }), - }), -} - -null_ls.register(blacklint) diff --git a/lua/settings.lua b/lua/settings.lua deleted file mode 100644 index 4e0b209..0000000 --- a/lua/settings.lua +++ /dev/null @@ -1,115 +0,0 @@ ---[[ -Todo - -https://dev.to/voyeg3r/writing-useful-lua-functions-to-my-neovim-14ki -function to remove whitespace and preserve spot on save - - - - - -]]-- -local o = vim.o -local g = vim.g -local cmd = vim.cmd -local map = vim.api.nvim_set_keymap - --- https://old.reddit.com/r/neovim/comments/lrz18i/how_to_change_colorscheme_in_lua_without_any/ -g.colors_name = "nord" - --- Set up spacebar as leader -map('n', '<Space>', '', {}) -vim.g.mapleader = ' ' - --- Set spaces > tabs, 4 as default -o.expandtab = true -o.tabstop = 4 -o.shiftwidth = 0 - -o.wrap = false -o.history = 1000 --- Wildmode show list, complete to first result -o.wildignore = "*/app/cache,*/vendor,*/env,*.pyc,*/venv,*/__pycache__,*/venv" -o.splitright = true -o.splitbelow = true -o.spelllang = "en_ca" - - -local highlights = { - "Search ctermfg=166", - "DiffAdd cterm=BOLD ctermfg=NONE ctermbg=22", - "DiffDelete cterm=BOLD ctermfg=NONE ctermbg=52", - "DiffChange cterm=BOLD ctermfg=NONE ctermbg=23", - "DiffText cterm=BOLD ctermfg=NONE ctermbg=23", - "Normal guibg=NONE ctermbg=NONE", - "Search ctermbg=None ctermfg=166", - "PrimaryBlock ctermfg=06 ctermbg=NONE", - "SecondaryBlock ctermfg=06 ctermbg=NONE", - "Blanks ctermfg=07 ctermbg=NONE", - "ColorColumn ctermbg=cyan", -} -for i, highlight in ipairs(highlights) do - cmd('au VimEnter * hi ' .. highlight) -end - --- Along with the highlight definition for ColorColumn above, these options --- will set colored marks at certain line lengths -cmd([[au BufEnter *.py let w:m1=matchadd('ColorColumn', '\%81v', 100)]]) -cmd([[au BufEnter *.py let w:m2=matchadd('Error', '\%121v', 100)]]) -cmd([[au BufLeave *.py call clearmatches()"]]) - - - -options = { noremap = true } - -map('n', '<leader>y', ':let @+=@0<cr>', options) -map('n', '<leader><leader>', ':noh<cr>', options) -map('i', 'jj', '<esc>', options) -map('n', 'gp', "`[v`]", options) - - - --- Status Line -local mode_map = { - ['n'] = 'normal', - ['no'] = 'n·operator pending', - ['v'] = 'visual', - ['V'] = 'v·line', - [''] = 'v·block', - ['s'] = 'select', - ['S'] = 's·line', - [''] = 's·block', - ['i'] = 'insert', - ['R'] = 'replace', - ['Rv'] = 'v·replace', - ['c'] = 'command', - ['cv'] = 'vim ex', - ['ce'] = 'ex', - ['r'] = 'prompt', - ['rm'] = 'more', - ['r?'] = 'confirm', - ['!'] = 'shell', - ['t'] = 'terminal' -} - -local function mode() - local m = vim.api.nvim_get_mode().mode - if mode_map[m] == nil then return m end - return '[' .. mode_map[m] .. '] ' -end - -local stl = { - '%#PrimaryBlock#', - mode(), - '%#SecondaryBlock#', - '%#Blanks#', - '%f', - '%m', - '%=', - '%#SecondaryBlock#', - '%l,%c ', - '%#PrimaryBlock#', - '%{&filetype}', -} - -o.statusline = table.concat(stl) diff --git a/lua/telescopeconf.lua b/lua/telescopeconf.lua deleted file mode 100644 index a589d4f..0000000 --- a/lua/telescopeconf.lua +++ /dev/null @@ -1,52 +0,0 @@ -local actions = require "telescope.actions" - -require('telescope').setup{ - defaults = { - mappings = { - i = { - ["<esc>"] = actions.close, - ['<C-u>'] = false, - }, - }, - vimgrep_arguments = { - 'rg', - '--color=never', - '--no-heading', - '--with-filename', - '--line-number', - '--column', - '--smart-case' - }, - prompt_prefix = "> ", - selection_caret = "> ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "descending", - layout_strategy = "horizontal", - layout_config = { - horizontal = { - mirror = false, - }, - vertical = { - mirror = false, - }, - }, - file_sorter = require'telescope.sorters'.get_fuzzy_file, - file_ignore_patterns = {}, - generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, - winblend = 0, - border = {}, - borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' }, - color_devicons = true, - use_less = true, - path_display = {}, - set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil, - file_previewer = require'telescope.previewers'.vim_buffer_cat.new, - grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, - qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, - - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker - } -} diff --git a/lua/treesitterconf.lua b/lua/treesitterconf.lua deleted file mode 100644 index ae491bb..0000000 --- a/lua/treesitterconf.lua +++ /dev/null @@ -1,18 +0,0 @@ -local present, ts_config = pcall(require, "nvim-treesitter.configs") -if not present then - return -end - -ts_config.setup { - ensure_installed = { - "python", - "lua", - "nix", - }, - highlight = { - enable = true, - }, - indent = { - enable = true, - } -} |