NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-22 21:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dev: attempt to use the zig overlay instead of nixpkgs/zig

Browse source
This commit is contained in:
NotAShelf 2023-02-28 10:54:48 +03:00
parent 1ca507569d
commit 7339f64dd8
No known key found for this signature in database
GPG key ID: 5B5C8895F28445F1
3 changed files with 178 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
flake.lock
View file

@ -321,6 +321,38 @@
"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-compat_2": {
"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"
@ -354,6 +386,36 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"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"
}
},
"gesture-nvim": { "gesture-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -567,6 +629,50 @@
"type": "github" "type": "github"
} }
}, },
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1677463842,
"narHash": "sha256-MgUEDPza573qKV59nRqrykLblPKBZu+DAIUqg9Pl5wU=",
"owner": "neovim",
"repo": "neovim",
"rev": "2c9fbe34b20266ef5ab54f6ed14fb38eef60430d",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1677485761,
"narHash": "sha256-C04OWgNrCxPGUiT7Px/vZd42vfwRY6/EjHwHNUSHv7g=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "aad4d8be05012055861b097b8019311fe62635bf",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -593,11 +699,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677468890, "lastModified": 1677383253,
"narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=", "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f19c04354dec3903f614eae09327a04d297835d", "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,6 +732,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1677468890,
"narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3f19c04354dec3903f614eae09327a04d297835d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1656753965, "lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@ -641,7 +763,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1655400192, "lastModified": 1655400192,
"narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=",
@ -657,6 +779,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1661151577,
"narHash": "sha256-++S0TuJtuz9IpqP8rKktWyHZKpgdyrzDFUXVY07MTRI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "54060e816971276da05970a983487a25810c38a7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": { "nmd": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1061,7 +1199,7 @@
"rnix-lsp": { "rnix-lsp": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -1113,8 +1251,9 @@
"lualine": "lualine", "lualine": "lualine",
"mind-nvim": "mind-nvim", "mind-nvim": "mind-nvim",
"minimap-vim": "minimap-vim", "minimap-vim": "minimap-vim",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nmd": "nmd", "nmd": "nmd",
"noice-nvim": "noice-nvim", "noice-nvim": "noice-nvim",
"nui-nvim": "nui-nvim", "nui-nvim": "nui-nvim",
@ -1155,7 +1294,8 @@
"vim-markdown": "vim-markdown", "vim-markdown": "vim-markdown",
"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": {
@ -1300,7 +1440,7 @@
"tidalcycles": { "tidalcycles": {
"inputs": { "inputs": {
"dirt-samples-src": "dirt-samples-src", "dirt-samples-src": "dirt-samples-src",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"superdirt-src": "superdirt-src", "superdirt-src": "superdirt-src",
"tidal-src": "tidal-src", "tidal-src": "tidal-src",
"utils": "utils_2", "utils": "utils_2",
@ -1528,6 +1668,26 @@
"repo": "which-key.nvim", "repo": "which-key.nvim",
"type": "github" "type": "github"
} }
},
"zig": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1677457546,
"narHash": "sha256-R2k5sOzf6dEg/PbMfZNYFjmJQY1Hbd/4sc8H36I3EAM=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "2b07e4e3e3eb07134ac61049abdc1da1ff6c5516",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

7
flake.nix
View file

@ -3,6 +3,7 @@
outputs = { outputs = {
nixpkgs, nixpkgs,
flake-parts, flake-parts,
zig,
... ...
} @ inputs: } @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} { flake-parts.lib.mkFlake {inherit inputs;} {
@ -47,12 +48,18 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
# TODO: neovim nightly
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
# For generating documentation website # For generating documentation website
nmd = { nmd = {
url = "gitlab:rycee/nmd"; url = "gitlab:rycee/nmd";
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"; # url = "github:neovim/nvim-lspconfig?ref=v0.1.3";

3
flake/legacyPackages.nix
View file

@ -9,9 +9,12 @@
overlays = [ overlays = [
inputs.tidalcycles.overlays.default inputs.tidalcycles.overlays.default
inputs.self.overlays.default inputs.self.overlays.default
inputs.neovim-nightly-overlay.overlay
inputs.zig.overlays.default
(_: _: { (_: _: {
rnix-lsp = inputs'.rnix-lsp.defaultPackage; rnix-lsp = inputs'.rnix-lsp.defaultPackage;
nil = inputs'.nil.packages.default; nil = inputs'.nil.packages.default;
zig = inputs'.zig.packages.default;
}) })
]; ];
}; };