diff --git a/flake.lock b/flake.lock index 4aee87d..6a764b1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,22 @@ { "nodes": { "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": { "lastModified": 1727907660, "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", @@ -739,6 +755,7 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "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-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip", diff --git a/flake.nix b/flake.nix index cd4c007..9353712 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "RingOfStorms's Neovim configuration using nix flake for portability"; # Nixpkgs / NixOS version to use. 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 = { url = "github:oxalica/rust-overlay"; @@ -214,7 +215,7 @@ }; }; outputs = - { self, nixpkgs, ... }@inputs: + { self, nixpkgs, nixpkgs-stable, ... }@inputs: let # 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 @@ -242,9 +243,10 @@ # pkgs = nixpkgs.legacyPackages.${system}; overlays = [ (import inputs.rust-overlay) ]; pkgs = import nixpkgs { inherit system overlays; }; + stable_pkgs = import nixpkgs-stable { inherit system overlays; }; 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; }; @@ -322,7 +324,7 @@ customRC = '' lua ${luaNixGlobal} 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 @@ -358,7 +360,7 @@ "--run" ''export XDG_CACHE_HOME="$NVIM_FLAKE_BASE_DIR/nvim_ringofstorms_${version}/cache"'' "--run" - ''export TESTASDASD="${lib.concatStringsSep "|" (lib.attrValues pkgs.vimPlugins.nvim-treesitter.grammarPlugins)}"'' + ''export TESTASDASD="${lib.concatStringsSep "|" (lib.attrValues stable_pkgs.vimPlugins.nvim-treesitter.grammarPlugins)}"'' ]; }); };