init.lua @ 39748a2bdaf7fa8dccad7a0dd428e36bf71e2856

D

@@ -1,6 +0,0 @@
-local ok, dapi = pcall(require, "dap-install")
-if not ok then
-  return
-end
-
-dapi.config("go_delve", {})

D

@@ -1,104 +0,0 @@
-local function jdtls_on_attach(client, bufnr)
-  require "lsp.attach"(client, bufnr)
-  -- stylua: ignore start
-  vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>lI", "<cmd>lua require('jdtls').organize_imports()<CR>", { silent = true, noremap = true })
-  vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>Tc", "<cmd>lua require('jdtls').test_class()<CR>", { silent = true, noremap = true })
-  vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>Tn", "<cmd>lua require('jdtls').test_nearest_method()<CR>", { silent = true, noremap = true })
-  vim.api.nvim_buf_set_keymap(bufnr, "v", "<leader>lev", "<cmd>lua require('jdtls').extract_variable(true)<CR>", { silent = true, noremap = true })
-  vim.api.nvim_buf_set_keymap(bufnr, "v", "<leader>lem", "<cmd>lua require('jdtls').extract_method(true)<CR>", { silent = true, noremap = true })
-  -- stylua: ignore end
-end
-
-require("jdtls").start_or_attach {
-  on_attach = jdtls_on_attach,
-  root_dir = require("jdtls.setup").find_root { ".git", "build.xml", "pom.xml", "settings.gradle", "settings.gradle.kts" },
-  flags = { allow_incremental_sync = true },
-  capabilities = {
-    workspace = { configuration = true },
-    textDocument = { completion = { completionItem = { snippetSupport = true } } },
-  },
-  cmd = {
-    "java",
-    "-Declipse.application=org.eclipse.jdt.ls.core.id1",
-    "-Dosgi.bundles.defaultStartLevel=4",
-    "-Declipse.product=org.eclipse.jdt.ls.core.product",
-    "-Dlog.protocol=true",
-    "-Dlog.level=ALL",
-    "-Xms1g",
-    "--add-modules=ALL-SYSTEM",
-
-    "--add-opens",
-    "java.base/java.util=ALL-UNNAMED",
-    "--add-opens",
-    "java.base/java.lang=ALL-UNNAMED",
-
-    "-jar",
-    "$HOME/.local/share/nvim/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_*.jar",
-
-    "-configuration",
-    "$HOME/.local/share/nvim/lsp_servers/jdtls/config_linux",
-  },
-  settings = {
-    java = {
-      signatureHelp = { enabled = true },
-      contentProvider = { preferred = "fernflower" },
-      sources = { organizeImports = {
-        starThreshold = 9999,
-        staticStarThreshold = 9999,
-      } },
-      codeGeneration = {
-        toString = { template = "${object.className}{${member.name()}=${member.value}, ${otherMembers}}" },
-        useBlocks = true,
-      },
-      configuration = {
-        runtimes = { { name = "JavaSE-11", path = "$HOME/.sdkman/candidates/java/11.0.11-open" } },
-      },
-    },
-  },
-}
-
-local finders = require "telescope.finders"
-local sorters = require "telescope.sorters"
-local actions = require "telescope.actions"
-local pickers = require "telescope.pickers"
-local action_state = require "telescope.actions.state"
-
-require("jdtls.ui").pick_one_async = function(items, prompt, label_fn, cb)
-  local opts = {
-    winblend = 15,
-    layout_config = {
-      prompt_position = "top",
-      width = 80,
-      height = 12,
-    },
-  }
-  pickers.new(opts, {
-    prompt_title = prompt,
-    finder = finders.new_table {
-      results = items,
-      entry_maker = function(entry)
-        return {
-          value = entry,
-          display = label_fn(entry),
-          ordinal = label_fn(entry),
-        }
-      end,
-    },
-    sorter = sorters.get_generic_fuzzy_sorter(),
-    attach_mappings = function(prompt_bufnr)
-      actions.select_default:replace(function()
-        local selection = action_state.get_selected_entry(prompt_bufnr)
-
-        actions.close(prompt_bufnr)
-
-        cb(selection.value)
-      end)
-
-      return true
-    end,
-  }):find()
-end
-
-vim.cmd "command! -buffer JdtCompile lua require('jdtls').compile()"
-vim.cmd "command! -buffer JdtUpdateConfig lua require('jdtls').update_project_config()"
-vim.cmd "command! -buffer JdtBytecode lua require('jdtls').javap()"

D

@@ -1,6 +0,0 @@
-local ok, dapi = pcall(require, "dap-install")
-if not ok then
-  return
-end
-
-dapi.config("jsnode", {})

D

@@ -1,6 +0,0 @@
-local ok, dapi = pcall(require, "dap-install")
-if not ok then
-  return
-end
-
-dapi.config("lua", {})

D

@@ -1,6 +0,0 @@
-local ok, dapi = pcall(require, "dap-install")
-if not ok then
-  return
-end
-
-dapi.config("python", {})

M lua/keymapings.lua

@@ -8,7 +8,8 @@ nmap("<leader>q", "<cmd>quit!<cr>")
 nmap("<leader>w", "<cmd>write!<cr>")
 nmap("<leader>ps", "<cmd>PackerSync<cr>")
 nmap("<leader>c", "<cmd>bdelete<cr>")
-nmap("<leader>n", "<cmd>e! /tmp/note.md<cr>")
+nmap("<leader>e", "<cmd>NvimTreeToggle<cr>")
+nmap("<leader>n", "<cmd>vs | e! /tmp/note.md<cr>")
 
 -- Split
 nmap("<C-Left>", "<cmd>vertical resize -2<cr>")

M lua/lsp/null.lua

@@ -12,12 +12,9 @@ diagnostic.selene,
       formatting.gofumpt,
       formatting.goimports,
       diagnostic.golangci_lint,
-      formatting.prettierd,
-      diagnostic.eslint_d,
       formatting.black,
       formatting.isort,
       diagnostic.flake8,
-      formatting.rustfmt,
     },
   }
 end

M lua/plugin.lua

@@ -7,9 +7,10 @@ use "kyazdani42/nvim-web-devicons"
   use "rmehri01/onenord.nvim"
 
   use { "~/code/gopher.nvim", ft = "go" }
-  use { "mfussenegger/nvim-jdtls", ft = "java", after = "nvim-lspconfig" }
   use { "folke/lua-dev.nvim", ft = "lua", after = "nvim-lspconfig", config = get_config "lua-dev" }
 
+  use { "kyazdani42/nvim-tree.lua", cmd = "NvimTreeToggle", config = get_config "plugin.nvimtree" }
+  use { "tpope/vim-endwise", ft = { "ruby", "vim", "lua" } }
   use { "tpope/vim-surround", keys = { "c", "d", "y" } }
   use { "ahmedkhalf/project.nvim", config = get_config "plugin.project" }
   use { "nvim-lualine/lualine.nvim", config = get_config "plugin.statusline" }
@@ -66,17 +67,6 @@ config = get_config "lsp",
     requires = {
       "williamboman/nvim-lsp-installer",
       { "jose-elias-alvarez/null-ls.nvim", after = "nvim-lspconfig" },
-    },
-  }
-
-  use {
-    "mfussenegger/nvim-dap",
-    module = "dap",
-    config = get_config "plugin.dap",
-    requires = {
-      { "Pocco81/DAPInstall.nvim", module = "dap-install", requires = "nvim-dap" },
-      { "theHamsta/nvim-dap-virtual-text", after = "nvim-dap", config = [[ require"nvim-dap-virtual-text".setup() ]] },
-      { "nvim-telescope/telescope-dap.nvim", after = "nvim-dap", config = [[ require("telescope").load_extension "dap" ]] },
     },
   }
 

M lua/plugin/cmp.lua

@@ -9,7 +9,7 @@ }
 
   cmp.event:on("confirm_done", require("nvim-autopairs.completion.cmp").on_confirm_done())
   cmp.setup.cmdline("/", { sources = { { name = "buffer" } } })
-  cmp.setup.cmdline(":", { sources = cmp.config.sources { { name = "path" }, { name = "cmdline" } } })
+  -- cmp.setup.cmdline(":", { sources = cmp.config.sources { { name = "path" }, { name = "cmdline" } } })
   cmp.setup {
     snippet = {
       expand = function(args)

D

@@ -1,24 +0,0 @@
-local M = {}
-
-function M.setup()
-  vim.fn.sign_define("DapBreakpoint", {
-    text = "",
-    texthl = "LspDiagnosticsSignError",
-    linehl = "",
-    numhl = "",
-  })
-  vim.fn.sign_define("DapBreakpointRejected", {
-    text = "",
-    texthl = "LspDiagnosticsSignHint",
-    linehl = "",
-    numhl = "",
-  })
-  vim.fn.sign_define("DapStopped", {
-    text = "",
-    texthl = "LspDiagnosticsSignInformation",
-    linehl = "DiagnosticUnderlineInfo",
-    numhl = "LspDiagnosticsSignInformation",
-  })
-end
-
-return M

M lua/plugin/nvimtree.lua

@@ -8,7 +8,7 @@ disable_netrw = true,
     hijack_netrw = true,
     auto_close = true,
     auto_open = true,
-    update_cwd = false,
+    update_cwd = true,
     diagnostics = {
       enable = true,
       icons = {
@@ -17,15 +17,15 @@ info = "",
         warning = "",
         error = "",
       },
-    },
-    filters = {
-      dotfiles = true,
-      custom = { ".git", "node_modules", "__pycache__", "vendor", "env", ".bin" },
+      filters = {
+        dotfiles = true,
+        custom = { ".git", "node_modules", "__pycache__", "vendor", "env", ".bin" },
+      },
     },
     view = {
       width = 30,
-      side = "right",
       auto_resize = false,
+      hide_root_folder = true,
       mappings = {
         custom_only = false,
         list = {
@@ -35,10 +35,13 @@ { key = "v", cb = tree_cb "vsplit" },
         },
       },
     },
+    trash = {
+      cmd = "trash",
+      require_confirm = true,
+    },
   }
 
   vim.g.nvim_tree_group_empty = 1
-  vim.g.nvim_tree_indent_markers = 1
 end
 
 return M