Move to unstable nixpkgs only

This commit is contained in:
2025-12-06 19:52:39 -05:00
parent 90c7861da6
commit e6ebf14016
3 changed files with 5 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, inputs, ... }: { pkgs, inputs, ... }:
{ {
colorschemes.tokyonight.enable = true; colorschemes.tokyonight.enable = true;
@@ -153,7 +153,7 @@
enable = true; enable = true;
settings = { settings = {
server = { server = {
cmd = [ "${pkgs-unstable.rust-analyzer}/bin/rust-analyzer" ]; cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
}; };
}; };
}; };

17
flake.lock generated
View File

@@ -56,22 +56,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1764831616,
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1764950072,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
@@ -114,7 +98,6 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"hml": "hml", "hml": "hml",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"typst-preview": "typst-preview" "typst-preview": "typst-preview"
} }

View File

@@ -1,7 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
@@ -21,17 +20,13 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixvim, ... }@inputs: outputs = { self, nixpkgs, flake-utils, nixvim, ... }@inputs:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
}; };
pkgs-unstable = import nixpkgs-unstable {
inherit system;
};
nixvimLib = nixvim.lib.${system}; nixvimLib = nixvim.lib.${system};
nixvimModule = import ./config.nix; nixvimModule = import ./config.nix;
@@ -39,7 +34,7 @@
nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule { nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule {
module = nixvimModule; module = nixvimModule;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs pkgs-unstable; inherit inputs;
}; };
}; };
in in