diff --git a/GoogleStyle.xml b/GoogleStyle.xml
deleted file mode 100644
index 1ad1036..0000000
--- a/GoogleStyle.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/init.lua b/init.lua
index cba2549..a0b483a 100644
--- a/init.lua
+++ b/init.lua
@@ -336,36 +336,6 @@ require("lazy").setup({
vim.keymap.set("n", "", builtin.find_files)
end,
},
- {
- "mfussenegger/nvim-jdtls",
- config = function()
- local jdtls = require("jdtls")
-
- -- Find project root
- local root_dir = require("jdtls.setup").find_root({ ".git", "mvnw", "gradlew" })
-
- -- Path to your exported Eclipse/IntelliJ style xml
- local style_path = vim.fn.expand("~/.config/nvim/GoogleStyle.xml")
-
- local config = {
- cmd = { "jdtls" }, -- or path to your startup script
- root_dir = root_dir,
- settings = {
- java = {
- format = {
- settings = {
- url = "file://" .. style_path,
- profile = "GoogleStyle", -- must match the profile inside the xml
- },
- },
- },
- },
- }
-
- jdtls.start_or_attach(config)
- end,
- },
-
{ -- LSP Configuration & Plugins
"neovim/nvim-lspconfig",
opts = {
@@ -479,14 +449,23 @@ require("lazy").setup({
},
},
taplo = {},
- yamlls = { settings = { yaml = { format = { enable = false } } } },
+ yamlls = {},
-- gopls = {},
+ jdtls = {
+ filetypes = { "java" },
+ settings = {
+ java = {
+ format = {
+ settings = {
+ url = "~/RedTop.xml",
+ },
+ },
+ },
+ },
+ },
pyright = {},
fortls = {},
- jsonls = {},
bashls = { dependencies = "shellcheck" },
- kotlin_language_server = {},
- ts_ls = {},
rust_analyzer = {
settings = {
["rust-analyzer"] = {
@@ -806,17 +785,7 @@ require("lazy").setup({
-- You could remove this setup call if you don't like it,
-- and try some other statusline plugin
"echasnovski/mini.nvim",
- keys = {
- {
- "m",
- function()
- require("mini.files").open(vim.api.nvim_buf_get_name(0), true)
- end,
- desc = "Open mini.files (Directory of Current File)",
- },
- },
config = function()
- require("mini.files").setup()
require("mini.statusline").setup({
content = {
active = function()
@@ -879,7 +848,6 @@ require("lazy").setup({
dashboard = { enabled = true },
input = { enabled = true },
terminal = { enabled = true },
- notify = { enabled = true },
},
keys = {
{
@@ -906,15 +874,6 @@ require("lazy").setup({
version = "*",
},
"dhruvasagar/vim-table-mode",
- {
- "MeanderingProgrammer/render-markdown.nvim",
- dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
- -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
- -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
- ---@module 'render-markdown'
- ---@type render.md.UserConfig
- opts = {},
- },
{
"folke/trouble.nvim",
opts = {}, -- for default options, refer to the configuration section for custom setup.
@@ -962,6 +921,21 @@ for _, group in ipairs(vim.fn.getcompletion("@lsp", "highlight")) do
vim.api.nvim_set_hl(0, group, {})
end
+--Testing scorch highlighting
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+ pattern = "*.scorch",
+ callback = function()
+ vim.bo.filetype = "scorch"
+ end,
+})
+--
+--Testing scorch highlighting
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+ pattern = "*.sep",
+ callback = function()
+ vim.bo.filetype = "sep"
+ end,
+})
-- Commands to disable formatting
require("conform").setup({
format_on_save = function(bufnr)
@@ -1000,11 +974,3 @@ local home = os.getenv("HOME")
if file_exists(home .. "/.config/nvim/light_mode") then
vim.opt.background = "light"
end
-
--- Autocommand for java to organize imports on save
---vim.api.nvim_create_autocmd("BufWritePost", {
--- pattern = "*.java",
--- callback = function()
--- require("jdtls").organize_imports()
--- end,
---})