partial setup of neovim for home config

modules/neovim/default.nix

@@ -2,29 +2,13 @@
 
   home-manager.users.${config.user} = {
 
-    home.packages = with pkgs; [
-      neovim
-      gcc # for tree-sitter
-      tree-sitter # for tree-sitter-gitignore parser
-      nodejs # for tree-sitter-gitignore parser
-      shfmt # used everywhere
-      shellcheck # used everywhere
+    home.packages = [
+      (import ./package {
+        inherit pkgs;
+        colors = import config.theme.colors.neovimConfig { inherit pkgs; };
+      })
     ];
 
-    xdg.configFile = {
-      "nvim/init.lua".source = ./init.lua;
-      "nvim/lua" = {
-        source = ./lua;
-        recursive = true; # Allows adding more files
-      };
-      "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
-      "nvim/lua/background.lua".text = ''
-        vim.o.background = "${
-          if config.theme.dark == true then "dark" else "light"
-        }"
-      '';
-    };
-
     programs.git.extraConfig.core.editor = "nvim";
     home.sessionVariables = {
       EDITOR = "nvim";
@@ -39,16 +23,9 @@
       };
     };
 
-    # Always run packer.nvim sync
-    home.activation.nvimPackerSync =
-      config.home-manager.users.${config.user}.lib.dag.entryAfter
-      [ "writeBoundary" ] ''
-        $DRY_RUN_CMD ${pkgs.neovim}/bin/nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
-      '';
-
   };
 
-  # Used for icons in Vim
-  fonts.fonts = with pkgs; [ nerdfonts ];
+  # # Used for icons in Vim
+  # fonts.fonts = with pkgs; [ nerdfonts ];
 
 }

modules/neovim/package/default.nix

@@ -0,0 +1,46 @@
+# { inputs, globals, extraConfig ? [ ], ... }:
+#
+# let
+#
+#   pkgs = import inputs.nixpkgs {
+#     system = inputs.system;
+#     overlays = [
+#       (import ./modules/neovim/plugins-overlay.nix inputs)
+#       inputs.nix2vim.overlay
+#     ];
+#   };
+#
+# in pkgs.neovimBuilder {
+#   package = pkgs.neovim-unwrapped;
+#   imports = [
+#     ./modules/neovim/plugins/bufferline.nix
+#     ./modules/neovim/plugins/completion.nix
+#     ./modules/neovim/plugins/gitsigns.nix
+#     ./modules/neovim/plugins/lsp.nix
+#     ./modules/neovim/plugins/misc.nix
+#     ./modules/neovim/plugins/statusline.nix
+#     ./modules/neovim/plugins/syntax.nix
+#     ./modules/neovim/plugins/telescope.nix
+#     ./modules/neovim/plugins/toggleterm.nix
+#     ./modules/neovim/plugins/tree.nix
+#   ] ++ extraConfig;
+# }
+
+{ pkgs, colors ? { }, ... }:
+
+pkgs.neovimBuilder {
+  package = pkgs.neovim-unwrapped;
+  imports = [
+    ../config/bufferline.nix
+    ../config/completion.nix
+    ../config/gitsigns.nix
+    ../config/lsp.nix
+    ../config/misc.nix
+    ../config/statusline.nix
+    ../config/syntax.nix
+    ../config/telescope.nix
+    ../config/toggleterm.nix
+    ../config/tree.nix
+    colors
+  ];
+}