still trying to resolve merge conflict

2024-10-12 12:02:36 -04:00
parent df75f0bb24
commit 0dd840f25e
51 changed files with 969 additions and 77 deletions
--- a/pkgs/nixvim/config/default.nix
+++ b/pkgs/nixvim/config/default.nix
@@ -1,19 +0,0 @@
-{
-	imports = [
-		./plugins/alpha.nix
-		./plugins/vim-matchup.nix
-		./plugins/coq.nix
-		./plugins/barbar.nix
-		./plugins/cmp.nix
-		./plugins/lsp.nix
-		./plugins/lualine.nix
-		./plugins/plugins.nix
-		./plugins/nvim-tree.nix
-		./plugins/telescope.nix
-		./plugins/extra_plugins.nix
-		./options.nix
-		./keymaps.nix
-		./autocmd.nix
-	];
-}
-