use black

fedemengo · Nov 25, 2024 · e05da67 · e05da67
1 parent b2e2b87
commit e05da67
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/fnl/mods/lsp/lsp.fnl b/fnl/mods/lsp/lsp.fnl
@@ -128,7 +128,7 @@
                 ;                                                              :diagnostics {:globals [:vim
                 ;                                                                                      :module
                 ;                                                                                      :autoload]}}}}}
-                :pylsp {:settings {:pylsp {:plugins {:pycodestyle {:enable true
+                :pylsp {:settings {:pylsp {:plugins {:pycodestyle {:enable false
                                                                    :ignore [;; continuation line indentation is not a multiple of four
                                                                             :E121
                                                                             ;; expected 2 blank lines, found 1
@@ -139,7 +139,10 @@
                                                                             :E701
                                                                             ;; line break before binary operator
                                                                             :W503]
-                                                                   :indentSize 2}
+                                                                   :indentSize 4}
+                                                     :autopep8 {:enable false}
+                                                     :yapf {:enable false}
+                                                     :black {:enabled true}
                                                      :pylsp_mypy {:enabled true
                                                                   :live_mode true}}}}
                         :plugins {:rope_autoimport {:enabled true}}}
@@ -157,13 +160,13 @@
 
 ;; https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTIN_CONFIG.md#configuration
 
-(let [autopep8 (nullls.builtins.formatting.autopep8.with {:extra_args [:--indent-size=2
-                                                                       "--ignore=E302,E121,E701"
-                                                                       :--max-line-length=120]})]
-  (nullls.setup {:sources [autopep8
-                           nullls.builtins.formatting.stylua
-                           nullls.builtins.formatting.fnlfmt
-                           nullls.builtins.formatting.shfmt
-                           nullls.builtins.formatting.goimports
-                           nullls.builtins.formatting.gofumpt
-                           nullls.builtins.formatting.prettier]}))
+(nullls.setup {:sources [;(nullls.builtins.formatting.autopep8.with {:extra_args ["--indent-size=4"
+                         ;                                                        "--ignore=E302,E121,E701"
+                         ;                                                        "--max-line-length=150"]})
+                         nullls.builtins.formatting.black
+                         nullls.builtins.formatting.stylua
+                         nullls.builtins.formatting.fnlfmt
+                         nullls.builtins.formatting.shfmt
+                         nullls.builtins.formatting.goimports
+                         nullls.builtins.formatting.gofumpt
+                         nullls.builtins.formatting.prettier]})