diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 13fcd89..0967ef4 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -1,5 +1 @@ -{ - "python.formatting.provider": "black", - "coc.preferences.formatOnType": true, - "coc.preferences.formatOnSaveFiletypes": ["python"] -} +{} diff --git a/nvim/settings.lua b/nvim/settings.lua index e690bf8..860b0ec 100644 --- a/nvim/settings.lua +++ b/nvim/settings.lua @@ -17,8 +17,13 @@ vim.cmd([[colorscheme gruvbox]]) opt.autoread = true --reload files when they are changed on disk -- autoformat -g.rustfmt_autosave = true -- rustfmt on save +g.autoformat_autoindent = false +g.autoformat_retab = false +g.autoformat_remove_trailing_spaces = true + vim.cmd[[ +let g:prettier#autoformat_config_present = 1 +let g:prettier#autoformat_config_files = ["prettier.config.js"] au BufWrite * :Autoformat ]] diff --git a/nvim/settings.nix b/nvim/settings.nix index 8f863fb..3635653 100644 --- a/nvim/settings.nix +++ b/nvim/settings.nix @@ -29,6 +29,9 @@ pkgs: # python coc-pyright + # web + vim-prettier + # nix vim-nix diff --git a/user.nix b/user.nix index 7115dcc..167d296 100644 --- a/user.nix +++ b/user.nix @@ -65,6 +65,7 @@ # dev ## js nodejs + nodePackages.prettier ## rust rust-analyzer rustup