add json and c# indentation rules

commit 7322bc0f73
Author: anth64 <anth64@protonmail.com>
Date:   Tue Apr 15 22:21:09 2025 +0200

    use lspconfig

commit 5577628a22
Author: anth64 <anth64@protonmail.com>
Date:   Tue Apr 15 20:08:14 2025 +0200

    reorderd lazy and config

commit 7f1a3b82da
Author: anth64 <anth64@protonmail.com>
Date:   Tue Apr 15 19:29:43 2025 +0200

    add colorschemes, default to moonfly

commit 466c8cf410
Author: anth64 <anth64@protonmail.com>
Date:   Tue Apr 15 18:51:56 2025 +0200

    make it work on windows as well

commit a9d9c2199d
Author: anth64 <anth64@protonmail.com>
Date:   Fri Apr 11 07:26:54 2025 +0200

    added jdtls and newline to end of files

commit 4db9e65e6f
Author: anth64 <anth64@protonmail.com>
Date:   Thu Apr 10 22:33:16 2025 +0200

    remove redundant remap of mapleader

commit bb0ad9af1b
Author: anth64 <anth64@protonmail.com>
Date:   Thu Apr 10 22:28:45 2025 +0200

    readd telescope and harpoon

commit 1a56e26e6b
Author: anth64 <anth64@protonmail.com>
Date:   Thu Apr 10 22:20:12 2025 +0200

    redid mapping, set and util, also readded nvim-cmp and cmp-nvim-lsp

commit 690e575c03
Author: anth64 <anth64@protonmail.com>
Date:   Wed Apr 9 23:23:51 2025 +0200

    make sure that colorscheme is not touched

commit 0ab0b593f2
Author: anth64 <anth64@protonmail.com>
Date:   Wed Apr 9 22:56:58 2025 +0200

    add lazy.nvim and lualine plugin

commit a8dd286e39
Author: anth64 <anth64@protonmail.com>
Date:   Wed Apr 9 07:59:00 2025 +0200

    initial configuration

README.md

@@ -3,3 +3,4 @@
 [ripgrep](https://github.com/BurntSushi/ripgrep) is required for this to work.
 
 My configuration for Neovim.
+

after/ftplugin/cs.lua

@@ -0,0 +1,3 @@
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 4
+vim.opt_local.tabstop = 4

after/ftplugin/html.lua

@@ -0,0 +1,3 @@
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2

after/ftplugin/java.lua

@@ -0,0 +1,11 @@
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 4
+vim.opt_local.tabstop = 4
+
+local home = os.getenv("HOME") or os.getenv("USERPROFILE")
+local config = {
+  cmd = { home .. '/.local/share/java/jdtls/bin/jdtls' },
+  root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]),
+}
+
+require('jdtls').start_or_attach(config)

after/ftplugin/javascript.lua

@@ -0,0 +1,3 @@
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2

after/ftplugin/json.lua

@@ -0,0 +1,3 @@
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 4
+vim.opt_local.tabstop = 4

after/ftplugin/lua.lua

@@ -0,0 +1,3 @@
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2

ftplugin/java.lua

@@ -1,5 +0,0 @@
-local config = {
-  cmd = { os.getenv('HOME') .. '/.local/share/java/jdtls/bin/jdtls' },
-  root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]),
-}
-require('jdtls').start_or_attach(config)

init.lua

@@ -1,3 +1,21 @@
+require("config.lazy")
 require("config.set")
 require("config.remap")
-require("config.lazy")
+
+vim.cmd("set completeopt+=noselect")
+
+vim.lsp.enable({
+  'basedpyright',
+  'clangd',
+  'csharp_ls',
+  'cssls',
+  'eslint',
+  'gopls',
+  'html',
+  'jsonls',
+  'lua_ls',
+  'ts_ls',
+  'yamlls',
+})
+
+vim.o.winborder = 'rounded'

lua/config/lazy.lua

@@ -28,8 +28,6 @@ require("lazy").setup({
     { import = "plugins" },
   },
   -- Configure any other settings here. See the documentation for more details.
-  -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "habamax" } },
   -- automatically check for plugin updates
   checker = { enabled = true },
 })

lua/config/remap.lua

@@ -1,2 +1 @@
-vim.g.mapleader = " "
 vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)

lua/config/set.lua

@@ -1,38 +1,25 @@
-vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
-  group = vim.api.nvim_create_augroup("float_diagnostic_cursor", { clear = true }),
-  callback = function ()
-    vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})
-  end
-})
-
-vim.opt.shell="zsh"
 vim.opt.fileformat = "unix"
 vim.opt.fileformats = "unix"
-vim.opt.cmdheight = 0
+vim.opt.fixendofline = true
 vim.opt.guicursor = ""
 vim.opt.mouse = ""
 
-vim.opt.nu = true
+vim.opt.number = true
 vim.opt.relativenumber = true
 
-vim.opt.tabstop = 2
-vim.opt.softtabstop = 2
-vim.opt.shiftwidth = 2
-vim.opt.expandtab = true
-
 vim.opt.smartindent = true
 
-vim.opt.wrap = false
-
 vim.opt.swapfile = false
 vim.opt.backup = false
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+local home = os.getenv("HOME") or os.getenv("USERPROFILE")
+vim.opt.undodir = home .. "/.vim/undodir"
 vim.opt.undofile = true
 
 vim.opt.hlsearch = false
 vim.opt.incsearch = true
 
 vim.opt.termguicolors = true
+
 vim.opt.scrolloff = 8
 vim.opt.signcolumn = "yes"
 vim.opt.isfname:append("@-@")
@@ -40,7 +27,8 @@ vim.opt.isfname:append("@-@")
 vim.opt.updatetime = 50
 
 vim.opt.colorcolumn = "80"
-
 vim.g.c_syntax_for_h = 1
-vim.g.mapleader = " "
 
+vim.cmd.colorscheme("moonfly")
+
+vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { noremap = true, silent = true })

lua/plugins/completion.lua

@@ -0,0 +1,13 @@
+return {
+  'saghen/blink.cmp',
+  dependencies = { 'rafamadriz/friendly-snippets' },
+  version = '1.*',
+
+  opts = {
+    keymap = { preset = 'default' },
+    appearance = {
+      nerd_font_variant = 'mono'
+    },
+    signature = { enabled = true }
+  },
+}

lua/plugins/lsp.lua

@@ -1,76 +1,37 @@
 return {
-  { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
-  { "mfussenegger/nvim-jdtls" },
   {
     "neovim/nvim-lspconfig",
-    config = function()
-      local lspconfig = require("lspconfig")
-      lspconfig.lua_ls.setup {}
-      lspconfig.ccls.setup {}
-      lspconfig.basedpyright.setup {
-        settings = {
-          basedpyright = {
-            analysis = {
-              typeCheckingMode = "basic",
-              inlayHints = { callArgumentNames = true }
-            }
-          }
-        }
-      }
-      lspconfig.yamlls.setup {}
-    end,
-  },
-  {
-    "VonHeikemen/lsp-zero.nvim",
     dependencies = {
-      "neovim/nvim-lspconfig",
-      "hrsh7th/nvim-cmp",
-      "hrsh7th/cmp-nvim-lsp"
+      "saghen/blink.cmp"
     },
     config = function()
-      vim.opt.signcolumn = 'yes'
-
-      local lspconfig_defaults = require('lspconfig').util.default_config
-      lspconfig_defaults.capabilities = vim.tbl_deep_extend(
-        'force',
-        lspconfig_defaults.capabilities,
-        require('cmp_nvim_lsp').default_capabilities()
-      )
-
       vim.api.nvim_create_autocmd('LspAttach', {
-        desc = 'LSP actions',
-        callback = function(event)
-          local opts = { buffer = event.buf }
-
-          vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
-          vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
-          vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
-          vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)
-          vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
-          vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', opts)
-          vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
-          vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
-          vim.keymap.set({ 'n', 'x' }, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', opts)
-          vim.keymap.set('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)
+        group = vim.api.nvim_create_augroup('my.lsp', {}),
+        callback = function(args)
+          local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
+          if not client then return end
+          if client:supports_method('textDocument/formatting') then
+            vim.api.nvim_create_autocmd('BufWritePre', {
+              group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
+              buffer = args.buf,
+              callback = function()
+                vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
               end,
             })
-
-      local lspconfig = require('lspconfig')
-      lspconfig.lua_ls.setup{}
-
-      local cmp = require('cmp')
-
-      cmp.setup({
-        sources = {
-          { name = 'nvim_lsp' },
-        },
-        snippet = {
-          expand = function(args)
-            vim.snippet.expand(args.body)
+          end
         end,
-        },
-        mapping = cmp.mapping.preset.insert({}),
       })
-    end,
-  }
+    end
+  },
+  {
+    "folke/lazydev.nvim",
+    ft = "lua",
+    opts = {
+      library = {
+        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
+      },
+    },
+  },
+  { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
+  { "mfussenegger/nvim-jdtls" } -- jdtls bindings for neovim
 }

lua/plugins/util.lua

@@ -1,19 +1,4 @@
 return {
-  {
-    "theprimeagen/harpoon",
-    config = function()
-      local mark = require("harpoon.mark")
-      local ui = require("harpoon.ui")
-
-      vim.keymap.set("n", "<leader>a", mark.add_file)
-      vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
-
-      vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
-      vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
-      vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
-      vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
-    end,
-  },
   {
     "mbbill/undotree",
     config = function()
@@ -28,7 +13,10 @@ return {
   },
   {
     "nvim-telescope/telescope.nvim",
-    dependencies = {"nvim-lua/plenary.nvim"},
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }
+    },
     config = function()
       local builtin = require('telescope.builtin')
       vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
@@ -37,5 +25,20 @@ return {
         builtin.grep_string({ search = vim.fn.input("Grep > ") });
       end)
     end,
+  },
+  {
+    "theprimeagen/harpoon",
+    config = function()
+      local mark = require("harpoon.mark")
+      local ui = require("harpoon.ui")
+
+      vim.keymap.set("n", "<leader>a", mark.add_file)
+      vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
+
+      vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
+      vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
+      vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
+      vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
+    end
   }
 }

lua/plugins/visual.lua

@@ -1,14 +1,4 @@
 return {
-	{
-		"oxfist/night-owl.nvim",
-  		lazy = false, -- make sure we load this during startup if it is your main colorscheme
-  		priority = 1000, -- make sure to load this before all the other start plugins
-  		config = function()
-        -- load the colorscheme here
-        require("night-owl").setup()
-    		vim.cmd.colorscheme("night-owl")
-  		end,
-	},
   {
     "nvim-lualine/lualine.nvim",
     dependencies = { "nvim-tree/nvim-web-devicons" },
@@ -16,5 +6,14 @@ return {
     config = function()
       require("lualine").setup()
     end,
-  }
+  },
+  {
+    "bluz71/vim-moonfly-colors",
+    lazy = false,
+    config = function()
+      vim.g.moonflyTransparent = true
+    end,
+  },
+  { "EdenEast/nightfox.nvim", lazy = false },
+  { "oxfist/night-owl.nvim",  lazy = false },
 }