From 80d73a8aadf812cd085afea02704d44238199c6a Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Wed, 2 Feb 2022 12:07:26 +0100
Subject: [PATCH] gnome: Remove my own packages

---
 modules/programs/gnome/default.nix            | 25 +++++++++------
 packages/default.nix                          |  5 ---
 .../notification-timeout/default.nix          | 31 ------------------
 .../windowisready-remover/default.nix         | 32 -------------------
 4 files changed, 16 insertions(+), 77 deletions(-)
 delete mode 100644 packages/desktop/gnome/extensions/notification-timeout/default.nix
 delete mode 100644 packages/desktop/gnome/extensions/windowisready-remover/default.nix

diff --git a/modules/programs/gnome/default.nix b/modules/programs/gnome/default.nix
index 903d2d1..057f10e 100644
--- a/modules/programs/gnome/default.nix
+++ b/modules/programs/gnome/default.nix
@@ -14,8 +14,8 @@ in {
         gnomeExtensions.appindicator
         gnomeExtensions.caffeine
         gnomeExtensions.gnome-40-ui-improvements
-        gnomeExtensions.notification-timeout # Custom package
-        gnomeExtensions.windowisready-remover # Custom package
+        gnomeExtensions.notification-timeout
+        gnomeExtensions.window-is-ready-remover
         gnomeExtensions.application-volume-mixer
         gnomeExtensions.tiling-assistant
         gnomeExtensions.tilingnome
@@ -78,14 +78,20 @@ in {
       gtkUsePortal = true;
     };
 
+    qt5 = {
+      style = "adwaita-dark";
+      platformTheme = "gnome";
+      enable = true;
+    };
+    
     home-manager.users."${config.ptw.system.singleUser}" = {
-      xdg.configFile = {
-        # Make QT apps use a dark theme
-        "Kvantum/kvantum.kvconfig".text = ''
-          [General]
-          theme=KvArcDark
-        '';
-      };
+     #xdg.configFile = {
+     #  # Make QT apps use a dark theme
+     #  "Kvantum/kvantum.kvconfig".text = ''
+     #    [General]
+     #    theme=KvArcDark
+     #  '';
+     #};
 
       dconf.settings = {
         # The packages come in from modules/programs/gnome
@@ -112,6 +118,7 @@ in {
             "windowIsReady_Remover@nunofarruca@gmail.com"
             "blur-my-shell@aunetx"
             "gsconnect@andyholmes.github.io"
+            "trayIconsReloaded@selfmade.pl"
           ] ++ (lib.optional isMiku "tiling-assistant@leleat-on-github")
           ++ (lib.optional (isNishimiya || isMiku) "tilingnome@rliang.github.com");
         };
diff --git a/packages/default.nix b/packages/default.nix
index 118d17f..3b4b408 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -13,11 +13,6 @@ in {
 key-mapper = prev.callPackage ./tools/games/key-mapper {};
   vfio-isolate = prev.callPackage ./tools/virtualisation/vfio-isolate {};
   mopidy-funkwhale = prev.callPackage ./applications/audio/mopidy/funkwhale.nix {};
-  # Not as clean as I hoped, but it works
-  gnomeExtensions = prev.gnomeExtensions // {
-    notification-timeout = prev.callPackage ./desktop/gnome/extensions/notification-timeout {};
-    windowisready-remover = prev.callPackage ./desktop/gnome/extensions/windowisready-remover {};
-  };
   python3Packages = prev.python3Packages // {
     pySmartDL = pySmartDL;
     cfscrape = cfscrape;
diff --git a/packages/desktop/gnome/extensions/notification-timeout/default.nix b/packages/desktop/gnome/extensions/notification-timeout/default.nix
deleted file mode 100644
index 3bf3dc7..0000000
--- a/packages/desktop/gnome/extensions/notification-timeout/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-notification-timeout";
-  version = "unstable-2021-07-25";
-
-  src = fetchFromGitHub {
-    owner = "vchlum";
-    repo = "notification-timeout";
-    rev = "1f8c2a433383f974bd49869db5ae7a6d7a82d302";
-    sha256 = "1ndr8gn52qggq45lbdc5miz62is8im34nzmzsghcnarrm73naq59";
-  };
-
-  uuid = "notification-timeout@chlumskyvaclav.gmail.com";
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/share/gnome-shell/extensions/${uuid}
-    cp -r metadata.json extension.js prefs.js schemas/ $out/share/gnome-shell/extensions/${uuid}
-  '';
-
-  meta = with lib; {
-    description = "Gnome Shell extension for configuring notification timeout. ";
-    homepage = "https://github.com/vchlum/notification-timeout";
-    license = licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/packages/desktop/gnome/extensions/windowisready-remover/default.nix b/packages/desktop/gnome/extensions/windowisready-remover/default.nix
deleted file mode 100644
index 69e60b3..0000000
--- a/packages/desktop/gnome/extensions/windowisready-remover/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "WindowIsReady-Remover";
-  version = "1.12";
-
-  src = fetchFromGitHub {
-    owner = "nunofarruca";
-    repo = "WindowIsReady_Remover";
-    rev = version;
-    sha256 = "0yivd8q2mkb2c40n1pndwrsv9bi2lnm3r06wk04vhjc6f8x7qj52";
-  };
-
-  uuid = "windowIsReady_Remover@nunofarruca@gmail.com";
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/share/gnome-shell/extensions/${uuid}
-    cp -r ${uuid}/* $out/share/gnome-shell/extensions/${uuid}
-  '';
-
-  meta = with lib; {
-    description = "Removes window is ready Notification";
-    homepage = "https://github.com/nunofarruca/WindowIsReady_Remover";
-    # NOTE: Wrong
-    license = licenses.unlicense;
-    maintainers = [ ];
-  };
-}