From 6d16c65e7bdad93d8cc57143f7d18fdb34e7f8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20H=C3=B6hne?= Date: Sun, 1 Jun 2025 23:20:42 +0200 Subject: [PATCH] Removing ale --- init.lua | 3 -- lazy-lock.json | 38 ++++++++--------- lua/core/keymaps.lua | 14 +++---- lua/core/options.lua | 83 +++++++++++++++++++------------------- lua/plugins/ale.lua | 3 -- lua/plugins/lsp.lua | 2 +- lua/plugins/none-ls.lua | 1 + lua/plugins/treesitter.lua | 63 +++++++++++++++-------------- 8 files changed, 102 insertions(+), 105 deletions(-) delete mode 100644 lua/plugins/ale.lua diff --git a/init.lua b/init.lua index 2b5d709..7813787 100644 --- a/init.lua +++ b/init.lua @@ -67,9 +67,6 @@ require("lazy").setup({ -- Leap require("plugins.leap"), - - -- Ale - require("plugins.ale"), }) -- Setup color scheme diff --git a/lazy-lock.json b/lazy-lock.json index aca7dd3..358aa37 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,51 +1,51 @@ { - "LuaSnip": { "branch": "master", "commit": "6f4a04fd0c484a8c704955c137d3fe424fcce0fc" }, - "ale": { "branch": "master", "commit": "2f4a8665916e8bf44a30bbdc8a820692edd9f652" }, - "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, + "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, + "alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" }, "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, + "catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb" }, - "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, + "hererocks": { "branch": "master", "commit": "344c46ed54df9a4dbc2d2bf510dcd9a9d90497bf" }, "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" }, "image_preview.nvim": { "branch": "main", "commit": "3f3f46210ba13bf82b1eb750b2d6d90eb211ee24" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "leap.nvim": { "branch": "main", "commit": "2b68ddc0802bd295e64c9e2e75f18f755e50dbcc" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "leap.nvim": { "branch": "main", "commit": "189102b07cdd24de3bd7132e57da8c9614c385fc" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "87888865fa1ce1928a25b9abbea8c8f7839bf522" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, - "none-ls.nvim": { "branch": "main", "commit": "7c493a266a6b1ed419f8a2e431651bc15b10df27" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" }, + "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lspconfig": { "branch": "master", "commit": "1b801f68d09e70e59e6dd967b663b6d84ee3e87d" }, - "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, - "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" }, + "nvim-lspconfig": { "branch": "master", "commit": "d45702594afc661a9dfa95e96acf18c56006d4d9" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, "vim-rhubarb": { "branch": "master", "commit": "386daa2e9d98e23e27ad089afcbe5c5a903e488d" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" }, + "vim-tmux-navigator": { "branch": "master", "commit": "ad4c04239d970981942d6a3e1195a770df09d0d7" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index b245623..acd5f12 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -36,12 +36,12 @@ vim.keymap.set("n", "l", ":vertical resize +2", opts) vim.keymap.set("n", "", ":bnext", opts) vim.keymap.set("n", "", ":bprevious", opts) vim.keymap.set("n", "q", ":bdelete!:bnext", opts) -- close buffer -vim.keymap.set("n", "b", " enew ", opts) -- new buffer +vim.keymap.set("n", "b", " enew ", opts) -- new buffer -- Window management -vim.keymap.set("n", "v", "v", opts) -- split window vertically -vim.keymap.set("n", "h", "s", opts) -- split window horizontally -vim.keymap.set("n", "se", "=", opts) -- make split windows equal width & height +vim.keymap.set("n", "v", "v", opts) -- split window vertically +vim.keymap.set("n", "h", "s", opts) -- split window horizontally +vim.keymap.set("n", "se", "=", opts) -- make split windows equal width & height vim.keymap.set("n", "xs", ":close", opts) -- close current split window -- Navigate between splits @@ -51,10 +51,10 @@ vim.keymap.set("n", "", ":wincmd h", opts) vim.keymap.set("n", "", ":wincmd l", opts) -- Tabs -vim.keymap.set("n", "to", ":tabnew", opts) -- open new tab +vim.keymap.set("n", "to", ":tabnew", opts) -- open new tab vim.keymap.set("n", "tx", ":tabclose", opts) -- close current tab -vim.keymap.set("n", "tn", ":tabn", opts) -- go to next tab -vim.keymap.set("n", "tp", ":tabp", opts) -- go to previous tab +vim.keymap.set("n", "tn", ":tabn", opts) -- go to next tab +vim.keymap.set("n", "tp", ":tabp", opts) -- go to previous tab -- Toggle line wrapping vim.keymap.set("n", "lw", "set wrap!", opts) diff --git a/lua/core/options.lua b/lua/core/options.lua index cd27dfe..dc59037 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -1,42 +1,43 @@ -vim.wo.number = true -- Make line numbers default (default: false) -vim.o.clipboard = "unnamedplus" -- Sync clipboard between OS and Neovim. (default: '') -vim.o.wrap = false -- Display lines as one long line (default: true) -vim.o.linebreak = true -- Companion to wrap, don't split words (default: false) -vim.o.mouse = "a" -- Enable mouse mode (default: '') -vim.o.autoindent = true -- Copy indent from current line when starting new one (default: true) -vim.o.ignorecase = true -- Case-insensitive searching UNLESS \C or capital in search (default: false) -vim.o.smartcase = true -- Smart case (default: false) -vim.o.shiftwidth = 4 -- The number of spaces inserted for each indentation (default: 8) -vim.o.tabstop = 4 -- Insert n spaces for a tab (default: 8) -vim.o.softtabstop = 4 -- Number of spaces that a tab counts for while performing editing operations (default: 0) -vim.o.expandtab = true -- Convert tabs to spaces (default: false) -vim.o.scrolloff = 4 -- Minimal number of screen lines to keep above and below the cursor (default: 0) -vim.o.sidescrolloff = 8 -- Minimal number of screen columns either side of cursor if wrap is `false` (default: 0) -vim.o.cursorline = false -- Highlight the current line (default: false) -vim.o.splitbelow = true -- Force all horizontal splits to go below current window (default: false) -vim.o.splitright = true -- Force all vertical splits to go to the right of current window (default: false) -vim.o.hlsearch = false -- Set highlight on search (default: true) -vim.o.showmode = false -- We don't need to see things like -- INSERT -- anymore (default: true) -vim.opt.termguicolors = true -- Set termguicolors to enable highlight groups (default: false) -vim.o.whichwrap = "bs<>[]hl" -- Which "horizontal" keys are allowed to travel to prev/next line (default: 'b,s') -vim.o.numberwidth = 4 -- Set number column width to 2 {default 4} (default: 4) -vim.o.swapfile = false -- Creates a swapfile (default: true) -vim.o.smartindent = true -- Make indenting smarter again (default: false) -vim.o.showtabline = 2 -- Always show tabs (default: 1) -vim.o.backspace = "indent,eol,start" -- Allow backspace on (default: 'indent,eol,start') -vim.o.pumheight = 10 -- Pop up menu height (default: 0) -vim.o.conceallevel = 0 -- So that `` is visible in markdown files (default: 1) -vim.wo.signcolumn = "yes" -- Keep signcolumn on by default (default: 'auto') -vim.o.fileencoding = "utf-8" -- The encoding written to a file (default: 'utf-8') -vim.o.cmdheight = 1 -- More space in the Neovim command line for displaying messages (default: 1) -vim.o.breakindent = true -- Enable break indent (default: false) -vim.o.updatetime = 250 -- Decrease update time (default: 4000) -vim.o.timeoutlen = 300 -- Time to wait for a mapped sequence to complete (in milliseconds) (default: 1000) -vim.o.backup = false -- Creates a backup file (default: false) -vim.o.writebackup = false -- If a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited (default: true) -vim.o.undofile = true -- Save undo history (default: false) -vim.o.completeopt = "menuone,noselect" -- Set completeopt to have a better completion experience (default: 'menu,preview') -vim.opt.shortmess:append("c") -- Don't give |ins-completion-menu| messages (default: does not include 'c') -vim.opt.iskeyword:append("-") -- Hyphenated words recognized by searches (default: does not include '-') -vim.opt.formatoptions:remove({ "c", "r", "o" }) -- Don't insert the current comment leader automatically for auto-wrapping comments using 'textwidth', hitting in insert mode, or hitting 'o' or 'O' in normal mode. (default: 'croql') +vim.wo.number = true -- Make line numbers default (default: false) +vim.o.clipboard = "unnamedplus" -- Sync clipboard between OS and Neovim. (default: '') +vim.o.wrap = false -- Display lines as one long line (default: true) +vim.o.linebreak = true -- Companion to wrap, don't split words (default: false) +vim.o.mouse = "a" -- Enable mouse mode (default: '') +vim.o.autoindent = true -- Copy indent from current line when starting new one (default: true) +vim.o.ignorecase = true -- Case-insensitive searching UNLESS \C or capital in search (default: false) +vim.o.smartcase = true -- Smart case (default: false) +vim.o.shiftwidth = 4 -- The number of spaces inserted for each indentation (default: 8) +vim.o.tabstop = 4 -- Insert n spaces for a tab (default: 8) +vim.o.softtabstop = 4 -- Number of spaces that a tab counts for while performing editing operations (default: 0) +vim.o.expandtab = true -- Convert tabs to spaces (default: false) +vim.o.scrolloff = 4 -- Minimal number of screen lines to keep above and below the cursor (default: 0) +vim.o.sidescrolloff = 8 -- Minimal number of screen columns either side of cursor if wrap is `false` (default: 0) +vim.o.cursorline = false -- Highlight the current line (default: false) +vim.o.splitbelow = true -- Force all horizontal splits to go below current window (default: false) +vim.o.splitright = true -- Force all vertical splits to go to the right of current window (default: false) +vim.o.hlsearch = false -- Set highlight on search (default: true) +vim.o.showmode = false -- We don't need to see things like -- INSERT -- anymore (default: true) +vim.opt.termguicolors = true -- Set termguicolors to enable highlight groups (default: false) +vim.o.whichwrap = "bs<>[]hl" -- Which "horizontal" keys are allowed to travel to prev/next line (default: 'b,s') +vim.o.numberwidth = 4 -- Set number column width to 2 {default 4} (default: 4) +vim.o.swapfile = false -- Creates a swapfile (default: true) +vim.o.smartindent = true -- Make indenting smarter again (default: false) +vim.o.showtabline = 2 -- Always show tabs (default: 1) +vim.o.backspace = "indent,eol,start" -- Allow backspace on (default: 'indent,eol,start') +vim.o.pumheight = 10 -- Pop up menu height (default: 0) +vim.o.conceallevel = 0 -- So that `` is visible in markdown files (default: 1) +vim.wo.signcolumn = "yes" -- Keep signcolumn on by default (default: 'auto') +vim.o.fileencoding = "utf-8" -- The encoding written to a file (default: 'utf-8') +vim.o.cmdheight = 1 -- More space in the Neovim command line for displaying messages (default: 1) +vim.o.breakindent = true -- Enable break indent (default: false) +vim.o.updatetime = 250 -- Decrease update time (default: 4000) +vim.o.timeoutlen = 300 -- Time to wait for a mapped sequence to complete (in milliseconds) (default: 1000) +vim.o.backup = false -- Creates a backup file (default: false) +vim.o.writebackup = false -- If a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited (default: true) +vim.o.undofile = true -- Save undo history (default: false) +vim.o.completeopt = +"menuone,noselect" -- Set completeopt to have a better completion experience (default: 'menu,preview') +vim.opt.shortmess:append("c") -- Don't give |ins-completion-menu| messages (default: does not include 'c') +vim.opt.iskeyword:append("-") -- Hyphenated words recognized by searches (default: does not include '-') +vim.opt.formatoptions:remove({ "c", "r", "o" }) -- Don't insert the current comment leader automatically for auto-wrapping comments using 'textwidth', hitting in insert mode, or hitting 'o' or 'O' in normal mode. (default: 'croql') vim.opt.runtimepath:remove("/usr/share/vim/vimfiles") -- Separate Vim plugins from Neovim in case Vim still in use (default: includes this path if Vim is installed) diff --git a/lua/plugins/ale.lua b/lua/plugins/ale.lua deleted file mode 100644 index 6d47c24..0000000 --- a/lua/plugins/ale.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "dense-analysis/ale", -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 6367005..479821d 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -155,13 +155,13 @@ return { -- clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- -- Some languages (like typescript) have entire language plugins that can be useful: -- https://github.com/pmizio/typescript-tools.nvim -- -- But for many setups, the LSP (`tsserver`) will work just fine + rust_analyzer = {}, ts_ls = {}, -- tsserver is deprecated ruff = {}, pylsp = { diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index cf83806..cf1845c 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -19,6 +19,7 @@ return { "checkmake", -- linter for Makefiles "ruff", -- Python linter and formatter "clangd", + "ocamlformat", }, automatic_installation = true, }) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 03adf62..0fe77a4 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,33 +1,34 @@ return { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - main = 'nvim-treesitter.configs', -- Sets main module to use for opts - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - opts = { - ensure_installed = { - 'bash', - 'c', - 'cpp', - 'python', - 'javascript', - 'html', - 'css' - }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { 'ruby' }, - }, - indent = { enable = true, disable = { 'ruby' } }, - }, - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + main = "nvim-treesitter.configs", -- Sets main module to use for opts + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + opts = { + ensure_installed = { + "bash", + "c", + "cpp", + "python", + "javascript", + "html", + "css", + "rust", + }, + -- Autoinstall languages that are not installed + auto_install = true, + highlight = { + enable = true, + -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. + -- If you are experiencing weird indenting issues, add the language to + -- the list of additional_vim_regex_highlighting and disabled languages for indent. + additional_vim_regex_highlighting = { "ruby" }, + }, + indent = { enable = true, disable = { "ruby" } }, + }, + -- There are additional nvim-treesitter modules that you can use to interact + -- with nvim-treesitter. You should go explore a few and see what interests you: + -- + -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` + -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context + -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects }