Major NVIM refactor (ty fire :3)

packages/default.nix

@@ -15,33 +15,40 @@ let
     "megapixels"
   ] pkgs;
   pcPkgs = lib.attrVals [
-    #osu-lazer
-    "dracula-theme"
-    "wl-clipboard"
     "brightnessctl"
     "clipman"
-    "powertop"
-    "easyeffects"
-    "mutt-wizard"
-    "gamescope"
     "cyrus-sasl-xoauth2"
+    "dracula-theme"
+    "easyeffects"
+    "gamescope"
     "libnotify"
-    "networkmanager-openvpn"
+    "mutt-wizard"
+    "powertop"
+    "wl-clipboard"
     # temporary home manager things
+    "eww"
+    "ifuse"
     "img2pdf"
     "inotify-tools"
-    "eww"
     "jq"
-    "pandoc"
-    #"texliveFull"
-    "typst"
-    "socat"
     "libimobiledevice"
-    "ifuse"
-  ] pkgs ++ [ inputs.osu-nixos pkgs.wineWowPackages.stableFull ];
+    "socat"
+    "typst"
+  ] pkgs ++ [ pkgs.wineWowPackages.stableFull ];
   serverPkgs = lib.attrVals [
     #"package"
   ] pkgs;
+
+  spaceman-nvim = pkgs.vimUtils.buildVimPlugin {
+    name = "spaceman-nvim";
+    src = pkgs.fetchFromGitHub {
+      owner = "FireIsGood";
+      repo = "spaceman.nvim";
+      rev = "7910d202073bcc5f567481426f771b3737451dd9";
+      hash = "sha256-VvKce2uiFzv0TjoJfEX461p9tY9aE237Xr1q/Lw3Utw=";
+    };
+  };
+
 in
 {
   options = {
@@ -64,11 +71,14 @@ in
       "glib"
       "gnumake"
       "gnupg"
+      "neofetch"
       "p7zip"
       "pinentry"
-      "neofetch"
+      "typst-lsp"
       "unzip"
+      "vhdl-ls"
       "wget"
+      "zip"
       "zoxide"
     ] pkgs)
     ++ (lib.optionals config.stitchyconf.artPkgs.enable artPkgs)
@@ -87,14 +97,22 @@ in
           customRC = builtins.readFile ../config/nvim/init.vim;
           packages.myVimPackage = with pkgs.vimPlugins; {
             start = [
-              nvim-lspconfig
-              nvim-cmp
+              bufferline-nvim
               cmp-nvim-lsp
-              luasnip
               cmp_luasnip
+              gitsigns-nvim
+              indent-blankline-nvim
+              lazy-nvim
+              luasnip
+              neo-tree-nvim
+              nvim-cmp
+              nvim-lspconfig
+              spaceman-nvim
+              telescope-nvim
               tokyonight-nvim
-              vim-lsp-cxx-highlight
               typst-vim
+              vim-lsp-cxx-highlight
+              which-key-nvim
             ];
           };
         };