merge test

home/programs/neovim/lua/plugins/catppuccin-nvim.lua

@@ -5,6 +5,7 @@ return {
     name = "catppuccin",
     priority = 1000,
     config = function()
+      require("catppuccin").setup()
       vim.cmd.colorscheme("catppuccin-mocha")
     end,
     opts = {

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" },

home/programs/neovim/lua/plugins/conform-nvim.lua.orig

@@ -0,0 +1,66 @@
+return {
+  {
+    "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = "ConformInfo",
+    keys = {
+      {
+        "<leader>cF",
+        function()
+          require("conform").format({ formatters = { "injected" } })
+        end,
+        mode = { "n", "v" },
+        desc = "Format Injected Langs",
+      },
+    },
+    config = function()
+      require("conform").setup({
+        format_on_save = {
+          -- These options will be passed to conform.format()
+          timeout_ms = 500,
+          lsp_fallback = true,
+        },
+        formatters_by_ft = {
+          lua = { "stylua" },
+          python = { "isort", "autopep8" },
+          haskell = { "fourmolu" },
+          bash = { "shellcheck", "shellharden" },
+          sh = { "shfmt" },
+          markdown = { "prettierd" },
+          json = { "prettierd" },
+          yaml = { "prettierd" },
+<<<<<<< HEAD
+          nix = { "nixfmt-classic" },
+=======
+          nix = { "nixfmt-rfc-style" },
+>>>>>>> test
+          tex = { "latexindent" },
+          c = { "clang_format" },
+          cpp = { "clang_format" },
+          ["*"] = { "codespell" },
+          ["_"] = { "trim_whitespace" },
+        },
+        formatters = {
+          stylua = {
+            inherit = true,
+            prepend_args = { "--indent-type", "Spaces", "--indent-width", "2" },
+          },
+          codespell = {
+            inherit = true,
+            prepend_args = { "-L", "launch" },
+          },
+          latexindent = {
+            inherit = true,
+            prepend_args = { "-y=\"defaultIndent:'  '\"" },
+          },
+          clang_format = {
+            prepend_args = {
+              "--style=file:./.clang-format",
+              "--fallback-style=LLVM",
+            },
+          },
+        },
+      })
+    end,
+  },
+}