Update config windows

kevinm6 · Aug 30, 2024 · c01ea5a · c01ea5a
1 parent a1444aa
commit c01ea5a
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 144 deletions.
diff --git a/after/ftplugin/java.lua b/after/ftplugin/java.lua
@@ -19,39 +19,49 @@ local extendedClientCapabilities = require("jdtls").extendedClientCapabilities
 extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
 extendedClientCapabilities.document_formatting = false
 
-local root_dir = vim.fs.root(0, { ".git", "mvnw", "gradlew" }) or vim.uv.cwd()
-local workspace_dir = string.format("%s/java/workspace/%s", vim.fn.stdpath "cache", vim.fn.fnamemodify(root_dir, ":t"))
+local root_dir = vim.fs.root(0, { ".git", "mvnw", "gradlew", "pom.xml" }) or vim.uv.cwd()
+local workspace_dir = string.format("%s/java/workspace/%s", vim.fn.stdpath "cache",
+  vim.fn.fnamemodify(root_dir, ":t"))
 
-local launcher_path = vim.fn.glob(data_path .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar", true)
+local launcher_path = vim.fn.glob(
+  data_path .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar", true)
 local bundles = vim.fn.glob(
-  data_path .. "/mason/packages/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar",
+  data_path ..
+  "/mason/packages/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar",
   true,
   true
 )
 
 local lombok_path = data_path .. "/mason/packages/jdtls/lombok.jar"
 
-local os_uname, sys_config = vim.uv.os_uname(), nil
-if os_uname.sysname == "Darwin" then
-  if os_uname.machine == "arm64" then
-    sys_config = "mac_arm"
+local function get_config_dir()
+  local os_uname, sys_config = vim.uv.os_uname(), nil
+  if os_uname.sysname == "Darwin" then
+    if os_uname.machine == "arm64" then
+      sys_config = "mac_arm"
+    else
+      sys_config = "mac"
+    end
+  elseif os_uname.sysname == "Linux" then
+    sys_config = "linux"
   else
-    sys_config = "mac"
+    sys_config = "win"
   end
-elseif os_uname.sysname == "Linux" then
-  sys_config = "linux"
-else
-  vim.notify("Unsupported OS", vim.log.levels.WARN)
+
+  return string.format("%s/mason/packages/jdtls/config_%s", vim.fn.stdpath "data",
+    sys_config)
 end
 
 vim.list_extend(
   bundles,
-  vim.split(vim.fn.glob(data_path .. "/mason/packages/java-test/extension/server/*.jar", true), "\n")
+  vim.split(
+    vim.fn.glob(data_path .. "/mason/packages/java-test/extension/server/*.jar", true),
+    "\n")
 )
 
 local config = {
   cmd = {
-    "java",
+    "C:/Program Files/OpenJDK/jdk-17/bin/java.exe",
     "-Declipse.application=org.eclipse.jdt.ls.core.id1",
     "-Dosgi.bundles.defaultStartLevel=4",
     "-Declipse.product=org.eclipse.jdt.ls.core.product",
@@ -72,8 +82,7 @@ local config = {
     "-Xbootclasspath/a",
     lombok_path,
 
-    "-configuration",
-    (vim.fn.expand "~/.local/share/nvim/mason/packages/jdtls/config_") .. sys_config,
+    "-configuration", get_config_dir(),
     "-data",
     workspace_dir,
   },
@@ -108,14 +117,14 @@ local config = {
         updateBuildConfiguration = "interactive",
         runtimes = {
           {
-            name = "JavaSE-11",
-            path = "/Library/Java/JavaVirtualMachines/openjdk-11.jdk/Contents/Home",
-          },
-          {
-            name = "JavaSE-17",
-            path = "/Library/Java/JavaVirtualMachines/openjdk-17.jdk/Contents/Home",
+            name = "JavaSE-1",
+            path = [[C:/Program Files/Java/jdk1.8.0_202]],
           },
           -- {
+          --   name = "JavaSE-17",
+          --   path = "/Library/Java/JavaVirtualMachines/openjdk-17.jdk/Contents/Home",
+          -- },
+          -- {
           --   name = "JavaSE-20",
           --   path = "/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home"
           -- },
@@ -165,7 +174,8 @@ local config = {
       codeGeneration = {
         generateComments = true,
         toString = {
-          template = "${object.className}{${member.name()}=${member.value}, ${otherMembers}}",
+          template =
+          "${object.className}{${member.name()}=${member.value}, ${otherMembers}}",
         },
         hashCodeEquals = { useJava7Objects = true },
         useBlocks = true,

diff --git a/lazy-lock.json b/lazy-lock.json
@@ -1,5 +1,5 @@
 {
-  "SchemaStore.nvim": { "branch": "main", "commit": "54a2cf0105166d5a48172e81f12a2bf10cfc8b2c" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "6d3ba6ad250538446b2727e352e15a425d6692ef" },
   "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
@@ -12,13 +12,13 @@
   "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
   "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" },
   "data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
-  "gitsigns.nvim": { "branch": "main", "commit": "80214a857ce512cc64964abddc1d8eb5a3e28396" },
+  "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" },
   "go.nvim": { "branch": "master", "commit": "81d8d0d90d3f6bcb44181800da3ed43356a26c1b" },
   "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
   "kurayami.nvim": { "branch": "main", "commit": "497134ab778c410036fcd61837d81380ce6b961e" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
-  "markdown.nvim": { "branch": "main", "commit": "7718ee87596b601ddbc93170de3a354f598185e4" },
+  "markdown.nvim": { "branch": "main", "commit": "bc8213ddcd91d2045cc3813df861adb93fbf2d2d" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" },
@@ -31,25 +31,26 @@
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" },
-  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" },
   "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
   "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" },
   "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8a3610d29df83d8632f8ee7c3afc779c12725531" },
+  "nvim-lspconfig": { "branch": "master", "commit": "6bfd9210e312af6cfedba05d272e85618c93ab0d" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
-  "nvim-treesitter": { "branch": "master", "commit": "7499f7379459db3b31c75cf5cec45f785be6e2c7" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" },
+  "nvim-treesitter": { "branch": "master", "commit": "9ac3931bf6891cecd59c432d343d6490afd401e5" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "0ec9a8e00cedfb52e3c2259b55f46a7c18fc2429" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
   "nvim-ufo": { "branch": "main", "commit": "b23a46aa06f5f653d107efbc67fd2aa3877ac344" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "4f3c6780ff272d8facab69a658cf8693582b7a54" },
+  "oil.nvim": { "branch": "master", "commit": "0dc98d36b5450575e3af97fdfc6dcb72ba1fc80e" },
   "otter.nvim": { "branch": "main", "commit": "ca9ce67d0399380b659923381b58d174344c9ee7" },
   "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "quarto-nvim": { "branch": "main", "commit": "eed598983fa4040eed77191f69462c1348770b8a" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" },
+  "rest.nvim": { "branch": "main", "commit": "c7944769dc489b9e4bc493e40820c2818eab2569" },
   "snippets": { "branch": "main", "commit": "e2bd72af7b33d7b9ca2618cf7bb07cf577a00e54" },
   "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },

diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
@@ -53,6 +53,9 @@ local M = {
     "kevinm6/image.nvim",
     -- pin = true, -- DON'T update for now -> https://github.com/3rd/image.nvim/issues/191
     dev = true,
+    cond = function()
+      return not vim.uv.os_uname().sysname == "Windows_NT"
+    end,
     ft = { "markdown", "vimwiki", "png", "jpeg", "jpg", "image_nvim" },
     opts = function(_, o)
       o.backend = "kitty"
@@ -78,8 +81,12 @@ local M = {
     "epwalsh/obsidian.nvim",
     version = "*", -- latest release (not commit)
     event = {
-      "BufReadPre " .. vim.fn.expand "~" .. "/Library/Mobile Documents/iCloud~md~obsidian/Documents/Main/**.md",
-      "BufNewFile " .. vim.fn.expand "~" .. "/Library/Mobile Documents/iCloud~md~obsidian/Documents/Main/**.md",
+      "BufReadPre " ..
+      vim.fn.expand "~" ..
+      "/Library/Mobile Documents/iCloud~md~obsidian/Documents/Main/**.md",
+      "BufNewFile " ..
+      vim.fn.expand "~" ..
+      "/Library/Mobile Documents/iCloud~md~obsidian/Documents/Main/**.md",
     },
     opts = function(_, o)
       o.preferred_link_style = "markdown"
@@ -295,7 +302,8 @@ local M = {
       vim.keymap.set("n", "<leader>Ml", function()
         vim.cmd.MoltenEvaluateLine()
       end, { desc = "MoltenEvaluateLine" })
-      vim.keymap.set("v", "<leader>Mv", ":<C-u>MoltenEvaluateVisual<CR>gv", { desc = "MoltenEvaluateVisual" })
+      vim.keymap.set("v", "<leader>Mv", ":<C-u>MoltenEvaluateVisual<CR>gv",
+        { desc = "MoltenEvaluateVisual" })
       vim.keymap.set("n", "<leader>Ma", function()
         vim.cmd.MoltenEvaluateArgument()
       end, { desc = "MoltenEvaluateArgument" })
@@ -405,4 +413,4 @@ local M = {
   },
 }
 
-return M
+return M