Configure vim plugins and add tools

Signed-off-by: Mel <einebeere@gmail.com>

2 files changed, 37 insertions, 8 deletions

diff --git a/modules/common.nix b/modules/common.nix
index 8c8e71b..3b3b6ec 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -5,6 +5,7 @@
     ./nix.nix
     ./user.nix
     ./locale.nix
+    ./vim.nix
     ./gnome.nix
     ./fonts.nix
     ./flatpak.nix
@@ -42,12 +43,6 @@
       remotePlay.openFirewall = true;
     };
     virt-manager.enable = true;
-    vim = {
-      defaultEditor = true;
-      package = pkgs.vim_configurable.customize {
-        vimrcFile = ../configs/.vimrc;
-      };
-    };
     fish.enable = true;
     git.enable = true;
     tmux.enable = true;
@@ -77,10 +72,10 @@
     
     xorg.xeyes wl-clipboard
 
-    ripgrep gnumake gdb gcc clang
+    ripgrep fzf gnumake gdb gcc clang clang-tools
     go gopls delve go-task
     meson cmake
-    nil direnv
+    nil nixfmt-rfc-style direnv
     helix
 
     wineWowPackages.stagingFull winetricks bottles
diff --git a/modules/vim.nix b/modules/vim.nix
new file mode 100644
index 0000000..a511bc1
--- /dev/null
+++ b/modules/vim.nix
@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+
+let
+  vim-configured =
+    with pkgs;
+    vim-full.customize {
+      name = "vim"; # explicitly replace vim
+
+      vimrcConfig = {
+        customRC = builtins.readFile ../configs/.vimrc;
+
+        packages.collection = with vimPlugins; {
+          start = [
+            YouCompleteMe
+            fzf-vim
+            vim-easymotion
+            vim-sleuth
+            vim-better-whitespace
+            vim-tmux-navigator
+          ];
+
+          opt = [ ];
+        };
+      };
+    };
+
+in
+{
+  programs.vim = {
+    defaultEditor = true;
+
+    package = vim-configured;
+  };
+}