packages: Remove the patched Gajim

hosts/miku.nix

@@ -34,23 +34,10 @@
     piper trackma # Custom package
     anime-dl # Custom package
     thunderbird
-    #nwg-launchers
-    gnome-podcasts
-    cantata
-    newsflash
-    sublime-music
     anki
-    gnome-podcasts
     gimp
     #psst
 
-    evolution
-    
-    # Proprietary stuff (yikes)
-    discord-wrapped discord-app-wrapped
-    spotify-wrapped
-    zoom-vm
-
     #lapce
   ];
 
@@ -79,18 +66,19 @@
       office.enable = true;
       plasma = {
         enable = true;
-        sddm = {
+        /*sddm = {
           backgroundImage = pkgs.fetchurl {
             url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg";
             sha256 = "sha256-likoJuEaGzGH0RqjPsBE9o5ATwgnOo97PREh3oZBax8=";
           };
-        };
+        };*/
       };
       gaming.enable = true;
       obs.enable = true;
       android.enable = true;
     };
     services = {
+      yubikey.enable = true;
       gamemode.enable = true;
       gnome.enable = false;
       logiops.enable = true;

lib/baseSystem.nix

@@ -105,7 +105,7 @@ in {
     # Coding fonts
     source-code-pro
     # Icon fonts
-    #nerdfonts
+    nerdfonts
   ];
 
   # For home-manager

overlays/simple.nix

@@ -66,4 +66,14 @@ final: prev: {
   # pkgsi686Linux = prev.pkgsi686Linux.extend (pfinal: pprev: {
   #   directx-shader-compiler = pprev.directx-shader-compiler.override {stdenv = pfinal.gcc11Stdenv;};
   # });
+
+  gajim = prev.gajim.overrideAttrs (old: {
+    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+      # Make the tray icon work
+      prev.libappindicator-gtk3
+
+      # Play sounds
+      prev.gsound
+    ];
+  });
 }

packages/applications/networking/instant-messengers/gajim/default.nix

@@ -1,68 +0,0 @@
-{ lib
-, python3, nbxmpp
-, gettext
-, fetchgit
-, wrapGAppsHook
-, gobject-introspection
-, libsoup_3
-, gtksourceview4
-, libappindicator-gtk3
-, farstream
-, gst_all_1
-, gsound
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "gajim";
-  version = "1.7.3";
-  format = "pyproject";
-
-  src = fetchgit {
-    url = "https://dev.gajim.org/gajim/gajim";
-    rev = version;
-    hash = "sha256-47CzJwmPRl+DggxwI63sp/JJAnEvnNUS1MxFrRIBAw8=";
-  };
-
-  nativeBuildInputs = [
-    python3.pkgs.setuptools
-    gettext
-    wrapGAppsHook
-    gobject-introspection
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    setuptools
-    pygobject3
-    cryptography
-    css-parser
-    keyring
-    nbxmpp
-    packaging
-    pillow
-    precis-i18n
-    pycairo
-    gobject-introspection
-
-    # Omemo
-    python-axolotl
-    qrcode
-
-    # Additional features
-    gsound
-    libappindicator-gtk3
-    farstream gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-
-    # Gtk dependencies
-    libsoup_3
-    gtksourceview4
-  ];
-
-  pythonImportsCheck = [ "gajim" ];
-
-  meta = with lib; {
-    description = "";
-    homepage = "https://dev.gajim.org/gajim/gajim";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
-  };
-}

packages/applications/networking/instant-messengers/gajim/nbxmpp.nix

@@ -1,52 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchgit
-, setuptools
-, pygobject3
-, idna
-, packaging
-, precis-i18n
-, gssapi
-, pyopenssl
-, libsoup_3
-, gobject-introspection
-, glib
-, glib-networking
-}:
-
-buildPythonPackage rec {
-  pname = "python-nbxmpp";
-  version = "4.2.2";
-  format = "pyproject";
-
-  src = fetchgit {
-    url = "https://dev.gajim.org/gajim/python-nbxmpp";
-    rev = version;
-    hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc=";
-  };
-
-  nativeBuildInputs = [
-    setuptools
-    gobject-introspection
-  ];
-
-  propagatedBuildInputs = [
-    pygobject3
-    idna
-    packaging
-    precis-i18n
-    libsoup_3
-    glib glib-networking
-    pyopenssl
-    gobject-introspection
-  ];
-
-  pythonImportsCheck = [ "nbxmpp" ];
-
-  meta = with lib; {
-    description = "";
-    homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
-  };
-}

packages/default.nix

@@ -120,9 +120,5 @@ in {
   #obs-websocket = prev.libsForQt5.callPackage obs/obs-websocket {};
   obs-cli = prev.callPackage obs/obs-cli {};
 
-  gajim = prev.callPackage ./applications/networking/instant-messengers/gajim/default.nix {
-    nbxmpp = prev.python3.pkgs.callPackage ./applications/networking/instant-messengers/gajim/nbxmpp.nix {};
-  };
-
   rgb_keyboard = prev.callPackage ./applications/desktop/rgb_keyboard/default.nix {};
 }