Use overlay

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

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

@@ -1,14 +1,6 @@
 { user, home }:
 { config, pkgs, ... }:
 {
-  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;
 

hosts/common/configs/user/console/android/env-var-user-home.patch

@@ -1,21 +0,0 @@
---- a/vendor/adb/adb_utils.cpp
-+++ b/vendor/adb/adb_utils.cpp
-@@ -308,8 +308,16 @@
- }
-
- std::string adb_get_android_dir_path() {
--    std::string user_dir = adb_get_homedir_path();
--    std::string android_dir = user_dir + OS_PATH_SEPARATOR + ".android";
-+    const char* android_user_home = getenv("ANDROID_USER_HOME");
-+    std::string android_dir;
-+
-+    if (android_user_home) {
-+        android_dir = std::string(android_user_home);
-+    } else {
-+        std::string user_dir = adb_get_homedir_path();
-+        android_dir = user_dir + OS_PATH_SEPARATOR + ".android";
-+    }
-+
-     struct stat buf;
-     if (stat(android_dir.c_str(), &buf) == -1) {
-         if (adb_mkdir(android_dir, 0750) == -1) {

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

@@ -1,25 +1,6 @@
 { user, home }:
 { lib, pkgs, ... }:
 {
-  # FIXME: https://github.com/hrkfdn/ncspot/issues/1681#issuecomment-3186274719
-  nixpkgs.overlays = [
-    (final: prev: {
-      ncspot = prev.ncspot.overrideAttrs (oldAttrs: rec {
-        src = pkgs.fetchFromGitHub {
-          owner = "hrkfdn";
-          repo = "ncspot";
-          rev = "aac67d631f25bbc79f509d34aa85e6daff954830";
-          hash = "sha256-B6BA1ksfDEySZH6gzkU5khOzwXAmeHbMHsx3sXd9lbs=";
-        };
-
-        cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
-          inherit src;
-          hash = "sha256-HrQJiIzSvu/vR03UdnCcU6TGToBDKKDC6XscjvX3KPE=";
-        };
-      });
-    })
-  ];
-
   environment.persistence = {
     "/persist/state"."${home}/.config/ncspot/userstate.cbor" = { };
     "/persist/cache"."${home}/.cache/ncspot" = { };

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

@@ -3,13 +3,10 @@
   config,
   lib,
   pkgs,
-  inputs,
-  system,
   ...
 }:
 let
   hmConfig = config.home-manager.users.${user};
-  selfPkgs = inputs.self.packages.${system};
 in
 {
   home-manager.users.${user} = {
@@ -187,9 +184,8 @@ in
             ouch
             mount
             mediainfo
+            custom-shell
             ;
-
-          custom-shell = selfPkgs.yazi-plugin-custom-shell;
         };
       };