use lspconfig

after/ftplugin/cs.lua

@@ -1,3 +0,0 @@
-vim.opt_local.expandtab = true
-vim.opt_local.shiftwidth = 4
-vim.opt_local.tabstop = 4

after/ftplugin/html.lua

@@ -1,3 +0,0 @@
-vim.opt_local.expandtab = true
-vim.opt_local.shiftwidth = 2
-vim.opt_local.tabstop = 2

after/ftplugin/java.lua

@@ -1,11 +0,0 @@
-vim.opt_local.expandtab = true
-vim.opt_local.shiftwidth = 4
-vim.opt_local.tabstop = 4
-
-local home = os.getenv("HOME") or os.getenv("USERPROFILE")
-local config = {
-  cmd = { home .. '/.local/share/java/jdtls/bin/jdtls' },
-  root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]),
-}
-
-require('jdtls').start_or_attach(config)

after/ftplugin/javascript.lua

@@ -1,3 +0,0 @@
-vim.opt_local.expandtab = true
-vim.opt_local.shiftwidth = 2
-vim.opt_local.tabstop = 2

after/ftplugin/json.lua

@@ -1,3 +0,0 @@
-vim.opt_local.expandtab = true
-vim.opt_local.shiftwidth = 4
-vim.opt_local.tabstop = 4

after/ftplugin/lua.lua

@@ -1,3 +0,0 @@
-vim.opt_local.expandtab = true
-vim.opt_local.shiftwidth = 2
-vim.opt_local.tabstop = 2

ftplugin/java.lua

@@ -0,0 +1,6 @@
+local config = {
+	cmd = { os.getenv('HOME') .. '/.local/share/java/jdtls/bin/jdtls' },
+	root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]),
+}
+require('jdtls').start_or_attach(config)
+

init.lua

@@ -2,20 +2,17 @@ require("config.lazy")
 require("config.set")
 require("config.remap")
 
-vim.cmd("set completeopt+=noselect")
+vim.api.nvim_create_autocmd('LspAttach', {
-
+  callback = function(ev)
-vim.lsp.enable({
+    local client = vim.lsp.get_client_by_id(ev.data.client_id)
-  'basedpyright',
+    if client:supports_method('textDocument/completion') then
-  'clangd',
+      vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true })
-  'csharp_ls',
+    end
-  'cssls',
+  end,
-  'eslint',
-  'gopls',
-  'html',
-  'jsonls',
-  'lua_ls',
-  'ts_ls',
-  'yamlls',
 })
 
-vim.o.winborder = 'rounded'
+vim.lsp.enable({'basedpyright', 'lua_ls', 'yamlls'})
+
+vim.cmd("set completeopt+=noselect")
+vim.o.winborder='rounded'
+

lua/config/lazy.lua

@@ -31,3 +31,4 @@ require("lazy").setup({
   -- automatically check for plugin updates
   checker = { enabled = true },
 })
+

lua/config/remap.lua

@@ -1 +1,2 @@
 vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
+

lua/config/set.lua

@@ -1,6 +1,7 @@
+vim.opt.shell = "zsh"
 vim.opt.fileformat = "unix"
 vim.opt.fileformats = "unix"
-vim.opt.fixendofline = true
+vim.opt.cmdheight = 0
 vim.opt.guicursor = ""
 vim.opt.mouse = ""
 
@@ -31,4 +32,3 @@ vim.g.c_syntax_for_h = 1
 
 vim.cmd.colorscheme("moonfly")
 
-vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { noremap = true, silent = true })

lua/plugins/completion.lua

@@ -1,13 +0,0 @@
-return {
-  'saghen/blink.cmp',
-  dependencies = { 'rafamadriz/friendly-snippets' },
-  version = '1.*',
-
-  opts = {
-    keymap = { preset = 'default' },
-    appearance = {
-      nerd_font_variant = 'mono'
-    },
-    signature = { enabled = true }
-  },
-}

lua/plugins/lsp.lua

@@ -1,37 +1,8 @@
 return {
-  {
+	{ "neovim/nvim-lspconfig" },
-    "neovim/nvim-lspconfig",
-    dependencies = {
-      "saghen/blink.cmp"
-    },
-    config = function()
-      vim.api.nvim_create_autocmd('LspAttach', {
-        group = vim.api.nvim_create_augroup('my.lsp', {}),
-        callback = function(args)
-          local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
-          if not client then return end
-          if client:supports_method('textDocument/formatting') then
-            vim.api.nvim_create_autocmd('BufWritePre', {
-              group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
-              buffer = args.buf,
-              callback = function()
-                vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
-              end,
-            })
-          end
-        end,
-      })
-    end
-  },
-  {
-    "folke/lazydev.nvim",
-    ft = "lua",
-    opts = {
-      library = {
-        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
-      },
-    },
-  },
 	{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
+	{ "hrsh7th/nvim-cmp" },
+	{ "hrsh7th/cmp-nvim-lsp" },
 	{ "mfussenegger/nvim-jdtls" } -- jdtls bindings for neovim
 }
+

lua/plugins/util.lua

@@ -13,10 +13,7 @@ return {
 	},
 	{
 	"nvim-telescope/telescope.nvim",
-    dependencies = {
+	dependencies = {"nvim-lua/plenary.nvim"},
-      "nvim-lua/plenary.nvim",
-      { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }
-    },
 	config = function()
 		local builtin = require('telescope.builtin')
 		vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
@@ -42,3 +39,4 @@ return {
 		end
 	}
 }
+

lua/plugins/visual.lua

@@ -7,13 +7,8 @@ return {
 			require("lualine").setup()
 		end,
 	},
-  {
+	{ "bluz71/vim-moonfly-colors", lazy = false },
-    "bluz71/vim-moonfly-colors",
-    lazy = false,
-    config = function()
-      vim.g.moonflyTransparent = true
-    end,
-  },
 	{ "EdenEast/nightfox.nvim", lazy = false },
 	{ "oxfist/night-owl.nvim", lazy = false },
 }
+