From be037d719222908d7e0d6a177a12de6f0982a068 Mon Sep 17 00:00:00 2001 From: Albin Chaboissier Date: Wed, 14 Jan 2026 16:47:16 +0100 Subject: [PATCH] Asm filetype --- lua/config/set.lua | 17 ++++++--- lua/plugins/colors.lua | 20 ++++++----- lua/plugins/formatting.lua | 4 +-- lua/plugins/lsp.lua | 34 ++++++++++-------- lua/plugins/ltex.lua | 18 +++++----- lua/plugins/treesitter.lua | 72 +++++++++++++++++++------------------- 6 files changed, 90 insertions(+), 75 deletions(-) diff --git a/lua/config/set.lua b/lua/config/set.lua index ba0d3a2..34be1da 100644 --- a/lua/config/set.lua +++ b/lua/config/set.lua @@ -30,8 +30,15 @@ vim.cmd("highlight Normal ctermbg=NONE") vim.cmd("highlight NonText ctermbg=NONE") vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { - pattern = "*.wgsl", - callback = function() - vim.bo.filetype = "wgsl" - end, - }) + pattern = "*.wgsl", + callback = function() + vim.bo.filetype = "wgsl" + end, +}) + +vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { + pattern = "*.s", + callback = function() + vim.bo.filetype = "asm" + end, +}) diff --git a/lua/plugins/colors.lua b/lua/plugins/colors.lua index 3bd8e28..7b1b12f 100644 --- a/lua/plugins/colors.lua +++ b/lua/plugins/colors.lua @@ -1,13 +1,15 @@ return { - "sainnhe/gruvbox-material", - lazy = false, - priority = 1000, - config = function() - vim.g.gruvbox_material_enable_italic = true - vim.g.gruvbox_material_background = "medium" - vim.g.gruvbox_material_better_performance = 1 - vim.cmd.colorscheme("gruvbox-material") - end + "sainnhe/gruvbox-material", + lazy = false, + priority = 1000, + config = function() + vim.g.gruvbox_material_enable_italic = true + --vim.g.gruvbox_material_background = "medium" + vim.g.gruvbox_material_background = "medium" + vim.g.gruvbox_material_better_performance = 1 + + vim.cmd.colorscheme("gruvbox-material") + end, } -- return { -- { diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index 75b81a5..66d4442 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -16,9 +16,9 @@ return { timeout_ms = 500, lsp_fallback = true, }, - }) + }) - vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" + vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" conform.formatters.rustfmt = { prepend_args = { "--config-path", "/home/albin/coding-projects/rustfmt.toml" }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index db969a3..514ee0b 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -27,32 +27,38 @@ return { -- RUST (in rust.lua) -- HTML - vim.lsp.config("html", { capabilities = capabilities }) - vim.lsp.config("cssls", { - capabilities = capabilities, - }) + -- vim.lsp.config("html", { capabilities = capabilities }) + -- vim.lsp.config("cssls", { + -- capabilities = capabilities, + -- }) -- JS - vim.lsp.config("ts_ls", { capabilities = capabilities }) + -- vim.lsp.config("ts_ls", { capabilities = capabilities }) -- CLANGD vim.lsp.config("clangd", { capabilities = capabilities }) - vim.lsp.config("ocamllsp", { capabilities = capabilities }) - vim.lsp.config("r_language_server", { capabilities = capabilities }) + -- vim.lsp.config("ocamllsp", { capabilities = capabilities }) + -- vim.lsp.config("r_language_server", { capabilities = capabilities }) --vim.lsp.enable("r_language_server") - vim.lsp.config("metals", { - capabilities = capabilities, - init_options = { - statusBarProvider = "off", - }, - }) - vim.lsp.enable("metals") + -- vim.lsp.config("metals", { + -- capabilities = capabilities, + -- init_options = { + -- statusBarProvider = "off", + -- }, + -- }) + -- vim.lsp.enable("metals") vim.lsp.config("asm_lsp", { capabilities = capabilities }) vim.lsp.enable("asm_lsp") + vim.lsp.config("slangd", { capabilities = capabilities, flags = { allow_incremental_sync = true } }) + vim.lsp.enable("slangd") + + vim.lsp.config("tinymist", { capabilities = capabilities }) + vim.lsp.enable("tinymist") + vim.lsp.config("wgsl_analyzer", { capabilities = capabilities }) vim.lsp.enable("wgsl_analyzer") diff --git a/lua/plugins/ltex.lua b/lua/plugins/ltex.lua index 4f0701b..32eadf1 100644 --- a/lua/plugins/ltex.lua +++ b/lua/plugins/ltex.lua @@ -1,11 +1,11 @@ return { - { - "lervag/vimtex", - lazy = false, -- we don't want to lazy load VimTeX - -- tag = "v2.15", -- uncomment to pin to a specific release - init = function() - -- VimTeX configuration goes here, e.g. - vim.g.vimtex_view_method = "zathura" - end - } + { + "lervag/vimtex", + lazy = false, -- we don't want to lazy load VimTeX + -- tag = "v2.15", -- uncomment to pin to a specific release + init = function() + -- VimTeX configuration goes here, e.g. + vim.g.vimtex_view_method = "zathura" + end, + }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 0316a91..067cc88 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,42 +1,42 @@ return { - "nvim-treesitter/nvim-treesitter", - lazy = false, - build = ":TSUpdate", - event = { "BufReadPost", "BufNewFile" }, - opts = { - ensure_installed = { - "bash", - "c", - "diff", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "rust", - "toml", - "vim", - "vimdoc", - "yaml", - "wgsl", - }, + "nvim-treesitter/nvim-treesitter", + lazy = false, + build = ":TSUpdate", + event = { "BufReadPost", "BufNewFile" }, + opts = { + ensure_installed = { + "bash", + "c", + "diff", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "rust", + "toml", + "vim", + "vimdoc", + "yaml", + "wgsl", + }, - sync_install = false, - auto_install = true, + sync_install = false, + auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, + highlight = { + enable = true, + additional_vim_regex_highlighting = false, + }, - indent = { enable = true }, - }, + indent = { enable = true }, + }, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) - end, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) + end, }