From 9a9b8016c92fc94bdddb90b2dec9e1d16dbbf452 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 24 Dec 2021 15:07:36 +0100 Subject: [PATCH] clean overrides; remove roxterm --- .../configuration/graphical-fullblown.nix | 1 - nix/home-manager/profiles/qtile-desktop.nix | 1 - nix/overlays/overrides.nix | 28 +------------------ 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 1ced096..84137c9 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -285,7 +285,6 @@ in { picocom glib.dev # contains gdbus tool alacritty - roxterm unstablepkgs.wally-cli man-pages diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index 9518b21..858c55e 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -33,7 +33,6 @@ let esac ''; terminalCommand = "${pkgs.alacritty}/bin/alacritty"; - # terminalCommand = "${pkgs.roxterm}/bin/roxterm"; dpmsScript = pkgs.writeScript "dpmsScript" '' #!${pkgs.bash}/bin/bash diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix index 9168378..6bee672 100644 --- a/nix/overlays/overrides.nix +++ b/nix/overlays/overrides.nix @@ -21,33 +21,7 @@ in { ''; }; - roxterm = super.stdenv.mkDerivation { - name = "roxterm-custom"; - buildInputs = [ super.makeWrapper ]; - phases = "installPhase"; - installPhase = '' - makeWrapper ${super.roxterm}/bin/roxterm $out/bin/roxterm \ - --add-flags "--separate" - ''; - }; - - # TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804) - facetimehd-firmware = super.hello; - - # qtile = super.qtile.overrideAttrs(oldAttrs: { - # pythonPath = oldAttrs.pythonPath ++ (with self.python37Packages; [ - # psutil - # dbus-python - # pyxdg - # mpd2 - # # python-wifi - # # iwlib - # dateutil - # keyring - # ]); - # }); - - qtile = self.nixpkgs-unstable.qtile.overrideAttrs(oldAttrs: { + qtile = super.qtile.overrideAttrs(oldAttrs: { propagatedBuildInputs = oldAttrs.passthru.unwrapped.propagatedBuildInputs ++ (with self.python3Packages; [ # python-wifi # iwlib