diff --git a/config/config.nix b/config/config.nix index cf7971c..489eb42 100644 --- a/config/config.nix +++ b/config/config.nix @@ -20,20 +20,22 @@ }; globals.mapleader = " "; - + autoCmd = [ { - callback = '' - function(args) - require("conform").format({ bufnr = args.buf }) - end - ''; + callback = { + __raw = '' + function(args) + require("conform").format({ bufnr = args.buf }) + end + ''; + }; - event = ["BufWritePre"]; + event = [ "BufWritePre" ]; pattern = [ "*" ]; - desc = "autoformatting on save"; - } + desc = "Format on save"; + } ]; } diff --git a/config/plugins.nix b/config/plugins.nix index 7ff69aa..4d7ad9c 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -32,13 +32,29 @@ conform-nvim = { enable = true; - settings.formatters_by_ft = { - rust = ["rustfmt"]; - lua = ["stylua"]; - javascript = { - __unkeyed-1 = "prettierd"; - __unkeyed-2 = "prettier"; - stop_after_first = true; + settings = { + notify_no_formatters = true; + formatters_by_ft = { + rust = [ "rustfmt" ]; + lua = [ "stylua" ]; + python = [ + "autoflake" + "autopep8" + "ruff_fix" + "ruff_organize_imports" + "ruff_format" + ]; + javascript = { + __unkeyed-1 = "prettierd"; + __unkeyed-2 = "prettier"; + stop_after_first = true; + }; + nix = { + __unkeyed-1 = "alejandra"; + __unkeyed-2 = "nixfmt"; + stop_after_first = true; + }; + markdown = [ "markdownlint-cli2" ]; }; }; }; @@ -96,9 +112,11 @@ neotest = { enable = true; adapters = { + bash.enable = true; rust.enable = true; python.enable = true; java.enable = true; + vitest.enable = true; go.enable = true; }; }; @@ -111,6 +129,18 @@ lazygit.enable = true; mini.enable = true; + + dap = { + enable = true; + adapters = { + executables = { }; + servers = { }; + }; + }; + + dap-python = { + enable = true; + }; }; }