about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2022-02-02 23:29:01 +0900
committersefidel <contact@sefidel.net>2022-02-02 23:29:01 +0900
commit6f84ce3ea112c4e7db1215171ef5f89c0ba56e01 (patch)
tree331d91845cb0fa54b12b547d56f80f205188fa8c
parent3e650f364e19d250bc83088b62a215b941ad9b0d (diff)
downloadnixrc-6f84ce3ea112c4e7db1215171ef5f89c0ba56e01.tar.gz
nixrc-6f84ce3ea112c4e7db1215171ef5f89c0ba56e01.zip
chore: cleanup overlays
-rw-r--r--nixos/default.nix3
-rw-r--r--nixos/overlays/fix-156974.nix22
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
-}