merge test

2025-04-30 13:41:48 +02:00
parent e257ff991d 7fb65ea258
commit 4364cc2d16
25 changed files with 1381 additions and 167 deletions
--- a/home/programs/neovim/lua/plugins/conform-nvim.lua
+++ b/home/programs/neovim/lua/plugins/conform-nvim.lua
@@ -29,7 +29,11 @@ return {
          markdown = { "prettierd" },
          json = { "prettierd" },
          yaml = { "prettierd" },
+<<<<<<< HEAD
          nix = { "nixfmt-classic" },
+=======
+          nix = { "nixfmt-rfc-style" },
+>>>>>>> test
          tex = { "latexindent" },
          c = { "clang_format" },
          cpp = { "clang_format" },