new eww

home/programs/neovim/default.nix

@@ -10,10 +10,6 @@ in {
     nerd-fonts.jetbrains-mono
     texliveFull
     clang-tools
-<<<<<<< HEAD
-=======
-    vimPlugins.catppuccin-nvim
->>>>>>> test
   ];
 
   programs.neovim = {
@@ -34,6 +30,7 @@ in {
       cmp_luasnip
       conform-nvim
       conjure
+      comment-nvim
       dropbar-nvim
       friendly-snippets
       lazy-nvim
@@ -95,11 +92,7 @@ in {
       neovim-remote
       # Nix
       nixd
-<<<<<<< HEAD
-      nixfmt-classic
-=======
       nixfmt-rfc-style
->>>>>>> test
       # Rust
       rust-analyzer
       # Bash

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