diff options
| -rw-r--r-- | nixos/default.nix | 3 | ||||
| -rw-r--r-- | nixos/overlays/fix-156974.nix | 22 |
2 files changed, 1 insertions, 24 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index 3ae6f33..c947084 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -4,8 +4,7 @@ alpha = self.lib.mkSystem { name = "alpha"; nixpkgs = unstable-small; - # TODO: fix-156974 - https://github.com/NixOS/nixpkgs/pull/156974 - overlays = with inputs; [ chaotic-nixpkgs.overlay (import ./overlays/fix-156974.nix) ]; + overlays = with inputs; [ chaotic-nixpkgs.overlay ]; extraModules = [ inputs.sops-nix.nixosModules.sops ./modules/security.nix diff --git a/nixos/overlays/fix-156974.nix b/nixos/overlays/fix-156974.nix deleted file mode 100644 index 6873bbb..0000000 --- a/nixos/overlays/fix-156974.nix +++ /dev/null @@ -1,22 +0,0 @@ -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 -} |