diff --git a/init.lua b/init.lua index 1302137..0f80458 100644 --- a/init.lua +++ b/init.lua @@ -1,16 +1,17 @@ -vim.g.mapleader = " " +vim.g.mapleader = ";" require("config.lazy") require("mason").setup() require("mason-lspconfig").setup({ ensure_installed = { - "pylsp", + -- "pylsp", "clangd", "ols", "ts_ls", "vue_ls", "phpactor", + "ty", }, }) require("mason-nvim-dap").setup({ @@ -37,7 +38,7 @@ vim.keymap.set("v", "x", ":lua") vim.api.nvim_set_keymap('t', '', [[]], {noremap = true}) -- vim.api.nvim_set_keymap('i', '', [[]], {noremap = true}) vim.keymap.set('v', '', '', { desc = 'Stop Ctrl+Space from acting as W' }) -vim.keymap.set('n', '', function() +vim.keymap.set('n', '', function() vim.cmd('startinsert') require('blink.cmp').show() end) @@ -64,14 +65,19 @@ lspconfig("phpactor", { cmd = {'phpactor', 'language-server'}, filetypes = {'php'}, }) -lspenable("pylsp") +lspconfig("ty", { + on_attach = function(client, bufnr) + client.server_capabilities.semanticTokensProvider = nil + end, +}) +--lspenable("pylsp") lspenable("clangd") lspenable("ols") lspenable("ts_ls") lspenable("vue_ls") lspenable("glsl_analyzer") lspenable("phpactor") - +lspenable("ty") local dap = require('dap') dap.configurations.php = { diff --git a/init.lua.bak b/init.lua.bak new file mode 100644 index 0000000..674a1c1 --- /dev/null +++ b/init.lua.bak @@ -0,0 +1,48 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup("plugins") +require("mason").setup() +require("mason-lspconfig").setup({ + ensure_installed = { + "pylsp", + "clangd", + "gopls", + -- "dcm", + "ols", + }, +}) + +-- My user settings: +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 +--vim.opt.expandtab = true +vim.opt.autoindent = true +vim.opt.foldmethod = "indent" +vim.opt.foldenable = false +vim.cmd([[colorscheme everforest]]) + +-- My custom keybinds +-- vim.keymap.set("n", "x", "source %") -- Can't do this with lazy.nvim apparently +vim.keymap.set("n", "x", ":.lua") +vim.keymap.set("v", "x", ":lua") +vim.api.nvim_set_keymap('t', '', [[]], {noremap = true}) + +local lspconfig = require('lspconfig') +lspconfig.pylsp.setup{} +lspconfig.clangd.setup{} +lspconfig.gopls.setup{} +--lspconfig.dcm.setup{} +lspconfig.ols.setup{} diff --git a/lua/plugins/csvview.lua b/lua/plugins/csvview.lua new file mode 100644 index 0000000..51f1bbe --- /dev/null +++ b/lua/plugins/csvview.lua @@ -0,0 +1,22 @@ +return { + "hat0uma/csvview.nvim", + ---@module "csvview" + ---@type CsvView.Options + opts = { + parser = { comments = { "#", "//" } }, + keymaps = { + -- Text objects for selecting fields + textobject_field_inner = { "if", mode = { "o", "x" } }, + textobject_field_outer = { "af", mode = { "o", "x" } }, + -- Excel-like navigation: + -- Use and to move horizontally between fields. + -- Use and to move vertically between rows and place the cursor at the end of the field. + -- Note: In terminals, you may need to enable CSI-u mode to use and . + jump_next_field_end = { "", mode = { "n", "v" } }, + jump_prev_field_end = { "", mode = { "n", "v" } }, + jump_next_row = { "", mode = { "n", "v" } }, + jump_prev_row = { "", mode = { "n", "v" } }, + }, + }, + cmd = { "CsvViewEnable", "CsvViewDisable", "CsvViewToggle" }, +} diff --git a/lua/plugins/nvim-dragon.lua b/lua/plugins/nvim-dragon.lua index f0ee1ce..7a416c5 100644 --- a/lua/plugins/nvim-dragon.lua +++ b/lua/plugins/nvim-dragon.lua @@ -1,5 +1,5 @@ return { - dir = "~/Development/langs/dragon/extensions/vim-dragon", + dir = "~/development/langs/dragon/extensions/vim-dragon", ft = "dragon", dependencies = { "nvim-treesitter/nvim-treesitter" }, config = function()