flake/overlay: remove pkgs

.gitignore

@@ -0,0 +1 @@
+result

.nixd.json

@@ -0,0 +1 @@
+{"formatting":{"command":"alejandra"}}

flake.lock

@@ -10,10 +10,9 @@
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
         "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -2,31 +2,71 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
   };
 
   outputs = {
     self,
     nixpkgs,
   }: let
-    pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+    supportedSystems = ["x86_64-linux" "aarch64-linux"];
+    forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
+    additionalDeps = pkgs: [
+      pkgs.alejandra
+      pkgs.ccls
+      pkgs.gopls
+      pkgs.luaformatter
+      pkgs.nixd
+      pkgs.pyright
+      pkgs.rust-analyzer
+      pkgs.sumneko-lua-language-server
+      pkgs.svls
+      pkgs.texlab
+      pkgs.tree-sitter
+      pkgs.verible
+      pkgs.zls
+    ];
   in {
-    nvim = pkgs.mkShell {
+    packages = forAllSystems (system: let
-      nativeBuildInputs = [
+      pkgs = nixpkgsFor.${system};
-        pkgs.alejandra
+    in {
-        pkgs.ccls
+      nvim = import ./nvim-lsp.nix {inherit pkgs;};
-        pkgs.luaformatter
+    });
-        pkgs.nixd
+
-        pkgs.pyright
+    devShells = forAllSystems (system: let
-        pkgs.rust-analyzer
+      pkgs = nixpkgsFor.${system};
-        pkgs.sumneko-lua-language-server
+      vim = self.packages.${system};
-        pkgs.svls
+    in {
-        pkgs.texlab
+      default = pkgs.mkShell {
-        pkgs.tree-sitter
+        nativeBuildInputs = [
-        pkgs.verible
+          pkgs.alejandra
-        pkgs.zls
+          pkgs.ccls
-        (import ./nvim-lsp.nix {inherit pkgs;})
+          pkgs.gopls
-      ];
+          pkgs.luaformatter
-    };
+          pkgs.nixd
+          pkgs.pyright
+          pkgs.rust-analyzer
+          pkgs.sumneko-lua-language-server
+          pkgs.svls
+          pkgs.texlab
+          pkgs.tree-sitter
+          pkgs.verible
+          pkgs.zls
+          vim
+        ];
+      };
+    });
+
+    overlays = forAllSystems (system: let
+      pkgs = nixpkgsFor.${system};
+    in {
+      overlay = final: prev: {
+        inherit (self.packages.${system}) nvim;
+        inherit additionalDeps;
+      };
+    });
+
+    defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
   };
 }

nvim-lsp.nix

@@ -11,7 +11,7 @@
         (nvim-treesitter.withPlugins (parsers: [
           parsers.c
           parsers.cpp
-	  parsers.go
+          parsers.go
           parsers.json
           parsers.latex
           parsers.lua
@@ -29,13 +29,13 @@
         cmp-nvim-ultisnips
         cmp-path
         colorizer
+        editorconfig-nvim
         fugitive
         fzf-lua
-	gopls
         gruvbox
         nvim-cmp
         nvim-lspconfig
-        nvim-ts-rainbow
+        rainbow-delimiters-nvim
         repeat
         targets-vim
         UltiSnips
@@ -45,6 +45,21 @@
         vim-snippets
         zig-vim
       ];
+      nativeBuildInputs = [
+        pkgs.alejandra
+        pkgs.ccls
+        pkgs.gopls
+        pkgs.luaformatter
+        pkgs.nixd
+        pkgs.pyright
+        pkgs.rust-analyzer
+        pkgs.sumneko-lua-language-server
+        pkgs.svls
+        pkgs.texlab
+        pkgs.tree-sitter
+        pkgs.verible
+        pkgs.zls
+      ];
     };
   };