feat: improve config

lua/config/keymaps.lua

@@ -7,3 +7,4 @@ vim.keymap.set("n", "<M-BS>", "<CMD>e#<CR>", { desc = "Previous file" })
 require("config.maps.maven")
 require("config.maps.cpp")
 require("config.maps.vue")
+require("config.maps.dns")

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,
+})

lua/lsp/clangd.lua

@@ -1,6 +1,5 @@
 return {
   cmd = {
-    "/usr/sbin/clangd",
-    "-experimental-modules-support",
+    "/usr/bin/clangd",
   },
 }

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"),
 }

lua/lsp/java.lua

@@ -1,2 +0,0 @@
-return {
-}

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" },

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 = {
+    { "<leader>dt", "<cmd>DapViewToggle<cr>" },
+    { "<leader>db", "<cmd>DapToggleBreakpoint<cr>" },
+    { "<leader>dc", "<cmd>DapContinue<cr>" },
+    { "<leader>dw", "<cmd>DapViewWatch<cr>" },
+  },
+  config = function()
+    require("nvim-dap-virtual-text").setup()
+  end,
+}

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 = {
     {
       "<leader>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",
     },
     {
       "<leader>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",
     },
     {
       "<leader>fc",
-      function() require('fzf-lua').files({ cwd = vim.fn.stdpath("config") }) end,
-      desc = "Find in neovim configuration"
+      "<cmd>FzfLua git_diff<cr>",
+      desc = "Find in git files",
     },
     {
       "<leader>fh",
@@ -39,20 +47,6 @@ return {
       end,
       desc = "[F]ind [B]uiltin FZF",
     },
-    {
-      "<leader>fw",
-      function()
-        require("fzf-lua").grep_cword()
-      end,
-      desc = "[F]ind current [W]ord",
-    },
-    {
-      "<leader>fW",
-      function()
-        require("fzf-lua").grep_cWORD()
-      end,
-      desc = "[F]ind current [W]ORD",
-    },
     {
       "<leader>fd",
       function()
@@ -88,5 +82,5 @@ return {
       end,
       desc = "[/] Live grep the current buffer",
     },
-  }
+  },
 }

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",
+  },
+}

lua/plugins/nvim-jdtls.lua

@@ -1,6 +0,0 @@
-local java_filetypes = { 'java', 'kt' }
-
-return {
-  "mfussenegger/nvim-jdtls",
-  ft = java_filetypes,
-}

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,
   },
 }

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 = {
       {
         "<leader>e",
         function()
-          vim.cmd("NvimTreeToggle")
+          vim.cmd("NvimTreeFindFileToggle")
         end,
         desc = "File Explorer",
       },

lua/plugins/treesitter-textobjects.lua

@@ -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'] = '<c-v>', -- blockwise
-          },
-          include_surrounding_whitespace = true,
-        },
-        swap = {
-          enable = true,
-          swap_next = {
-            ["<leader>Ca"] = { query = "@parameter.inner", desc = "Swap with next parameter" },
-          },
-          swap_previous = {
-            ["<leader>CA"] = "@parameter.inner",
-          },
-        },
-      },
-    });
-  end
-}

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 = "<Enter>",           -- set to `false` to disable one of the mappings
-          node_incremental = "<Enter>",
-          scope_incremental = false,
-          node_decremental = "<Backspace>",
-        },
-      },
-    })
-  end
+  branch = "main",
+  config = function() end,
 }