Use overlays instead of patched packages

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/user/configs/console/android/default.nix

@@ -5,13 +5,17 @@
 let
   userConfig = config.users.users.${username};
   hmConfig = config.home-manager.users.${username};
-  android-tools = pkgs.android-tools.overrideAttrs (oldAttrs: {
-    patches = oldAttrs.patches or [ ] ++ [ ./env-var-user-home.patch ];
-  });
 in
 {
-  services.udev.packages = with pkgs; [ android-udev-rules ];
-  environment.systemPackages = [ android-tools ];
+  nixpkgs.overlays = [
+    (final: prev: {
+      android-tools = prev.android-tools.overrideAttrs (oldAttrs: {
+        patches = oldAttrs.patches or [ ] ++ [ ./env-var-user-home.patch ];
+      });
+    })
+  ];
+
+  programs.adb.enable = true;
   services.gvfs.enable = true;
 
   users.users.${username}.extraGroups = [ "adbusers" ];

hosts/common/user/configs/gui/qalculate/default.nix

@@ -10,14 +10,19 @@
 let
   userConfig = config.users.users.${username};
   hmConfig = config.home-manager.users.${username};
-  qalculate-gtk = pkgs.qalculate-gtk.overrideAttrs (oldAttrs: {
-    patches = oldAttrs.patches or [ ] ++ [ ./skip-save-prefs.patch ];
-  });
 in
 {
+  nixpkgs.overlays = [
+    (final: prev: {
+      qalculate-gtk = prev.qalculate-gtk.overrideAttrs (oldAttrs: {
+        patches = oldAttrs.patches or [ ] ++ [ ./skip-save-prefs.patch ];
+      });
+    })
+  ];
+
   home-manager.users.${username} = {
     home = {
-      packages = [ qalculate-gtk ];
+      packages = with pkgs; [ qalculate-gtk ];
       persistence."/cache${userConfig.home}".files = [
         "${hmConfig.xdg.relativeConfigHome}/qalculate/qalculate-gtk.history"
       ];
@@ -44,7 +49,7 @@ in
         };
 
     wayland.windowManager.hyprland.settings = {
-      bind = [ ", XF86Calculator, exec, ${lib.meta.getExe qalculate-gtk}" ];
+      bind = [ ", XF86Calculator, exec, ${lib.meta.getExe pkgs.qalculate-gtk}" ];
       windowrulev2 = [ "float, class:(qalculate-gtk)" ];
     };
   };