From c916ee362e823a0d579052b10d3bc8c07dcd833c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 11:02:45 +0200 Subject: [PATCH] altiosevka: pin --- Justfile | 1 - default.nix | 1 - nix/configurations/tungsten.nix | 1 - nix/configurations/vanadium.nix | 1 - nix/homeModules/common/kitty.nix | 4 ++-- nix/overlays/packagesStable.nix | 9 --------- nix/packages/default.nix | 6 ++++-- nix/sources.json | 2 +- 8 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 nix/overlays/packagesStable.nix diff --git a/Justfile b/Justfile index 150f8b1f..e5729137 100644 --- a/Justfile +++ b/Justfile @@ -33,7 +33,6 @@ env name action profilePath="~/.environments": overlays = [ (import ./nix/overlays) (import ./nix/overlays/packages.nix) - (import ./nix/overlays/packagesStable.nix) ]; }; in pkgs.callPackage ./nix/environments/{{ name }}.nix {} diff --git a/default.nix b/default.nix index 983385c9..4b0c6093 100644 --- a/default.nix +++ b/default.nix @@ -19,6 +19,5 @@ overlays = { default = import ./nix/overlays; packages = import ./nix/overlays/packages.nix; - packages' = import ./nix/overlays/packagesStable.nix; }; } diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index 71101456..b47ead14 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -34,7 +34,6 @@ in overlays = map import [ ../overlays ../overlays/packages.nix - ../overlays/packagesStable.nix ]; # Set NIX_PATH and flake registry at the same time diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 2a60bc08..32f520b8 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -40,7 +40,6 @@ in overlays = map import [ ../overlays ../overlays/packages.nix - ../overlays/packagesStable.nix ./vanadium/nixos/overlay.nix ]; diff --git a/nix/homeModules/common/kitty.nix b/nix/homeModules/common/kitty.nix index b17ed906..c27ea1b7 100644 --- a/nix/homeModules/common/kitty.nix +++ b/nix/homeModules/common/kitty.nix @@ -6,11 +6,11 @@ }: let cfg = config.programs.kitty; - inherit (pkgs) myPkgs'; + inherit (pkgs) myPkgs; in { config = lib.mkIf cfg.enable { home.packages = [ - myPkgs'.altiosevka-nerd-font-mono + myPkgs.altiosevka-nerd-font-mono ]; programs.kitty = lib.mkIf cfg.enable { diff --git a/nix/overlays/packagesStable.nix b/nix/overlays/packagesStable.nix deleted file mode 100644 index 81b390cd..00000000 --- a/nix/overlays/packagesStable.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - sources = import ../sources.nix; -in - _: _: { - myPkgs' = let - pkgs = import sources.nixpkgs-stable {}; - in - pkgs.callPackages ../packages {}; - } diff --git a/nix/packages/default.nix b/nix/packages/default.nix index f8b87f7d..d9396a07 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -4,7 +4,6 @@ ... }: let inherit (pkgs) lib; - mkNerdFont = pkgs.callPackage ../lib/mkNerdFont.nix {}; mkHaskellPackage = { src, @@ -25,9 +24,12 @@ }; infuse = lib.flip infuse-lib.v1.infuse; + + iosevka-pin = import sources.pin-iosevka {}; + mkNerdFont = iosevka-pin.callPackage ../lib/mkNerdFont.nix {}; in rec { # fonts - altiosevka = pkgs.callPackage ./altiosevka {}; + altiosevka = iosevka-pin.callPackage ./altiosevka {}; altiosevka-nerd-font-mono = mkNerdFont { font = altiosevka; extraArgs = [ diff --git a/nix/sources.json b/nix/sources.json index da1b5e37..84f1ce4d 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -109,7 +109,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5d736263df906c5da72ab0f372427814de2f52f8.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "nixpkgs-stable": { + "pin-iosevka": { "branch": "nixos-24.11", "description": "Nix Packages collection & NixOS", "homepage": "",