diff options
Diffstat (limited to 'home-configuration/config/nvim/lua')
6 files changed, 140 insertions, 338 deletions
diff --git a/home-configuration/config/nvim/lua/config.lua b/home-configuration/config/nvim/lua/config.lua index 9835875..2100a6c 100755 --- a/home-configuration/config/nvim/lua/config.lua +++ b/home-configuration/config/nvim/lua/config.lua @@ -4,6 +4,11 @@ local g = vim.g --filetypes vim.cmd("autocmd BufRead,BufNewFile *.m set filetype=objc") +vim.filetype.add({ + filename = { + ["cgitrc"] = "dosini", + }, +}) g.mapleader = " " @@ -21,8 +26,11 @@ opt.relativenumber = true opt.fillchars = "eob: " -g.loaded_netrw = 1 -g.loaded_netrwPlugin = 1 +--g.loaded_netrw = 1 +--g.loaded_netrwPlugin = 1 +vim.g.netrw_liststyle = 3 + +vim.cmd("let g:netrw_banner = 0") opt.termguicolors = true @@ -33,9 +41,9 @@ opt.shell = "/usr/bin/zsh" vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config) - config = config or {} - config.border = "single" - return vim.lsp.handlers.hover(err, result, ctx, config) + config = config or {} + config.border = "single" + return vim.lsp.handlers.hover(err, result, ctx, config) end vim.diagnostic.config({ float = { border = "single" } }) @@ -82,8 +90,16 @@ map("n", "<leader>ff", builtin.find_files, {}) map("n", "<leader>fg", builtin.live_grep, {}) map("n", "<leader>fb", builtin.buffers, {}) map("n", "<leader>fh", builtin.help_tags, {}) -local treeapi = require("nvim-tree.api") -map("n", "<leader>e", treeapi.tree.toggle, {}) +--local treeapi = require("nvim-tree.api") +--map("n", "<leader>e", treeapi.tree.toggle, {}) map("n", "<A-i>", '<CMD>lua require("FTerm").toggle()<CR>') map("t", "<A-i>", '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>') + +map("n", "n", "nzzzv") +map("n", "n", "Nzzzv") +map("n", "<", "<gv", opts) +map("n", ">", ">gv", opts) +map("i", "<C-c>", "<ESC>") +map("n", "<C-c>", ":nohl<CR>", { desc = "Clear search hl", silent = true }) +map("n", "x", "_x", opts) diff --git a/home-configuration/config/nvim/lua/plugins/catppuccin/init.lua b/home-configuration/config/nvim/lua/plugins/catppuccin/init.lua index c497b4d..2137248 100755 --- a/home-configuration/config/nvim/lua/plugins/catppuccin/init.lua +++ b/home-configuration/config/nvim/lua/plugins/catppuccin/init.lua @@ -67,24 +67,3 @@ require("lualine").setup({ }, }, }) - -require("nvim-tree").setup({ - view = { - width = 30, - side = "left", - }, - renderer = { - highlight_git = true, - root_folder_modifier = ":~", - icons = { - show = { - file = true, - folder = true, - git = true, - }, - }, - }, - filters = { - dotfiles = false, - }, -}) diff --git a/home-configuration/config/nvim/lua/plugins/conform/init.lua b/home-configuration/config/nvim/lua/plugins/conform/init.lua new file mode 100644 index 0000000..374ed55 --- /dev/null +++ b/home-configuration/config/nvim/lua/plugins/conform/init.lua @@ -0,0 +1,17 @@ +require("conform").setup({ + formatters_by_ft = { + haskell = { "ormolu" }, + }, + formatters = { + ormolu = { + command = "ormolu", + args = { "--stdin-input-file", "$FILENAME" }, + stdin = true, + }, + }, + format_on_save = { timeout_ms = 2000, lsp_format = "never" }, +}) + +vim.keymap.set({ "n", "v" }, "<leader>f", function() + require("conform").format({ async = true, lsp_format = "never" }) +end) diff --git a/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua b/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua index 75b873a..4afee21 100755 --- a/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua +++ b/home-configuration/config/nvim/lua/plugins/lazy/plugins.lua @@ -2,15 +2,27 @@ return { "andweeb/presence.nvim", "catppuccin/nvim", "neovim/nvim-lspconfig", + "gentoo/gentoo-syntax", "williamboman/mason.nvim", + "stevearc/conform.nvim", { - "nvim-telescope/telescope.nvim", - tag = "0.1.5", - dependencies = { "nvim-lua/plenary.nvim" }, + "neovimhaskell/haskell-vim", + ft = "haskell", + init = function() + vim.g.haskell_indent_disable = 0 + vim.g.haskell_indent_let = 2 + vim.g.haskell_indent_in = 1 + vim.g.haskell_indent_where = 2 + vim.g.haskell_indent_do = 2 + vim.g.haskell_indent_case = 2 + vim.g.haskell_indent_if = 2 + end, }, { - "nvim-tree/nvim-tree.lua", - dependencies = { "nvim-tree/nvim-web-devicons" }, + "nvim-telescope/telescope.nvim", + --tag = "0.1.5", + branch = "master", + dependencies = { "nvim-lua/plenary.nvim" }, }, { "folke/todo-comments.nvim", @@ -126,4 +138,13 @@ return { lazy = false, priority = 1000, }, + { + "Fasamii/netrw-icons.nvim", + dependencies = { + "nvim-tree/nvim-web-devicons", -- or "echasnovski/mini.icons" + }, + config = function() + require("netrw-icons").setup() + end, + }, } diff --git a/home-configuration/config/nvim/lua/plugins/lsp/init.lua b/home-configuration/config/nvim/lua/plugins/lsp/init.lua index c5245d9..e21fba2 100755 --- a/home-configuration/config/nvim/lua/plugins/lsp/init.lua +++ b/home-configuration/config/nvim/lua/plugins/lsp/init.lua @@ -69,7 +69,7 @@ vim.api.nvim_create_autocmd('LspAttach', { }) end - local excluded_filetypes = { php = true, c = true, cpp = true } + local excluded_filetypes = { php = true, c = true, cpp = true, haskell = true, lhaskell = true } if not client:supports_method('textDocument/willSaveWaitUntil') and client:supports_method('textDocument/formatting') and not excluded_filetypes[vim.bo[buf].filetype] @@ -151,6 +151,21 @@ vim.lsp.config['luals'] = { }, } +vim.lsp.config['html'] = { + cmd = { 'vscode-html-language-server', '--stdio' }, + filetypes = { 'html' }, + root_markers = { 'package.json', '.git' }, + capabilities = caps, + init_options = { + provideFormatter = true, + }, + settings = { + html = { + validate = { scripts = true, styles = true }, + }, + }, +} + vim.lsp.config['cssls'] = { cmd = { 'vscode-css-language-server', '--stdio' }, filetypes = { 'css', 'scss', 'less' }, @@ -163,6 +178,46 @@ vim.lsp.config['cssls'] = { }, } +vim.lsp.config['eslint'] = { + cmd = { 'vscode-eslint-language-server', '--stdio' }, + filetypes = { + 'javascript', 'javascriptreact', 'javascript.jsx', + 'typescript', 'typescriptreact', 'typescript.tsx', + 'vue', 'svelte', 'astro', 'html', + }, + root_markers = { + 'eslint.config.js', 'eslint.config.mjs', 'eslint.config.cjs', + '.eslintrc.js', '.eslintrc.json', '.eslintrc', + 'package.json', '.git', + }, + capabilities = caps, + settings = { + validate = 'on', + packageManager = 'npm', + workingDirectory = { mode = 'auto' }, + }, +} + +vim.lsp.config['jsonls'] = { + cmd = { 'vscode-json-language-server', '--stdio' }, + filetypes = { 'json', 'jsonc' }, + root_markers = { 'package.json', '.git', 'config.jsonc' }, + capabilities = caps, + settings = { + json = { + validate = { enable = true }, + format = { enable = true }, + }, + }, +} + +vim.lsp.config['markdown'] = { + cmd = { 'vscode-markdown-language-server', '--stdio' }, + filetypes = { 'markdown' }, + root_markers = { '.git' }, + capabilities = caps, +} + vim.lsp.config['phpls'] = { cmd = { 'intelephense', '--stdio' }, filetypes = { 'php' }, @@ -248,21 +303,14 @@ vim.lsp.config['serve_d'] = { capabilities = caps, } -vim.lsp.config['jsonls'] = { - cmd = { 'vscode-json-languageserver', '--stdio' }, - filetypes = { 'json', 'jsonc' }, - root_markers = { 'package.json', '.git', 'config.jsonc' }, - capabilities = caps, -} - vim.lsp.config['hls'] = { cmd = { 'haskell-language-server-wrapper', '--lsp' }, filetypes = { 'haskell', 'lhaskell' }, - root_markers = { 'stack.yaml', 'cabal.project', 'package.yaml', '*.cabal', 'hie.yaml', '.git' }, + root_markers = { 'stack.yaml', 'cabal.project', 'package.yaml', 'hie.yaml', '.git' }, capabilities = caps, settings = { haskell = { - formattingProvider = 'fourmolu', + formattingProvider = 'ormolu', plugin = { semanticTokens = { globalOn = false } }, }, }, diff --git a/home-configuration/config/nvim/lua/plugins/treesitter/init.lua b/home-configuration/config/nvim/lua/plugins/treesitter/init.lua index ffc8b17..c50393b 100755 --- a/home-configuration/config/nvim/lua/plugins/treesitter/init.lua +++ b/home-configuration/config/nvim/lua/plugins/treesitter/init.lua @@ -1,305 +1,26 @@ -local lsp = require("lspconfig") -local cmp = require("cmp") +require("nvim-treesitter").setup() -vim.lsp.config('*', { - root_markers = { '.git' }, -}) - -vim.diagnostic.config({ - virtual_text = true, - severity_sort = true, - float = { - style = 'minimal', - border = 'rounded', - source = 'if_many', - header = '', - prefix = '', - }, - signs = { - text = { - [vim.diagnostic.severity.ERROR] = '✘', - [vim.diagnostic.severity.WARN] = '▲', - [vim.diagnostic.severity.HINT] = '⚑', - [vim.diagnostic.severity.INFO] = '»', - }, - }, -}) - -local orig = vim.lsp.util.open_floating_preview ----@diagnostic disable-next-line: duplicate-set-field -function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...) - opts = opts or {} - opts.border = opts.border or 'rounded' - opts.max_width = opts.max_width or 80 - opts.max_height = opts.max_height or 24 - opts.wrap = opts.wrap ~= false - return orig(contents, syntax, opts, ...) -end - -vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('my.lsp', {}), +vim.api.nvim_create_autocmd("FileType", { + pattern = "*", callback = function(args) - local client = assert(vim.lsp.get_client_by_id(args.data.client_id)) - local buf = args.buf - local map = function(mode, lhs, rhs) vim.keymap.set(mode, lhs, rhs, { buffer = buf }) end - - map('n', 'K', vim.lsp.buf.hover) - map('n', 'gd', vim.lsp.buf.definition) - map('n', 'gD', vim.lsp.buf.declaration) - map('n', 'gi', vim.lsp.buf.implementation) - map('n', 'go', vim.lsp.buf.type_definition) - map('n', 'gr', vim.lsp.buf.references) - map('n', 'gs', vim.lsp.buf.signature_help) - map('n', 'gl', vim.diagnostic.open_float) - map('n', '<F2>', vim.lsp.buf.rename) - map({ 'n', 'x' }, '<F3>', function() vim.lsp.buf.format({ async = true }) end) - map('n', '<F4>', vim.lsp.buf.code_action) + local lang = vim.treesitter.language.get_lang(args.match) - if client:supports_method('textDocument/documentHighlight') then - local highlight_augroup = vim.api.nvim_create_augroup('my.lsp.highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) + if not lang or lang == "nix" then + return end - local excluded_filetypes = { php = true, c = true, cpp = true } - if not client:supports_method('textDocument/willSaveWaitUntil') - and client:supports_method('textDocument/formatting') - and not excluded_filetypes[vim.bo[buf].filetype] - then - vim.api.nvim_create_autocmd('BufWritePre', { - group = vim.api.nvim_create_augroup('my.lsp.format', { clear = false }), - buffer = buf, - callback = function() - vim.lsp.buf.format({ bufnr = buf, id = client.id, timeout_ms = 1000 }) - end, - }) + if vim.treesitter.language.add(lang) then + vim.treesitter.start(args.buf, lang) + return end - end, -}) -require("nvim-autopairs").setup({}) -require("lsp_signature").setup({ hint_enable = false }) + local available = require("nvim-treesitter").get_available() -cmp.setup({ - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - end, - }, - mapping = cmp.mapping.preset.insert({ - ["<C-b>"] = cmp.mapping.scroll_docs(-4), - ["<C-f>"] = cmp.mapping.scroll_docs(4), - ["<C-Space>"] = cmp.mapping.complete(), - ["<C-e>"] = cmp.mapping.abort(), - ["<CR>"] = cmp.mapping.confirm({ select = true }), - ["<Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() + if vim.tbl_contains(available, lang) then + require("nvim-treesitter").install({ lang }):wait(30000) + if vim.treesitter.language.add(lang) then + vim.treesitter.start(args.buf, lang) end - end, { "i", "s" }), - ["<S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, { "i", "s" }), - }), - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered() - }, - sources = cmp.config.sources({ - { name = "nvim_lsp", keyword_length = 1 }, - { name = "vsnip" }, - }, { - { name = "buffer", keyword_length = 1 }, - { name = "spell" }, - }), -}) - -local caps = require("cmp_nvim_lsp").default_capabilities() - -vim.lsp.config['luals'] = { - cmd = { 'lua-language-server' }, - filetypes = { 'lua' }, - root_markers = { { '.luarc.json', '.luarc.jsonc' }, '.git' }, - capabilities = caps, - settings = { - Lua = { - runtime = { version = 'LuaJIT' }, - diagnostics = { globals = { 'vim' } }, - workspace = { - checkThirdParty = false, - library = vim.list_extend( - vim.api.nvim_get_runtime_file('', true), - { '/home/tony/repos/oxwm/templates' } - ), - }, - telemetry = { enable = false }, - }, - }, -} - -vim.lsp.config['cssls'] = { - cmd = { 'vscode-css-language-server', '--stdio' }, - filetypes = { 'css', 'scss', 'less' }, - root_markers = { 'package.json', '.git' }, - capabilities = caps, - settings = { - css = { validate = true }, - scss = { validate = true }, - less = { validate = true }, - }, -} - -vim.lsp.config['phpls'] = { - cmd = { 'intelephense', '--stdio' }, - filetypes = { 'php' }, - root_markers = { 'composer.json', '.git' }, - capabilities = caps, - settings = { - intelephense = { - files = { maxSize = 5000000 }, - }, - }, -} - -vim.lsp.config['ts_ls'] = { - cmd = { 'typescript-language-server', '--stdio' }, - filetypes = { 'javascript', 'javascriptreact', 'javascript.jsx', 'typescript', 'typescriptreact', 'typescript.tsx' }, - root_markers = { 'package.json', 'tsconfig.json', 'jsconfig.json', '.git' }, - capabilities = caps, - settings = { - completions = { completeFunctionCalls = true }, - }, -} - -vim.lsp.config['zls'] = { - cmd = { 'zls' }, - filetypes = { 'zig', 'zir' }, - root_markers = { 'zls.json', 'build.zig', '.git' }, - capabilities = caps, - settings = { - zls = { - enable_build_on_save = true, - build_on_save_step = "install", - warn_style = false, - enable_snippets = true, - } - } -} - -vim.lsp.config['nil_ls'] = { - cmd = { 'nil' }, - filetypes = { 'nix' }, - root_markers = { 'flake.nix', 'default.nix', '.git' }, - capabilities = caps, - settings = { - ['nil'] = { - formatting = { - command = { "nixpkgs-fmt" } - } - } - } -} - -vim.lsp.config['rust_analyzer'] = { - cmd = { 'rust-analyzer' }, - filetypes = { 'rust' }, - root_markers = { 'Cargo.toml', 'rust-project.json', '.git' }, - capabilities = caps, - settings = { - ['rust-analyzer'] = { - cargo = { allFeatures = true }, - formatting = { command = { "rustfmt" } }, - }, - }, -} - -vim.lsp.config['clangd'] = { - cmd = { 'clangd', '--background-index', '--clang-tidy' }, - filetypes = { 'c', 'cpp', 'objc', 'objcpp' }, - root_markers = { 'compile_commands.json', '.clangd', 'configure.ac', 'Makefile', '.git' }, - capabilities = caps, -} - -vim.lsp.config['c3lsp'] = { - cmd = { 'c3-lsp' }, - filetypes = { 'c3' }, - root_markers = { 'project.json', '.git' }, - capabilities = caps, -} - -vim.lsp.config['serve_d'] = { - cmd = { 'serve-d' }, - filetypes = { 'd' }, - root_markers = { 'dub.sdl', 'dub.json', '.git' }, - capabilities = caps, -} - -vim.lsp.config['jsonls'] = { - cmd = { 'vscode-json-languageserver', '--stdio' }, - filetypes = { 'json', 'jsonc' }, - root_markers = { 'package.json', '.git', 'config.jsonc' }, - capabilities = caps, -} - -vim.lsp.config['hls'] = { - cmd = { 'haskell-language-server-wrapper', '--lsp' }, - filetypes = { 'haskell', 'lhaskell' }, - root_markers = { 'stack.yaml', 'cabal.project', 'package.yaml', '*.cabal', 'hie.yaml', '.git' }, - capabilities = caps, - settings = { - haskell = { - formattingProvider = 'fourmolu', - plugin = { semanticTokens = { globalOn = false } }, - }, - }, -} - -vim.lsp.config['gopls'] = { - cmd = { 'gopls' }, - filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' }, - root_markers = { 'go.mod', 'go.work', '.git' }, - capabilities = caps, - settings = { - gopls = { - analyses = { unusedparams = false, ST1003 = false, ST1000 = false }, - staticcheck = true, - }, - }, -} - -vim.lsp.config['templ'] = { - cmd = { 'templ', 'lsp' }, - filetypes = { 'templ' }, - root_markers = { 'go.mod', '.git' }, - capabilities = caps, -} - -vim.filetype.add({ - extension = { - h = 'c', - c3 = 'c3', - d = 'd', - templ = 'templ', - }, + end + end, }) - ----@diagnostic disable-next-line: invisible -for name, _ in pairs(vim.lsp.config._configs) do - if name ~= '*' then - vim.lsp.enable(name) - end -end |