From c055bd2a2f8972dfb013f0f761b5b984a1ce794a Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Sat, 16 Mar 2024 19:06:45 +0100
Subject: [PATCH] flake: add bundled package, remove nixd over unresolved CVE

---
 flake.nix | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8e3fa94..84a1c01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,8 +15,27 @@
   in {
     packages = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};
+      neovim = import ./nvim-lsp.nix {inherit pkgs;};
     in {
-      nvim = import ./nvim-lsp.nix {inherit pkgs;};
+      nvim = pkgs.symlinkJoin {
+        name = "nvim";
+        paths = with pkgs;
+          [
+            alejandra
+            ccls
+            gopls
+            luaformatter
+            pyright
+            rust-analyzer
+            sumneko-lua-language-server
+            svls
+            texlab
+            tree-sitter
+            verible
+            zls
+          ]
+          ++ [neovim];
+      };
     });
 
     devShells = forAllSystems (system: let
@@ -28,7 +47,6 @@
           pkgs.ccls
           pkgs.gopls
           pkgs.luaformatter
-          pkgs.nixd
           pkgs.pyright
           pkgs.rust-analyzer
           pkgs.sumneko-lua-language-server
@@ -46,26 +64,7 @@
       pkgs = nixpkgsFor.${system};
     in {
       overlay = final: prev: {
-        nvim = pkgs.symlinkJoin {
-          name = "nvim";
-          paths = with pkgs;
-            [
-              alejandra
-              ccls
-              gopls
-              luaformatter
-              nixd
-              pyright
-              rust-analyzer
-              sumneko-lua-language-server
-              svls
-              texlab
-              tree-sitter
-              verible
-              zls
-            ]
-            ++ [self.packages.${system}.nvim];
-        };
+        nvim = self.packages.${system}.nvim;
       };
     });
     defaultPackage = forAllSystems (system: self.packages.${system}.nvim);