From e6ebf1401648993c0192e2a54a64f32b28b6425c Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sat, 6 Dec 2025 19:52:39 -0500 Subject: [PATCH] Move to unstable nixpkgs only --- config.nix | 4 ++-- flake.lock | 17 ----------------- flake.nix | 11 +++-------- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/config.nix b/config.nix index 8c5961c..41bddda 100644 --- a/config.nix +++ b/config.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, inputs, ... }: +{ pkgs, inputs, ... }: { colorschemes.tokyonight.enable = true; @@ -153,7 +153,7 @@ enable = true; settings = { server = { - cmd = [ "${pkgs-unstable.rust-analyzer}/bin/rust-analyzer" ]; + cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ]; }; }; }; diff --git a/flake.lock b/flake.lock index e29466a..d11ff06 100644 --- a/flake.lock +++ b/flake.lock @@ -56,22 +56,6 @@ } }, "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": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -114,7 +98,6 @@ "flake-utils": "flake-utils", "hml": "hml", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "typst-preview": "typst-preview" } diff --git a/flake.nix b/flake.nix index f1295ca..7eb14bb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 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: let pkgs = import nixpkgs { inherit system; }; - pkgs-unstable = import nixpkgs-unstable { - inherit system; - }; - nixvimLib = nixvim.lib.${system}; nixvimModule = import ./config.nix; @@ -39,7 +34,7 @@ nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule { module = nixvimModule; extraSpecialArgs = { - inherit inputs pkgs-unstable; + inherit inputs; }; }; in