aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixos/default.nix3
-rw-r--r--nixos/overlays/fix-156974.nix22
2 files changed, 24 insertions, 1 deletions
diff --git a/nixos/default.nix b/nixos/default.nix
index 81125ac..d1937d4 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -4,7 +4,8 @@
alpha = self.lib.mkSystem {
name = "alpha";
nixpkgs = unstable-small;
- overlays = with inputs; [ chaotic-nixpkgs.overlay (import ./overlays/tuigreet.nix) ];
+ # TODO: fix-156974 - https://github.com/NixOS/nixpkgs/pull/156974
+ overlays = with inputs; [ chaotic-nixpkgs.overlay (import ./overlays/tuigreet.nix) (import ./overlays/fix-156974.nix) ];
extraModules = [
inputs.sops-nix.nixosModules.sops
./modules/security.nix
diff --git a/nixos/overlays/fix-156974.nix b/nixos/overlays/fix-156974.nix
new file mode 100644
index 0000000..6873bbb
--- /dev/null
+++ b/nixos/overlays/fix-156974.nix
@@ -0,0 +1,22 @@
+final: prev:
+let
+ patchedPkgs = import (builtins.fetchTarball {
+ url =
+ "https://github.com/nixos/nixpkgs/archive/ffdadd3ef9167657657d60daf3fe0f1b3176402d.tar.gz";
+ sha256 = "1nrz4vzjsf3n8wlnxskgcgcvpwaymrlff690f5njm4nl0rv22hkh";
+ }) {
+ inherit (prev) system config;
+ # inherit (prev) overlays; # not sure
+ };
+ patchedPam = patchedPkgs.pam;
+in {
+ i3lock = prev.i3lock.override { pam = patchedPam; };
+ #betterlockscreen = patchedPkgs.betterlockscreen.override {
+ # i3lock-color = prev.i3lock-color.override { pam = patchedPam; };
+ #};
+ i3lock-color = prev.i3lock-color.override { pam = patchedPam; };
+ swaylock-effects = prev.swaylock-effects.override { pam = patchedPam; };
+ swaylock = prev.swaylock.override { pam = patchedPam; };
+ #swaylock-fancy = prev.swaylock-fancy.override { pam = patchedPam; };
+ # apply the same patch to other packages
+}