summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2026-03-12 08:53:27 -0400
committerFreya Murphy <freya@freyacat.org>2026-03-12 08:53:27 -0400
commitc5fd41755ee9a9ac34a2ddc6d1ad7efe051b539a (patch)
tree76277e35dee15e90d30d816c4d6cdf9c0e3808c5
parenthyprlock: make hour digits padded (diff)
downloaddotfiles-nix-c5fd41755ee9a9ac34a2ddc6d1ad7efe051b539a.tar.gz
dotfiles-nix-c5fd41755ee9a9ac34a2ddc6d1ad7efe051b539a.tar.bz2
dotfiles-nix-c5fd41755ee9a9ac34a2ddc6d1ad7efe051b539a.zip
fix local pkgs overlay
-rw-r--r--flake.nix2
-rw-r--r--pkgs/default.nix13
-rw-r--r--system/default.nix2
3 files changed, 10 insertions, 7 deletions
diff --git a/flake.nix b/flake.nix
index cb21cf5..9f4e4f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -101,7 +101,7 @@
packages = perSystem (
pkgs: system:
import ./pkgs {
- inherit pkgs;
+ final = pkgs;
}
);
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3b6e894..ae80ed7 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,9 @@
-{pkgs}: {
- arcanist = pkgs.callPackage ./arcanist {};
- astal = pkgs.callPackage ./astal {};
- libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
- solaar-udev-rules = pkgs.callPackage ./solaar-udev-rules {};
+{
+ final,
+ prev ? final,
+}: {
+ arcanist = final.callPackage ./arcanist {};
+ astal = final.callPackage ./astal {};
+ libfprint-2-tod1-vfs0090 = final.callPackage ./libfprint-2-tod1-vfs0090 {inherit (prev) libfprint-2-tod1-vfs0090;};
+ solaar-udev-rules = final.callPackage ./solaar-udev-rules {};
}
diff --git a/system/default.nix b/system/default.nix
index f401753..205f63a 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -44,7 +44,7 @@
# load overlays
nixpkgs.overlays = [
- (final: _: import ../pkgs {pkgs = final;})
+ (final: prev: import ../pkgs {inherit final prev;})
];
# set state version