diff --git a/after/ftplugin/scala.lua b/after/ftplugin/scala.lua new file mode 100644 index 0000000..961646c --- /dev/null +++ b/after/ftplugin/scala.lua @@ -0,0 +1,3 @@ +vim.bo.shiftwidth = 4 +vim.bo.tabstop = 4 +vim.bo.softtabstop = 4 diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index e268b80..7f17d17 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -6,4 +6,5 @@ require("rose-pine").setup() -- vim.g.melange_enable_font_variants = 0 -- disable font variants -- require("lush") -- make sure Lush is installed -- require("melange.build").build() -- Compile to vimscript +-- vim.cmd.colorscheme("rose-pine") vim.cmd.colorscheme("melange") diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index b73d288..72eb8a5 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -5,6 +5,7 @@ local conform = require("conform") conform.setup({ formatters_by_ft = { c = { "uncrustify" }, + python = { "ruff" } }, format_on_save = { -- These options will be passed to conform.format() diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index f37e704..da694ce 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -6,7 +6,7 @@ require("fidget").setup() vim.lsp.enable({ 'lua_ls' }) vim.lsp.enable({ 'clangd' }) vim.lsp.enable({ 'spade_ls' }) --- vim.lsp.enable({ 'metals' }) +vim.lsp.enable({ 'pyright' }) vim.lsp.config("rust_analyzer", { settings = { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index fe38df8..c6c92e7 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -62,7 +62,8 @@ local languages = "vimdoc", "yaml", "wgsl", - "spade" + "spade", + "scala" } ts.install(languages):wait(300000) diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 7c3b9c6..a254b45 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -5,11 +5,11 @@ "src": "https://github.com/numToStr/Comment.nvim" }, "blink.cmp": { - "rev": "43cb60895ee109161ae5cffa26444018cc07e570", + "rev": "91774548bc358c02fcc327d33c9ac0d9830c8c47", "src": "https://github.com/saghen/blink.cmp" }, "blink.lib": { - "rev": "c09dd66e9ad97e1a7777f3fa5f0504ca2e877231", + "rev": "b127d48bf8e9ac9cf41f6e0fbead317503f76558", "src": "https://github.com/saghen/blink.lib" }, "colorful-menu.nvim": { @@ -29,7 +29,7 @@ "src": "https://github.com/folke/flash.nvim" }, "gitsigns.nvim": { - "rev": "dd3f588bacbeb041be6facf1742e42097f62165d", + "rev": "25050e4ed39e628282831d4cbecb1850454ce915", "src": "https://github.com/lewis6991/gitsigns.nvim" }, "lsp_lines.nvim": { @@ -49,11 +49,11 @@ "src": "https://github.com/nvim-mini/mini.comment" }, "mini.icons": { - "rev": "520995f1d75da0e4cc901ee95080b1ff2bc46b94", + "rev": "ac38c983aed0a2bd32a65ca3e2348e12e58ca292", "src": "https://github.com/nvim-mini/mini.icons" }, "mini.surround": { - "rev": "d12d8e6ea8e4d9d3e6fb0e3ff11c84fcce2299ac", + "rev": "d401c3856585473693e5ce9ec4c8e5b608b4c0fe", "src": "https://github.com/nvim-mini/mini.surround" }, "multicursor.nvim": { @@ -69,7 +69,7 @@ "src": "https://github.com/rose-pine/neovim" }, "nvim-lspconfig": { - "rev": "07dff35e7c95288861200b788ef32d6103f107f0", + "rev": "a683e0ddf0cf64c6cd689e18ffb480ade3c162b7", "src": "https://github.com/neovim/nvim-lspconfig" }, "nvim-metals": { @@ -82,7 +82,7 @@ "version": "'main'" }, "oil.nvim": { - "rev": "b91ee5a77a6a9605d9c1aaf4fda74b66082c8297", + "rev": "b73018b75affd13fa38e2fc94ef753b465f770d7", "src": "https://github.com/stevearc/oil.nvim" }, "plenary.nvim": { @@ -94,7 +94,7 @@ "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim" }, "telescope.nvim": { - "rev": "7d324792b7943e4aa16ad007212e6acc6f9fe335", + "rev": "9377230aa5305d9e9aca4ed8dadf1070fb4aa9fc", "src": "https://github.com/nvim-lua/telescope.nvim" } }