NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

revert 8506a5e (flake: drop zig overlay)

Browse source
This commit is contained in:
raf 2023-10-04 00:24:55 +03:00
parent b7f722252c
commit 2600fba729
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 77 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
flake.lock
View file

@ -402,6 +402,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@ -438,6 +454,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flutter-tools": { "flutter-tools": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -773,11 +804,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696261572, "lastModified": 1690630721,
"narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=", "narHash": "sha256-Y04onHyBQT4Erfr2fc82dbJTfXGYrf4V0ysLUYnPOP8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb", "rev": "d2b52322f35597c62abf56de91b0236746b2a03d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -837,6 +868,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1689088367,
"narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": { "nmd": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1467,7 +1514,8 @@
"vim-repeat": "vim-repeat", "vim-repeat": "vim-repeat",
"vim-startify": "vim-startify", "vim-startify": "vim-startify",
"vim-vsnip": "vim-vsnip", "vim-vsnip": "vim-vsnip",
"which-key": "which-key" "which-key": "which-key",
"zig": "zig"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -1903,6 +1951,26 @@
"repo": "which-key.nvim", "repo": "which-key.nvim",
"type": "github" "type": "github"
} }
},
"zig": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1690718829,
"narHash": "sha256-GN19SrCqWxIJN+rnbv+pIkF/yynh6FG2y7jY6PZRiYw=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "92e485cc7887f57be4d2921ed077f467912b7d33",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

11
flake.nix
View file

@ -62,8 +62,13 @@
flake = false; flake = false;
}; };
# TODO: get zig from the zig overlay instead of nixpkgs
zig.url = "github:mitchellh/zig-overlay";
# LSP plugins # LSP plugins
nvim-lspconfig = { nvim-lspconfig = {
# url = "github:neovim/nvim-lspconfig?ref=v0.1.3";
# Use master for nil_ls
url = "github:neovim/nvim-lspconfig"; url = "github:neovim/nvim-lspconfig";
flake = false; flake = false;
}; };
@ -162,7 +167,6 @@
# Langauge server (use master instead of nixpkgs) # Langauge server (use master instead of nixpkgs)
rnix-lsp.url = "github:nix-community/rnix-lsp"; rnix-lsp.url = "github:nix-community/rnix-lsp";
nil = { nil = {
url = "github:oxalica/nil"; url = "github:oxalica/nil";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -208,27 +212,22 @@
url = "github:hrsh7th/nvim-cmp"; url = "github:hrsh7th/nvim-cmp";
flake = false; flake = false;
}; };
cmp-buffer = { cmp-buffer = {
url = "github:hrsh7th/cmp-buffer"; url = "github:hrsh7th/cmp-buffer";
flake = false; flake = false;
}; };
cmp-nvim-lsp = { cmp-nvim-lsp = {
url = "github:hrsh7th/cmp-nvim-lsp"; url = "github:hrsh7th/cmp-nvim-lsp";
flake = false; flake = false;
}; };
cmp-vsnip = { cmp-vsnip = {
url = "github:hrsh7th/cmp-vsnip"; url = "github:hrsh7th/cmp-vsnip";
flake = false; flake = false;
}; };
cmp-path = { cmp-path = {
url = "github:hrsh7th/cmp-path"; url = "github:hrsh7th/cmp-path";
flake = false; flake = false;
}; };
cmp-treesitter = { cmp-treesitter = {
url = "github:ray-x/cmp-treesitter"; url = "github:ray-x/cmp-treesitter";
flake = false; flake = false;