From 0388ecbc4949e292e1c643ff566662b7a0de8ac1 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 27 Aug 2018 14:46:20 -0700
Subject: [PATCH] [NixOS] Reenable lxqt powermanagement, remove custom gitter

---
 nixos/configuration.nix |  4 +--
 nixos/gitter.nix        | 76 -----------------------------------------
 nixos/overlays.nix      |  1 -
 3 files changed, 2 insertions(+), 79 deletions(-)
 delete mode 100644 nixos/gitter.nix

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 197abf0b..3508e4b0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -85,6 +85,7 @@ in
     termite
     vlc
     xfce.thunar
+    wire-desktop
 
     # Appearance
     numix-icon-theme-circle
@@ -103,8 +104,7 @@ in
     gnome3.gpaste
     kdeconnect
     libnotify
-    # XXX: renable this
-    # lxqt.lxqt-powermanagement
+    lxqt.lxqt-powermanagement
     networkmanagerapplet
     customizable-notify-osd
     pasystray-appindicator
diff --git a/nixos/gitter.nix b/nixos/gitter.nix
deleted file mode 100644
index fa147f82..00000000
--- a/nixos/gitter.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
-, fontconfig, freetype, gdk_pixbuf, glib, gnome3, gtk3, libX11
-, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
-, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
-, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
-, nwjs, pango, systemd }:
-
-let gitterDirectorySuffix = "opt/gitter";
-    doELFExePatch = target: ''
-      patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
-         --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
-         $out/${gitterDirectorySuffix}/${target}
-       '';
-   doELFLibPatch = target: ''
-      patchelf --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
-         $out/${gitterDirectorySuffix}/${target}
-       '';
-   libPath = stdenv.lib.makeLibraryPath [
-     alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib
-     gnome3.gconf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
-     libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
-     libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
-  ];
-in stdenv.mkDerivation rec {
-  pname = "gitter";
-  version = "4.1.0";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
-    sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi";
-  };
-
-  nativeBuildInputs = [ makeWrapper dpkg ];
-
-  unpackPhase = "dpkg -x $src .";
-
-  installPhase = ''
-    mkdir -p $out/{bin,opt/gitter,share/pixmaps}
-    mv ./opt/Gitter/linux64/* $out/opt/gitter
-
-    ${doELFExePatch "Gitter"}
-    ${doELFExePatch "nacl_helper"}
-    ${doELFExePatch "minidump_stackwalk"}
-    ${doELFExePatch "nwjc"}
-    ${doELFExePatch "chromedriver"}
-    ${doELFExePatch "payload"}
-
-    ${doELFLibPatch "lib/libnw.so"}
-    ${doELFLibPatch "lib/libnode.so"}
-    ${doELFLibPatch "lib/libffmpeg.so"}
-
-    wrapProgram $out/${gitterDirectorySuffix}/Gitter --prefix LD_LIBRARY_PATH : ${libPath}
-
-    ln -s $out/${gitterDirectorySuffix}/Gitter $out/bin/
-    ln -s $out/${gitterDirectorySuffix}/logo.png $out/share/pixmaps/gitter.png
-    ln -s "${desktopItem}/share/applications" $out/share/
-  '';
-
-  desktopItem = makeDesktopItem {
-    name = pname;
-    exec = "/usr/bin/env Gitter";
-    icon = pname;
-    desktopName = "Gitter";
-    genericName = meta.description;
-    categories = "Network;InstantMessaging;";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Where developers come to talk";
-    downloadPage = "https://gitter.im/apps";
-    license = licenses.mit;
-    maintainers = [ maintainers.imalison ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/nixos/overlays.nix b/nixos/overlays.nix
index b69ffdd7..351ec764 100644
--- a/nixos/overlays.nix
+++ b/nixos/overlays.nix
@@ -1,7 +1,6 @@
 self: super:
 
 {
-  gitter = super.callPackage ./gitter.nix { };
   clipit = super.clipit.overrideAttrs (oldAttrs: rec {
     version = "50d983514386029a1f133187902084b753458f32";
     preConfigure = "./autogen.sh";