From d224daaa64f9ab9733d8a717b74608b8a384b832 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Thu, 5 Oct 2023 21:20:42 +0200 Subject: [PATCH] Update .config/alacritty/alacritty.yml Update .config/nvim/lua/config/lazy.lua Add .config/nvim/lua/plugins/go.lua Add .config/nvim/lua/plugins/none-ls.lua Update .config/nvim/lua/plugins/nvim-dap.lua --- dot_config/alacritty/alacritty.yml.tmpl | 2 +- dot_config/nvim/lua/config/lazy.lua | 2 +- dot_config/nvim/lua/plugins/go.lua | 15 ++++++ dot_config/nvim/lua/plugins/none-ls.lua | 63 ++++++++++++++++++++++++ dot_config/nvim/lua/plugins/nvim-dap.lua | 10 +++- 5 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/go.lua create mode 100644 dot_config/nvim/lua/plugins/none-ls.lua diff --git a/dot_config/alacritty/alacritty.yml.tmpl b/dot_config/alacritty/alacritty.yml.tmpl index c5acf03..987153e 100644 --- a/dot_config/alacritty/alacritty.yml.tmpl +++ b/dot_config/alacritty/alacritty.yml.tmpl @@ -137,7 +137,7 @@ font: style: Italic normal: #bold_italic: Hack Nerd Font Mono - bold_italic: {{ .monospace_font }} + family: {{ .monospace_font }} style: Bold Italic # Normal (roman) font face #normal: diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index a4114a5..3105002 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -15,7 +15,7 @@ require("lazy").setup({ --{ import = "lazyvim.plugins.extras.ui.mini-animate" }, { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, { import = "lazyvim.plugins.extras.util.project" }, - + { import = "lazyvim.plugins.extras.dap.core" }, -- import any extras modules here diff --git a/dot_config/nvim/lua/plugins/go.lua b/dot_config/nvim/lua/plugins/go.lua new file mode 100644 index 0000000..dff90f6 --- /dev/null +++ b/dot_config/nvim/lua/plugins/go.lua @@ -0,0 +1,15 @@ +return { + "ray-x/go.nvim", + dependencies = { -- optional packages + "ray-x/guihua.lua", + "neovim/nvim-lspconfig", + "nvim-treesitter/nvim-treesitter", + }, + config = function() + require("go").setup() + end, + event = {"CmdlineEnter"}, + ft = {"go", 'gomod'}, + build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries + +} diff --git a/dot_config/nvim/lua/plugins/none-ls.lua b/dot_config/nvim/lua/plugins/none-ls.lua new file mode 100644 index 0000000..5edd98d --- /dev/null +++ b/dot_config/nvim/lua/plugins/none-ls.lua @@ -0,0 +1,63 @@ +local h = require("null-ls.helpers") +local methods = require("null-ls.methods") +local u = require("null-ls.utils") + +local FORMATTING = methods.internal.FORMATTING + +local leptosfmt = h.make_builtin({ + name = "leptosfmt", + meta = { + url = "https://github.com/bram209/leptosfmt", + description = "A formatter for the leptos view! macro" + }, + method = FORMATTING, + filetypes = { "rust" }, + generator_opts = { + command = "leptosfmt", + args = { "--quiet", "--stdin" }, + to_stdin = true, + }, + factory = h.formatter_factory, +}) + + +return { + "nvimtools/none-ls.nvim", + event = "BufReadPre", + dependencies = { "mason.nvim" }, + opts = function() + local nls = require("null-ls") + return { + sources = { + nls.builtins.formatting.terraform_fmt, + --nls.builtins.formatting.yamlfmt, + nls.builtins.formatting.deno_fmt.with({ + filetypes = { "markdown" } + }), + nls.builtins.formatting.golines, + nls.builtins.formatting.goimports_reviser, + nls.builtins.formatting.goimports, + nls.builtins.formatting.gofumpt, + nls.builtins.formatting.taplo, + nls.builtins.formatting.prettierd.with({ + filetypes = { "graphql" } + }), + nls.builtins.formatting.shfmt, + nls.builtins.code_actions.gitsigns, + nls.builtins.code_actions.refactoring, + nls.builtins.formatting.rustfmt.with({ + extra_args = { "--edition=2021" }, + filetypes = { "rust" } + }), + leptosfmt.with({ + condition = function(utils) + return utils.root_has_file({ "leptosfmt.toml" }) + end, + }), + nls.builtins.diagnostics.revive, + nls.builtins.code_actions.impl, + nls.builtins.code_actions.refactoring, + }, + } + end, +} diff --git a/dot_config/nvim/lua/plugins/nvim-dap.lua b/dot_config/nvim/lua/plugins/nvim-dap.lua index c11f556..ae4527c 100644 --- a/dot_config/nvim/lua/plugins/nvim-dap.lua +++ b/dot_config/nvim/lua/plugins/nvim-dap.lua @@ -1,3 +1,11 @@ return { - "mfussenegger/nvim-dap" + --{ + -- "mfussenegger/nvim-dap" + --}, + --{ + -- "rcarriga/nvim-dap-ui" + --}, + --{ + -- "theHamsta/nvim-dap-virtual-text" + --} }