From 4513c1a391cbf2cca6c267a73ff477e1dd3848bf Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Nov 2022 03:14:08 +0100 Subject: profiles/base: Revert fix for i3 config validation This reverts commit 7aa89c91f34c0acf4fe6dc62cf6387a12698853f. The change in question is part of release 4.21.1 and thus we no longer need to keep the patch around. Signed-off-by: aszlig --- modules/user/aszlig/profiles/base.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'modules') diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix index 36004121..681a044a 100644 --- a/modules/user/aszlig/profiles/base.nix +++ b/modules/user/aszlig/profiles/base.nix @@ -66,7 +66,7 @@ in { allowBroken = true; }; - nixpkgs.overlays = lib.singleton (self: super: { + nixpkgs.overlays = lib.singleton (lib.const (super: { netrw = super.netrw.override { checksumType = "mhash"; }; @@ -78,17 +78,7 @@ in { w3m = super.w3m.override { graphicsSupport = true; }; - - # Fix for segfault during config validation: - # https://github.com/i3/i3/pull/5173 - i3 = super.i3.overrideAttrs (drv: { - patches = lib.singleton (self.fetchpatch { - url = "https://github.com/i3/i3/commit/" - + "d0ef4000e9f49d2ef33d6014a4b61339bb787363.patch"; - hash = "sha256-Njdl/XnBypxg2Ytk/phxVfYhdnJHgDshLo9pTYk5o2I"; - }); - }); - }); + })); system.fsPackages = with pkgs; [ sshfs-fuse ]; time.timeZone = "Europe/Berlin"; -- cgit 1.4.1