From 943f7a1be0f53addea5bfb5b2255725227bf8e8c Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 5 May 2022 13:56:26 +0200
Subject: [PATCH] fix(overrides): remove btrbk, use stable alacritty and
 discord

---
 .../configuration/graphical-fullblown.nix     |  2 +-
 nix/overlays/overrides.nix                    | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 76e20c3..86f2cc3 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -116,7 +116,7 @@ in {
       evolution # gnome4.glib_networking
       unstablepkgs.kotatogram-desktop
       gnome3.cheese
-      unstablepkgs.discord
+      discord
 
       # Virtualization
       virtmanager
diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix
index 6bee672..e92c1a8 100644
--- a/nix/overlays/overrides.nix
+++ b/nix/overlays/overrides.nix
@@ -16,7 +16,7 @@ in {
     buildInputs = [ super.makeWrapper ];
     phases = "installPhase";
     installPhase = ''
-      makeWrapper ${self.nixpkgs-master.alacritty}/bin/alacritty $out/bin/alacritty \
+      makeWrapper ${super.alacritty}/bin/alacritty $out/bin/alacritty \
         --set-default WINIT_X11_SCALE_FACTOR 1.4
     '';
   };
@@ -29,23 +29,23 @@ in {
     ]);
   });
 
-  btrbk = super.btrbk.overrideAttrs(attrs: rec {
-    version = "0.30.0";
-    src =  builtins.fetchurl {
-      url = "https://digint.ch/download/btrbk/releases/${attrs.pname}-${version}.tar.xz";
-      sha256 = "1wlp0z0ijv3cr155kp9c5l16dz4jf8h897ddnawaj9rj1zgfk9z8";
-    };
+  # btrbk = super.btrbk.overrideAttrs(attrs: rec {
+  #   version = "0.32.1";
+  #   src =  builtins.fetchurl {
+  #     url = "https://digint.ch/download/btrbk/releases/${attrs.pname}-${version}.tar.xz";
+  #     sha256 = "1wlp0z0ijv3cr155kp9c5l16dz4jf8h897ddnawaj9rj1zgfk9z8";
+  #   };
 
-    # version = "2020-12-30";
-    # src = builtins.fetchurl {
-    #   url = "https://github.com/digint/btrbk/archive/dd5991099ad778a3e0c5d11c770ad169c3095068.tar.gz";
-    #   sha256 = "0iyjgr1nv1n7mpsrgkrmb85sz3ycimmfvvhj08cvkjgl0r1762sb";
-    # };
+  #   # version = "2020-12-30";
+  #   # src = builtins.fetchurl {
+  #   #   url = "https://github.com/digint/btrbk/archive/dd5991099ad778a3e0c5d11c770ad169c3095068.tar.gz";
+  #   #   sha256 = "0iyjgr1nv1n7mpsrgkrmb85sz3ycimmfvvhj08cvkjgl0r1762sb";
+  #   # };
 
-    preFixup = ''
-      wrapProgram $out/bin/btrbk \
-        --set PERL5LIB $PERL5LIB \
-        --prefix PATH ':' "${self.lib.makeBinPath (with self; [ btrfs-progs bash mbuffer openssh ])}"
-    '';
-  });
+  #   preFixup = ''
+  #     wrapProgram $out/bin/btrbk \
+  #       --set PERL5LIB $PERL5LIB \
+  #       --prefix PATH ':' "${self.lib.makeBinPath (with self; [ btrfs-progs bash mbuffer openssh ])}"
+  #   '';
+  # });
 }