.gitignore

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

.nixd.json

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

flake.lock

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

flake.nix

@@ -2,47 +2,31 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   };
 
   outputs = {
     self,
     nixpkgs,
   }: let
-    supportedSystems = ["x86_64-linux" "aarch64-linux"];
-    forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-    nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
     pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
   in {
-    packages = forAllSystems (system: let
-      pkgs = nixpkgsFor.${system};
-    in {
-      nvim = import ./nvim-lsp.nix {inherit pkgs;};
-    });
-
-    devShells = forAllSystems (system: let
-      pkgs = nixpkgsFor.${system};
-    in {
-      default = pkgs.mkShell {
-        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
-          (import ./nvim-lsp.nix {inherit pkgs;})
-        ];
-      };
-    });
-
-    defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
+    nvim = pkgs.mkShell {
+      nativeBuildInputs = [
+        pkgs.alejandra
+        pkgs.ccls
+        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
+        (import ./nvim-lsp.nix {inherit pkgs;})
+      ];
+    };
   };
 }

nvim-lsp.nix

@@ -7,59 +7,44 @@
         EOF
       '';
 
-      packages.myPlugins.start = with pkgs.vimPlugins;
-        [
-          (nvim-treesitter.withPlugins (parsers: [
-            parsers.c
-            parsers.cpp
-            parsers.go
-            parsers.json
-            parsers.latex
-            parsers.lua
-            parsers.nix
-            parsers.python
-            parsers.query
-            parsers.rust
-            parsers.verilog
-            parsers.vimdoc
-            parsers.zig
-          ]))
-          cmp-buffer
-          cmp-cmdline
-          cmp-nvim-lsp
-          cmp-nvim-ultisnips
-          cmp-path
-          colorizer
-          fugitive
-          fzf-lua
-          gruvbox
-          nvim-cmp
-          nvim-lspconfig
-          nvim-ts-rainbow
-          repeat
-          targets-vim
-          UltiSnips
-          vim-addon-nix
-          vim-signify
-          vim-slime
-          vim-snippets
-          zig-vim
-        ]
-        ++ [
-          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
-        ];
+      packages.myPlugins.start = with pkgs.vimPlugins; [
+        (nvim-treesitter.withPlugins (parsers: [
+          parsers.c
+          parsers.cpp
+	  parsers.go
+          parsers.json
+          parsers.latex
+          parsers.lua
+          parsers.nix
+          parsers.python
+          parsers.query
+          parsers.rust
+          parsers.verilog
+          parsers.vimdoc
+          parsers.zig
+        ]))
+        cmp-buffer
+        cmp-cmdline
+        cmp-nvim-lsp
+        cmp-nvim-ultisnips
+        cmp-path
+        colorizer
+        fugitive
+        fzf-lua
+	gopls
+        gruvbox
+        nvim-cmp
+        nvim-lspconfig
+        nvim-ts-rainbow
+        repeat
+        targets-vim
+        UltiSnips
+        vim-addon-nix
+        vim-signify
+        vim-slime
+        vim-snippets
+        zig-vim
+      ];
     };
   };