From 8ea2f91e2ab04c715ab0814f1329fb37f335de4a Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Wed, 7 Jun 2023 10:28:02 -0400
Subject: [PATCH] Trying to fix nvim plugins

---
 homeConfig/modules/bash/default.nix           |  5 ++++-
 .../modules/neovim/config/plugins/backup.nix  | 19 +++++++++++++++++++
 .../modules/neovim/config/plugins/default.nix | 14 ++------------
 .../neovim/config/plugins/lazyvim/default.nix |  6 ++++++
 homeConfig/modules/neovim/default.nix         |  4 +++-
 5 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 homeConfig/modules/neovim/config/plugins/backup.nix
 create mode 100644 homeConfig/modules/neovim/config/plugins/lazyvim/default.nix

diff --git a/homeConfig/modules/bash/default.nix b/homeConfig/modules/bash/default.nix
index 9ff39b0..ec4f473 100644
--- a/homeConfig/modules/bash/default.nix
+++ b/homeConfig/modules/bash/default.nix
@@ -19,7 +19,10 @@ in
     
     services.gpg-agent.enableBashIntegration = true;
     programs = {
-      direnv.nix-direnv.enable = true;
+      direnv = {
+      	enable = true;
+      	nix-direnv.enable = true;
+      };
       ripgrep.enable = true;
       lsd = {
         enable = true;
diff --git a/homeConfig/modules/neovim/config/plugins/backup.nix b/homeConfig/modules/neovim/config/plugins/backup.nix
new file mode 100644
index 0000000..12ba519
--- /dev/null
+++ b/homeConfig/modules/neovim/config/plugins/backup.nix
@@ -0,0 +1,19 @@
+{ pkgs, lib, ... }:
+
+let
+  theme = import ./theme;
+  treesitter = import ./treesitter;
+  editing = import ./editing;
+  lsp = import ./lsp;
+  luasnip = import ./luasnip;
+  tools = import ./tools;
+
+in
+builtins.concatMap (dir: dir { inherit pkgs lib; }) [
+  theme
+  treesitter
+  editing
+  lsp
+  luasnip
+  tools
+]
diff --git a/homeConfig/modules/neovim/config/plugins/default.nix b/homeConfig/modules/neovim/config/plugins/default.nix
index 12ba519..0bc6603 100644
--- a/homeConfig/modules/neovim/config/plugins/default.nix
+++ b/homeConfig/modules/neovim/config/plugins/default.nix
@@ -1,19 +1,9 @@
 { pkgs, lib, ... }:
 
 let
-  theme = import ./theme;
-  treesitter = import ./treesitter;
-  editing = import ./editing;
-  lsp = import ./lsp;
-  luasnip = import ./luasnip;
-  tools = import ./tools;
+  lazyvim = import ./lazyvim;
 
 in
 builtins.concatMap (dir: dir { inherit pkgs lib; }) [
-  theme
-  treesitter
-  editing
-  lsp
-  luasnip
-  tools
+  lazyvim
 ]
diff --git a/homeConfig/modules/neovim/config/plugins/lazyvim/default.nix b/homeConfig/modules/neovim/config/plugins/lazyvim/default.nix
new file mode 100644
index 0000000..7286cd4
--- /dev/null
+++ b/homeConfig/modules/neovim/config/plugins/lazyvim/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+
+with pkgs.vimPlugins;
+[
+  { plugin = LazyVim; }
+]
diff --git a/homeConfig/modules/neovim/default.nix b/homeConfig/modules/neovim/default.nix
index 79a2cd9..3a8b4e3 100644
--- a/homeConfig/modules/neovim/default.nix
+++ b/homeConfig/modules/neovim/default.nix
@@ -13,7 +13,9 @@ in
       vimAlias = true;
       
 #      extraLuaConfig = import ./config/init.nix;
-      plugins = import (./config/plugins) { inherit pkgs lib; };
+      plugins = with pkgs.vimPlugins; [
+        LazyVim
+      ];
       extraPackages = import ./config/servers.nix { inherit pkgs; };
     };
   };