new eww

2025-05-03 01:16:02 +02:00
parent 4364cc2d16
commit 0f9f16c8b6
31 changed files with 529 additions and 296 deletions
--- a/home/programs/neovim/lua/plugins/conform-nvim.lua
+++ b/home/programs/neovim/lua/plugins/conform-nvim.lua
@@ -29,11 +29,7 @@ return {
          markdown = { "prettierd" },
          json = { "prettierd" },
          yaml = { "prettierd" },
-<<<<<<< HEAD
-          nix = { "nixfmt-classic" },
-=======
          nix = { "nixfmt-rfc-style" },
->>>>>>> test
          tex = { "latexindent" },
          c = { "clang_format" },
          cpp = { "clang_format" },
@@ -55,7 +51,6 @@ return {
          },
          clang_format = {
            prepend_args = {
-              "--style=file:./.clang-format",
              "--fallback-style=LLVM",
            },
          },