From 9f68a648a70d819d7cf9137855684f05b4edad36 Mon Sep 17 00:00:00 2001 From: VersusTuneZ Date: Tue, 18 Aug 2026 09:12:45 +0200 Subject: [PATCH] feat: improve config --- lazy-lock.json | 52 +++++++++++++------------- lua/config/keymaps.lua | 1 + lua/config/maps/dns.lua | 9 +++++ lua/lsp/clangd.lua | 3 +- lua/lsp/init.lua | 1 - lua/lsp/java.lua | 2 - lua/plugins/conform.lua | 4 +- lua/plugins/dap.lua | 17 +++++++++ lua/plugins/fzflua.lua | 38 ++++++++----------- lua/plugins/java.lua | 7 ++++ lua/plugins/nvim-jdtls.lua | 6 --- lua/plugins/themes.lua | 18 ++++----- lua/plugins/tree.lua | 9 ++++- lua/plugins/treesitter-textobjects.lua | 41 -------------------- lua/plugins/treesitter.lua | 23 +----------- 15 files changed, 97 insertions(+), 134 deletions(-) create mode 100644 lua/config/maps/dns.lua delete mode 100644 lua/lsp/java.lua create mode 100644 lua/plugins/dap.lua create mode 100644 lua/plugins/java.lua delete mode 100644 lua/plugins/nvim-jdtls.lua delete mode 100644 lua/plugins/treesitter-textobjects.lua diff --git a/lazy-lock.json b/lazy-lock.json index d7d970b..c46826a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,34 +1,36 @@ { - "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "calcium.nvim": { "branch": "main", "commit": "7a7d3740083fa5669e1a0f25d133705624a23f0d" }, - "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, - "cyberdream.nvim": { "branch": "main", "commit": "f4e06a39e243e2d6a21a82734db60ba83092c0b6" }, - "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "conform.nvim": { "branch": "master", "commit": "016802de402556da54c36bd7359b441266b01cdd" }, + "fidget.nvim": { "branch": "main", "commit": "6f793b2bcd2d35e201c09520f698bb763220908a" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, - "fzf-lua": { "branch": "main", "commit": "d59f857c76eb474ec00debcf043f14fd001805cc" }, - "helm-ls.nvim": { "branch": "main", "commit": "f0b9a1723890971a6d84890b50dbf5f40974ea1b" }, + "fzf-lua": { "branch": "main", "commit": "05e44d38de0a79c11fba5f7bf8138791b1dbdd1e" }, + "helm-ls.nvim": { "branch": "main", "commit": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fb179adb7161b53ec998b1139002473434586c3f" }, + "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9d28935aa95fa6c1dc7c4d6747f101a72a8a4bec" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.diff": { "branch": "main", "commit": "fbb93ea1728e7c9d0944df8bd022a68402bd2e7e" }, - "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" }, - "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, - "neoconf.nvim": { "branch": "main", "commit": "5dc91652bf5b7285b49ce2c8e4262e385143ab5f" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, + "mini.diff": { "branch": "main", "commit": "0743d26bd858ebe32efcf5c86a91a422a000f273" }, + "mini.icons": { "branch": "main", "commit": "98faae31e9be1cc054ae63485e58ceb185efcad0" }, + "mini.misc": { "branch": "main", "commit": "0524e8f7191782609374df6bcf9e607021ceccb1" }, + "neoconf.nvim": { "branch": "main", "commit": "8560c245f6a5bc7bb229c00d9d0627d02ef9b4e8" }, + "nightfox.nvim": { "branch": "main", "commit": "4dacd3f0185a2227bdf3b6c0975a8f0bf87cac9a" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" }, - "nvim-jdtls": { "branch": "master", "commit": "291dad797b5427ca0c9b7e0dd261279c7c3823e1" }, - "nvim-lspconfig": { "branch": "master", "commit": "ff9c0af8f9b2097fdd2695058db7e04c193908aa" }, - "nvim-tree.lua": { "branch": "master", "commit": "a0db8bf7d6488b1dcd9cb5b0dfd6684a1e14f769" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, - "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "d6b802552cbe7d643a3b6b31f419c248d1f1e220" }, - "render-markdown.nvim": { "branch": "main", "commit": "c54380dd4d8d1738b9691a7c349ecad7967ac12e" }, - "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, - "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, + "nui.nvim": { "branch": "main", "commit": "a25dd472316d806eb38a5dd667c2e40da5570c75" }, + "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, + "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" }, + "nvim-dap-view": { "branch": "main", "commit": "4e73e57008df10f9971b60c3a11e6aa11ba9f94a" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, + "nvim-intellij-lsp": { "branch": "main", "commit": "32b1ded4655fb8571a4e3b68d432dbafa0e6b081" }, + "nvim-lspconfig": { "branch": "master", "commit": "fbaef6156f9ad65790931ab543ab1dfec57bbec7" }, + "nvim-tree.lua": { "branch": "master", "commit": "531b807b8f0d6f75016a0ee1e0cd5ce2086e9d95" }, + "nvim-treesitter": { "branch": "main", "commit": "074aa4422bf029908338e855d0c0f71470a971bb" }, + "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "012f1480cd9a5fc99fce7678e0a536421a53fc46" }, + "render-markdown.nvim": { "branch": "main", "commit": "4663eb3ecd538bd5062628fb6d95bbe6bdca78f6" }, + "rose-pine": { "branch": "main", "commit": "ff483051a47e27d84bdef47703538df1ed9f4a47" }, + "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 142cebf..877235d 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -7,3 +7,4 @@ vim.keymap.set("n", "", "e#", { desc = "Previous file" }) require("config.maps.maven") require("config.maps.cpp") require("config.maps.vue") +require("config.maps.dns") diff --git a/lua/config/maps/dns.lua b/lua/config/maps/dns.lua new file mode 100644 index 0000000..015a85d --- /dev/null +++ b/lua/config/maps/dns.lua @@ -0,0 +1,9 @@ +vim.api.nvim_create_autocmd("FileType", { + pattern = "bindzone", + callback = function() + vim.opt_local.expandtab = true + vim.opt_local.tabstop = 4 + vim.opt_local.shiftwidth = 4 + vim.opt_local.list = false + end, +}) diff --git a/lua/lsp/clangd.lua b/lua/lsp/clangd.lua index b994eb2..d1decb0 100644 --- a/lua/lsp/clangd.lua +++ b/lua/lsp/clangd.lua @@ -1,6 +1,5 @@ return { cmd = { - "/usr/sbin/clangd", - "-experimental-modules-support", + "/usr/bin/clangd", }, } diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index eeda0a7..ca92468 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -9,7 +9,6 @@ end return { lua_ls = require("lsp.lua"), - jdtls = require("lsp.java"), clangd = require("lsp.clangd"), ts_ls = require("lsp.ts_ls"), } diff --git a/lua/lsp/java.lua b/lua/lsp/java.lua deleted file mode 100644 index 97aeadd..0000000 --- a/lua/lsp/java.lua +++ /dev/null @@ -1,2 +0,0 @@ -return { -} diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index e9b9a6a..3fdee5e 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -5,8 +5,8 @@ return { timeout_ms = 500, }, formatters_by_ft = { - javascript = { "prettierd", "prettier", stop_after_first = true }, - typescript = { "prettierd", "prettier", stop_after_first = true }, + javascript = { "prettierd", "prettier", "deno_fmt", stop_after_first = true }, + typescript = { "prettierd", "prettier", "deno_fmt", stop_after_first = true }, vue = { "prettierd", "prettier", stop_after_first = true }, rust = { "rustfmt", lsp_format = "fallback" }, java = { "spotless", "google-java-format" }, diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua new file mode 100644 index 0000000..d0829f7 --- /dev/null +++ b/lua/plugins/dap.lua @@ -0,0 +1,17 @@ +return { + "mfussenegger/nvim-dap", + dependencies = { + "igorlfs/nvim-dap-view", + "theHamsta/nvim-dap-virtual-text", + "ibhagwan/fzf-lua", + }, + keys = { + { "dt", "DapViewToggle" }, + { "db", "DapToggleBreakpoint" }, + { "dc", "DapContinue" }, + { "dw", "DapViewWatch" }, + }, + config = function() + require("nvim-dap-virtual-text").setup() + end, +} diff --git a/lua/plugins/fzflua.lua b/lua/plugins/fzflua.lua index 4edfe00..2ecfa24 100644 --- a/lua/plugins/fzflua.lua +++ b/lua/plugins/fzflua.lua @@ -1,22 +1,30 @@ return { "ibhagwan/fzf-lua", dependencies = { "echasnovski/mini.icons" }, - opts = {}, + opts = { + files = { + rg_opts = [[--color=never --files -g "!.git" -g "!.jj" -g "!node_modules/" -g "!target/"]], + }, + }, keys = { { "ff", - function() require('fzf-lua').files() end, - desc = "Find Files in project directory" + function() + require("fzf-lua").files() + end, + desc = "Find Files in project directory", }, { "fg", - function() require('fzf-lua').live_grep() end, - desc = "Find by grepping in project directory" + function() + require("fzf-lua").live_grep() + end, + desc = "Find by grepping in project directory", }, { "fc", - function() require('fzf-lua').files({ cwd = vim.fn.stdpath("config") }) end, - desc = "Find in neovim configuration" + "FzfLua git_diff", + desc = "Find in git files", }, { "fh", @@ -39,20 +47,6 @@ return { end, desc = "[F]ind [B]uiltin FZF", }, - { - "fw", - function() - require("fzf-lua").grep_cword() - end, - desc = "[F]ind current [W]ord", - }, - { - "fW", - function() - require("fzf-lua").grep_cWORD() - end, - desc = "[F]ind current [W]ORD", - }, { "fd", function() @@ -88,5 +82,5 @@ return { end, desc = "[/] Live grep the current buffer", }, - } + }, } diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua new file mode 100644 index 0000000..62d11cd --- /dev/null +++ b/lua/plugins/java.lua @@ -0,0 +1,7 @@ +-- for now we use the intellij lsp, but if this goes paid we go jls or so +return { + "gipo355/nvim-intellij-lsp", + opts = { + server_dir = vim.fn.stdpath("data") .. "/intellij-server", + }, +} diff --git a/lua/plugins/nvim-jdtls.lua b/lua/plugins/nvim-jdtls.lua deleted file mode 100644 index f046acd..0000000 --- a/lua/plugins/nvim-jdtls.lua +++ /dev/null @@ -1,6 +0,0 @@ -local java_filetypes = { 'java', 'kt' } - -return { - "mfussenegger/nvim-jdtls", - ft = java_filetypes, -} diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua index 365973a..ea077b1 100644 --- a/lua/plugins/themes.lua +++ b/lua/plugins/themes.lua @@ -1,15 +1,13 @@ return { { - "scottmckendry/cyberdream.nvim", - lazy = false, - priority = 1000, + "EdenEast/nightfox.nvim", config = function() - require("cyberdream").setup({ - transparent = true, - borderless_pickers = false, - terminal_colors = true, + require("nightfox").setup({ + options = { + transparent = true, + }, }) - --vim.cmd("colorscheme cyberdream") + vim.cmd("colorscheme carbonfox") end, }, { @@ -26,10 +24,10 @@ return { styles = { bold = true, italic = false, - transparency = false, + transparency = true, }, }) - vim.cmd("colorscheme rose-pine-main") + --vim.cmd("colorscheme rose-pine-main") end, }, } diff --git a/lua/plugins/tree.lua b/lua/plugins/tree.lua index 3e60683..149bfc8 100644 --- a/lua/plugins/tree.lua +++ b/lua/plugins/tree.lua @@ -7,13 +7,18 @@ return { "nvim-tree/nvim-web-devicons", }, config = function() - require("nvim-tree").setup({}) + require("nvim-tree").setup({ + git = { + enable = true, + ignore = false, + }, + }) end, keys = { { "e", function() - vim.cmd("NvimTreeToggle") + vim.cmd("NvimTreeFindFileToggle") end, desc = "File Explorer", }, diff --git a/lua/plugins/treesitter-textobjects.lua b/lua/plugins/treesitter-textobjects.lua deleted file mode 100644 index 67d9eb1..0000000 --- a/lua/plugins/treesitter-textobjects.lua +++ /dev/null @@ -1,41 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter-textobjects", - branch = "master", - dependencies = { - "nvim-treesitter/nvim-treesitter" - }, - init = function() - local config = require 'nvim-treesitter.configs'; - config.setup({ - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ao"] = "@comment.outer", - ["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" }, - ["as"] = { query = "@local.scope", query_group = "locals", desc = "Select language scope" }, - }, - selection_modes = { - ['@parameter.outer'] = 'v', -- charwise - ['@function.outer'] = 'V', -- linewise - ['@class.outer'] = '', -- blockwise - }, - include_surrounding_whitespace = true, - }, - swap = { - enable = true, - swap_next = { - ["Ca"] = { query = "@parameter.inner", desc = "Swap with next parameter" }, - }, - swap_previous = { - ["CA"] = "@parameter.inner", - }, - }, - }, - }); - end -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index a2f5b46..5e2ea9c 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -2,25 +2,6 @@ return { "nvim-treesitter/nvim-treesitter", lazy = false, build = ":TSUpdate", - branch = "master", - config = function() - local configs = require("nvim-treesitter.configs") - - configs.setup({ - ensure_installed = { "lua", "markdown_inline" }, - auto_install = false, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", -- set to `false` to disable one of the mappings - node_incremental = "", - scope_incremental = false, - node_decremental = "", - }, - }, - }) - end + branch = "main", + config = function() end, }