yes there's a bit of java in my nvim config why do you ask?

7 files changed, 52 insertions, 259 deletions

diff --git a/after/ftplugin/c.lua b/after/ftplugin/c.lua
new file mode 100644
index 0000000..6d4efca
--- /dev/null
+++ b/after/ftplugin/c.lua
@@ -0,0 +1,6 @@
+local misc = require('core.misc')
+local map_local = misc.map_local
+
+-- sort #includes <> (very jank)
+-- TODO: rewrite in a semi-sane way
+map_local("n", "cri", "mz/^#include.*<.*>$<CR>ggVGN:sort<CR>`z<cmd>delm z<CR>:nohlsearch<Bar>:echo<CR>")
diff --git a/after/ftplugin/gitcommit.lua b/after/ftplugin/gitcommit.lua
deleted file mode 100644
index dece15e..0000000
--- a/after/ftplugin/gitcommit.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd('startinsert | 1')
diff --git a/after/ftplugin/gitrebase.lua b/after/ftplugin/gitrebase.lua
deleted file mode 120000
index 9619e9a..0000000
--- a/after/ftplugin/gitrebase.lua
+++ /dev/null
@@ -1 +0,0 @@
-gitcommit.lua
\ No newline at end of file
diff --git a/after/ftplugin/help.lua b/after/ftplugin/help.lua
deleted file mode 100644
index fe6caae..0000000
--- a/after/ftplugin/help.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/after/ftplugin/java.lua b/after/ftplugin/java.lua
deleted file mode 100644
index 2c3db93..0000000
--- a/after/ftplugin/java.lua
+++ /dev/null
@@ -1,255 +0,0 @@
--- NOTE: Make sure you're $JAVA_HOME is correct (prob should be 17 or higher)
-local java_cmds = vim.api.nvim_create_augroup('java_cmds', {clear = true})
-local cache_vars = {}
-
-local root_files = {
-  '.git',
-  'mvnw',
-  'gradlew',
-  'pom.xml',
-  'build.gradle',
-}
-
-local features = {
-  -- change this to `true` to enable codelens
-  codelens = true,
-
-  -- change this to `true` if you have `nvim-dap`,
-  -- `java-test` and `java-debug-adapter` installed
-  debugger = true,
-}
-
-local function get_jdtls_paths()
-  if cache_vars.paths then
-    return cache_vars.paths
-  end
-
-  local path = {}
-  path.data_dir = vim.fn.stdpath('cache') .. '/nvim-jdtls'
-  local jdtls_install = require('mason-registry').get_package('jdtls'):get_install_path()
-  path.java_agent = jdtls_install .. '/lombok.jar'
-  path.launcher_jar = vim.fn.glob(jdtls_install .. '/plugins/org.eclipse.equinox.launcher_*.jar')
-  path.platform_config = jdtls_install .. '/config_linux'
-  path.bundles = {}
-
-  -- Include java-test bundle if present
-  local java_test_path = require('mason-registry')
-    .get_package('java-test')
-    :get_install_path()
-
-  local java_test_bundle = vim.split(
-    vim.fn.glob(java_test_path .. '/extension/server/*.jar'),
-    '\n'
-  )
-
-  if java_test_bundle[1] ~= '' then
-    vim.list_extend(path.bundles, java_test_bundle)
-  end
-
-  -- Include java-debug-adapter bundle if present
-  local java_debug_path = require('mason-registry')
-    .get_package('java-debug-adapter')
-    :get_install_path()
-
-  local java_debug_bundle = vim.split(
-    vim.fn.glob(java_debug_path .. '/extension/server/com.microsoft.java.debug.plugin-*.jar'),
-    '\n'
-  )
-
-  if java_debug_bundle[1] ~= '' then
-    vim.list_extend(path.bundles, java_debug_bundle)
-  end
-
-  -- Useful if you're starting jdtls with a Java version that's 
-  -- different from the one the project uses.
-  path.runtimes = {
-    -- Note: the field `name` must be a valid `ExecutionEnvironment`,
-    -- you can find the list here: 
-    -- https://github.com/eclipse/eclipse.jdt.ls/wiki/Running-the-JAVA-LS-server-from-the-command-line#initialize-request
-    --
-    -- This example assume you are using sdkman: https://sdkman.io
-    -- {
-    --   name = 'JavaSE-17',
-    --   path = vim.fn.expand('~/.sdkman/candidates/java/17.0.6-tem'),
-    -- },
-    -- {
-    --   name = 'JavaSE-18',
-    --   path = vim.fn.expand('~/.sdkman/candidates/java/18.0.2-amzn'),
-    -- },
-  }
-
-  cache_vars.paths = path
-  return path
-end
-
-local function enable_codelens(bufnr)
-  pcall(vim.lsp.codelens.refresh)
-
-  vim.api.nvim_create_autocmd('BufWritePost', {
-    buffer = bufnr,
-    group = java_cmds,
-    desc = 'refresh codelens',
-    callback = function()
-      pcall(vim.lsp.codelens.refresh)
-    end,
-  })
-end
-
-local function enable_debugger(bufnr)
-  require('jdtls').setup_dap({hotcodereplace = 'auto'})
-  require('jdtls.dap').setup_dap_main_class_configs()
-
-  local opts = {buffer = bufnr}
-  vim.keymap.set('n', '<leader>df', "<cmd>lua require('jdtls').test_class()<cr>", opts)
-  vim.keymap.set('n', '<leader>dn', "<cmd>lua require('jdtls').test_nearest_method()<cr>", opts)
-end
-
-local function jdtls_on_attach(client, bufnr)
-  if features.debugger then
-    enable_debugger(bufnr)
-  end
-
-  if features.codelens then
-    enable_codelens(bufnr)
-  end
-
-  -- The following mappings are based on the suggested usage of nvim-jdtls
-  -- https://github.com/mfussenegger/nvim-jdtls#usage
-  local opts = {buffer = bufnr}
-  vim.keymap.set('n', 'cri', "<cmd>lua require('jdtls').organize_imports()<cr>", opts)
-  vim.keymap.set('n', 'crv', "<cmd>lua require('jdtls').extract_variable()<cr>", opts)
-  vim.keymap.set('x', 'crv', "<esc><cmd>lua require('jdtls').extract_variable(true)<cr>", opts)
-  vim.keymap.set('n', 'crc', "<cmd>lua require('jdtls').extract_constant()<cr>", opts)
-  vim.keymap.set('x', 'crc', "<esc><cmd>lua require('jdtls').extract_constant(true)<cr>", opts)
-  vim.keymap.set('x', 'crm', "<esc><Cmd>lua require('jdtls').extract_method(true)<cr>", opts)
-end
-
-local function jdtls_setup(event)
-  local jdtls = require('jdtls')
-
-  local path = get_jdtls_paths()
-  local data_dir = path.data_dir .. '/' ..  vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')
-
-  if cache_vars.capabilities == nil then
-    jdtls.extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
-
-    local ok_cmp, cmp_lsp = pcall(require, 'cmp_nvim_lsp')
-    cache_vars.capabilities = vim.tbl_deep_extend(
-      'force',
-      vim.lsp.protocol.make_client_capabilities(),
-      ok_cmp and cmp_lsp.default_capabilities() or {}
-    )
-  end
-
-  -- The command that starts the language server
-  -- See: https://github.com/eclipse/eclipse.jdt.ls#running-from-the-command-line
-  local 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',
-    '-javaagent:' .. path.java_agent,
-    '-Xms1G',
-    '--add-modules=ALL-SYSTEM',
-    '--add-opens',
-    'java.base/java.util=ALL-UNNAMED',
-    '--add-opens',
-    'java.base/java.lang=ALL-UNNAMED',
-    '-jar', path.launcher_jar,
-    '-configuration', path.platform_config,
-    '-data', data_dir,
-  }
-
-  local lsp_settings = {
-    java = {
-      -- jdt = {
-      --   ls = {
-      --     vmargs = "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx1G -Xms100m"
-      --   }
-      -- },
-      eclipse = {
-        downloadSources = true,
-      },
-      configuration = {
-        updateBuildConfiguration = 'interactive',
-        runtimes = path.runtimes,
-      },
-      maven = {
-        downloadSources = true,
-      },
-      implementationsCodeLens = {
-        enabled = true,
-      },
-      referencesCodeLens = {
-        enabled = true,
-      },
-      -- inlayHints = {
-      --   parameterNames = {
-      --     enabled = 'all' -- literals, all, none
-      --   }
-      -- },
-      format = {
-        enabled = true,
-        -- settings = {
-        --   profile = 'asdf'
-        -- },
-      }
-    },
-    signatureHelp = {
-      enabled = true,
-    },
-    completion = {
-      favoriteStaticMembers = {
-        'org.hamcrest.MatcherAssert.assertThat',
-        'org.hamcrest.Matchers.*',
-        'org.hamcrest.CoreMatchers.*',
-        'org.junit.jupiter.api.Assertions.*',
-        'java.util.Objects.requireNonNull',
-        'java.util.Objects.requireNonNullElse',
-        'org.mockito.Mockito.*',
-      },
-    },
-    contentProvider = {
-      preferred = 'fernflower',
-    },
-    extendedClientCapabilities = jdtls.extendedClientCapabilities,
-    sources = {
-      organizeImports = {
-        starThreshold = 9999,
-        staticStarThreshold = 9999,
-      }
-    },
-    codeGeneration = {
-      toString = {
-        template = '${object.className}{${member.name()}=${member.value}, ${otherMembers}}',
-      },
-      useBlocks = true,
-    },
-  }
-
-  -- This starts a new client & server,
-  -- or attaches to an existing client & server depending on the `root_dir`.
-  jdtls.start_or_attach({
-    cmd = cmd,
-    settings = lsp_settings,
-    on_attach = jdtls_on_attach,
-    capabilities = cache_vars.capabilities,
-    root_dir = jdtls.setup.find_root(root_files),
-    flags = {
-      allow_incremental_sync = true,
-    },
-    init_options = {
-      bundles = path.bundles,
-    },
-  })
-end
-
-vim.api.nvim_create_autocmd('FileType', {
-  group = java_cmds,
-  pattern = {'java'},
-  desc = 'Setup jdtls',
-  callback = jdtls_setup,
-})
diff --git a/after/ftplugin/netrw.lua b/after/ftplugin/netrw.lua
new file mode 100644
index 0000000..98d7dd7
--- /dev/null
+++ b/after/ftplugin/netrw.lua
@@ -0,0 +1,20 @@
+local misc = require("core.misc")
+local map_local = misc.map_local
+
+map_local("n", "h", "-", { noremap = false, remap = true }) -- Go up a directory
+map_local("n", "l", "<CR>", { noremap = false, remap = true }) -- Go down a directory / open a file
+map_local("n", ".", "gh", { noremap = false, remap = true }) -- Toggle hidden files
+map_local("n", "P", "<C-w>z", { noremap = false, remap = true }) -- Close preview window
+
+-- Close netrw only if it isn't the last window
+map_local("n", "<esc>", function()
+  if #vim.api.nvim_tabpage_list_wins(0) > 1 then
+    vim.api.nvim_win_close(0, false)
+  end
+end)
+
+-- change neovim root
+map_local("n", "rt", function()
+  vim.api.nvim_set_current_dir(vim.b.netrw_curdir)
+  vim.notify("root dir updated: "..vim.b.netrw_curdir, vim.log.levels.LOW, { title = misc.appid })
+end)
diff --git a/after/ftplugin/norg.lua b/after/ftplugin/norg.lua
index 851228e..fc69be9 100644
--- a/after/ftplugin/norg.lua
+++ b/after/ftplugin/norg.lua
@@ -1,3 +1,28 @@
+local misc = require('core.misc')
+
+-- make sure norg parsers are installed before opening a norg file, currently
+-- there are two parsers: norg, and norg_meta
+local found = {}
+found[0] = 0 -- used to store the number of elements in the table
+
+-- check for the parsers
+misc.loopf(vim.fn.stdpath("data").."/site/pack/deps/opt/nvim-treesitter/parser",
+  function(file)
+  if string.find(file, "norg") then
+    found[file] = true
+    found[0] = found[0] + 1
+  end
+end, "so")
+
+-- if the parsers don't exist download them
+if found[0] < 2 and
+  (not found["norg.so"] or not found["norg_meta.so"]) then
+  vim.cmd("Neorg sync-parsers")
+end
+
+-- set colorcolumn in norg buffers
+vim.opt_local.colorcolumn = { 80 }
+
+-- make text wrap at the colorcolumn automatically
 vim.api.nvim_set_option_value("textwidth",
   tonumber(vim.api.nvim_get_option_value("colorcolumn", {})), { buf = 0 })
-vim.api.nvim_win_set_option(0, 'colorcolumn', '0')