Compare commits

..

No commits in common. "9652f4cb75d799ee5a2511883d2fda60bea00141" and "a81f0a204127f22164fdc63da32ebfd46f97e513" have entirely different histories.

5 changed files with 59 additions and 91 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
result

View File

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

5
flake.lock generated
View File

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

View File

@ -2,47 +2,31 @@
description = "A very basic flake"; description = "A very basic flake";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
}: let }: 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; pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
in { in {
packages = forAllSystems (system: let nvim = pkgs.mkShell {
pkgs = nixpkgsFor.${system}; nativeBuildInputs = [
in { pkgs.alejandra
nvim = import ./nvim-lsp.nix {inherit pkgs;}; pkgs.ccls
}); pkgs.luaformatter
pkgs.nixd
devShells = forAllSystems (system: let pkgs.pyright
pkgs = nixpkgsFor.${system}; pkgs.rust-analyzer
in { pkgs.sumneko-lua-language-server
default = pkgs.mkShell { pkgs.svls
nativeBuildInputs = [ pkgs.texlab
pkgs.alejandra pkgs.tree-sitter
pkgs.ccls pkgs.verible
pkgs.gopls pkgs.zls
pkgs.luaformatter (import ./nvim-lsp.nix {inherit pkgs;})
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);
}; };
} }

View File

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