diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix index 75fd4e8..7e5e988 100644 --- a/flake-modules/nvim.nix +++ b/flake-modules/nvim.nix @@ -1,5 +1,7 @@ { inputs, ... }: { + flake.overlays.nixvim = inputs.nixvim.overlays.default; + perSystem = { lib, system, ... }: let diff --git a/flake.lock b/flake.lock index ae597c1..13b118a 100644 --- a/flake.lock +++ b/flake.lock @@ -295,22 +295,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": [], @@ -323,7 +307,9 @@ "home-manager" ], "nix-darwin": [], - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "unstable" + ], "nuschtosSearch": [], "treefmt-nix": [ "treefmt-nix" @@ -353,10 +339,7 @@ "stylix": "stylix", "systems": "systems", "treefmt-nix": "treefmt-nix", - "unstable": [ - "nixvim", - "nixpkgs" - ] + "unstable": "unstable" } }, "stylix": { @@ -485,6 +468,22 @@ "repo": "treefmt-nix", "type": "github" } + }, + "unstable": { + "locked": { + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2e99a7b..b852838 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,10 @@ # A helpful description of your flake description = "My NixOS configuration"; - # Trick renovate into accepting this lockfile (see https://github.com/renovatebot/renovate/issues/29721) - # "github:NixOS/nixpkgs/nixos-unstable" - # Flake inputs inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - unstable.follows = "nixvim/nixpkgs"; + unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # Lix lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; @@ -38,6 +35,7 @@ nixvim = { url = "github:nix-community/nixvim"; inputs = { + nixpkgs.follows = "unstable"; home-manager.follows = "home-manager"; flake-parts.follows = "flake-parts"; treefmt-nix.follows = "treefmt-nix";