Merge branch 'pkgs/custom-neovim'

1 files changed, 67 insertions, 44 deletions

diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index aa7d7d2..20c32e1 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -1,56 +1,79 @@
 {
   pkgs,
   inputs,
-}:
-inputs.mnw.lib.wrap pkgs {
-  neovim = pkgs.neovim-unwrapped;
-
-  plugins = with pkgs.vimPlugins; {
-    dev.config = {
-      pure = ./config;
-      impure = "/home/culsans/Sync/setup/pkgs/custom-neovim";
+}: let
+  plenary-nvim-git = pkgs.vimPlugins.plenary-nvim.overrideAttrs (old: {
+    version = "git";
+    src = pkgs.fetchFromGitHub {
+      owner = "emmanueltouzery";
+      repo = "plenary.nvim";
+      rev = "7750bc895a1f06aa7a940f5aea43671a74143be0";
+      sha256 = "sha256-9Un7ekhBxcnmFE1xjCCFTZ7eqIbmXvQexpnhduAg4M0=";
+    };
+  }); # go back to regular plenary when this commit is merged: https://github.com/nvim-lua/plenary.nvim/pull/649
+  which-key-nvim-git = pkgs.vimPlugins.which-key-nvim.overrideAttrs (old: {
+    version = "git";
+    src = pkgs.fetchFromGitHub {
+      owner = "cameronr";
+      repo = "which-key.nvim";
+      rev = "ab1a3b0d3005a95507ba6c18b96531d430370885";
+      sha256 = "sha256-Zbs+Xd6kGfR+s/f6xhxXBdKJA2N4WqcJDPWVkGaM7S0=";
     };
-    start = [
-      # Core Plugins
-      mini-nvim # Ton of small modules.
-      nvim-lspconfig # Adds lsp presets.
-      # actions-preview-nvim # Adds a selector for LSP actions.
-      nvim-treesitter.withAllGrammars # All treesitter grammars.
-      # tabby-nvim # Tab bar.
-      # friendly-snippets # Extra snippets.
+  }); # go back to regular which-key when this commit is merged: https://github.com/folke/which-key.nvim/pull/974
+in
+  inputs.mnw.lib.wrap pkgs {
+    neovim = pkgs.neovim-unwrapped;
+    plugins = with pkgs.vimPlugins; {
+      dev.config = {
+        pure = ./config;
+      };
+      start = [
+        # Core Plugins
+        mini-nvim # Ton of small modules.
+        nvim-lspconfig # Adds lsp presets.
+        actions-preview-nvim # Adds a selector for LSP actions.
+        nvim-treesitter.withAllGrammars # All treesitter grammars.
+        tabby-nvim # Tab bar.
+        lualine-nvim # Status line.
+        telescope-nvim # Picker.
+        # plenary-nvim # General Library.
+        plenary-nvim-git
+        alpha-nvim # Dashboard.
+        persisted-nvim # Session manager.
+        # which-key-nvim
+        which-key-nvim-git
+        snacks-nvim
 
-      # Colorschemes
-      oxocarbon-nvim # IBM Carbon themes.
-      rose-pine # Rose Pine themes.
-      kanagawa-nvim # Kanagawa themes.
-      everforest # Green themes.
-      nordic-nvim # Warm dark nordic theme.
+        # Colorschemes
+        oxocarbon-nvim # IBM Carbon themes.
+        rose-pine # Rose Pine themes.
+        kanagawa-nvim # Kanagawa themes.
+        everforest # Green themes.
+        nordic-nvim # Warm dark nordic theme.
 
-      # Miscellaneous Plugins
-      presence-nvim # Discord RPC for nvim.
-      cellular-automaton-nvim # Fun useless plugin.
-    ];
-    opt = [];
-  };
+        # Miscellaneous Plugins
+        presence-nvim # Discord RPC for nvim.
+        cellular-automaton-nvim # Fun useless plugin.
+        vim-wakatime # For hack club challenge.
+      ];
+      opt = [];
+    };
 
-  luaFiles = [./config];
+    luaFiles = [./config/init.lua];
 
-  extraBinPath = with pkgs; [
-    # LSP Servers
-    lua-language-server # Lua LS
-    fennel-ls # Fennel LS
-    nixd # Nix LS
-    marksman # Markdown LS
+    extraBinPath = with pkgs; [
+      # LSP Servers
+      lua-language-server # Lua LS
+      nixd # Nix LS
+      marksman # Markdown LS
 
-    # Formatters
-    alejandra # Nix Formatter
+      # Formatters
+      alejandra # Nix Formatter
 
-    # Extra Tools
-    ripgrep
-  ];
+      # Extra Tools
+      ripgrep
+      fd
 
-  extraLuaPackages = lua:
-    with lua; [
-      fennel # allow config in fennel
+      wakatime-cli
     ];
-}
+  }