ringofstorms/nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use bleeding edge for neovim, stable for treesitter

Browse source
This commit is contained in:
RingOfStorms (Josh) 2024-10-03 21:35:23 -05:00
parent f25b3370a7
commit ca328ee3a1
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.lock generated
View file

@ -1,6 +1,22 @@
{ {
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1728001490,
"narHash": "sha256-jyLDB1hREFhujapdfZNOyFGQ2+FlhsnhCBYa9YBWn+4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "52cfd83eee767c5d02089efe79c4811ffc52a046",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1727907660, "lastModified": 1727907660,
"narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
@ -739,6 +755,7 @@
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
"nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
"nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip", "nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip",

12
flake.nix
View file

@ -2,7 +2,8 @@
description = "RingOfStorms's Neovim configuration using nix flake for portability"; description = "RingOfStorms's Neovim configuration using nix flake for portability";
# Nixpkgs / NixOS version to use. # Nixpkgs / NixOS version to use.
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/master";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
@ -214,7 +215,7 @@
}; };
}; };
outputs = outputs =
{ self, nixpkgs, ... }@inputs: { self, nixpkgs, nixpkgs-stable, ... }@inputs:
let let
# Anytime there is a huge breaking change that old state files wont # Anytime there is a huge breaking change that old state files wont
# work then we make a new version name. Helps separate any files and # work then we make a new version name. Helps separate any files and
@ -242,9 +243,10 @@
# pkgs = nixpkgs.legacyPackages.${system}; # pkgs = nixpkgs.legacyPackages.${system};
overlays = [ (import inputs.rust-overlay) ]; overlays = [ (import inputs.rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; }; pkgs = import nixpkgs { inherit system overlays; };
stable_pkgs = import nixpkgs-stable { inherit system overlays; };
lazyPath = inputs."nvim_plugin-folke/lazy.nvim"; lazyPath = inputs."nvim_plugin-folke/lazy.nvim";
nixPkgsPlugins = with pkgs.vimPlugins; { nixPkgsPlugins = with stable_pkgs.vimPlugins; {
"nvim_plugin-nvim-treesitter/nvim-treesitter" = nvim-treesitter.withAllGrammars; "nvim_plugin-nvim-treesitter/nvim-treesitter" = nvim-treesitter.withAllGrammars;
}; };
@ -322,7 +324,7 @@
customRC = '' customRC = ''
lua ${luaNixGlobal} lua ${luaNixGlobal}
luafile ${./.}/init.lua luafile ${./.}/init.lua
set runtimepath^=${builtins.concatStringsSep "," (builtins.attrValues pkgs.vimPlugins.nvim-treesitter.grammarPlugins)} set runtimepath^=${builtins.concatStringsSep "," (builtins.attrValues stable_pkgs.vimPlugins.nvim-treesitter.grammarPlugins)}
''; '';
} }
)).overrideAttrs )).overrideAttrs
@ -358,7 +360,7 @@
"--run" "--run"
''export XDG_CACHE_HOME="$NVIM_FLAKE_BASE_DIR/nvim_ringofstorms_${version}/cache"'' ''export XDG_CACHE_HOME="$NVIM_FLAKE_BASE_DIR/nvim_ringofstorms_${version}/cache"''
"--run" "--run"
''export TESTASDASD="${lib.concatStringsSep "|" (lib.attrValues pkgs.vimPlugins.nvim-treesitter.grammarPlugins)}"'' ''export TESTASDASD="${lib.concatStringsSep "|" (lib.attrValues stable_pkgs.vimPlugins.nvim-treesitter.grammarPlugins)}"''
]; ];
}); });
}; };