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/default.nix
+++ b/home/programs/neovim/default.nix
@@ -10,6 +10,10 @@ in {
    nerd-fonts.jetbrains-mono
    texliveFull
    clang-tools
+<<<<<<< HEAD
+=======
+    vimPlugins.catppuccin-nvim
+>>>>>>> test
  ];

  programs.neovim = {
@@ -91,7 +95,11 @@ in {
      neovim-remote
      # Nix
      nixd
+<<<<<<< HEAD
      nixfmt-classic
+=======
+      nixfmt-rfc-style
+>>>>>>> test
      # Rust
      rust-analyzer
      # Bash