From 97f5bf504c1b67a3a1d82c1b889f31b227e0fc96 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 28 Nov 2023 09:28:12 +0000
Subject: [PATCH 1/3] hosts: homes: mousqueton: remove 'LD_PRELOAD'

It looks like this isn't needed anymore.
---
 hosts/homes/ambroisie@mousqueton/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/hosts/homes/ambroisie@mousqueton/default.nix b/hosts/homes/ambroisie@mousqueton/default.nix
index 8294ff4..06ee817 100644
--- a/hosts/homes/ambroisie@mousqueton/default.nix
+++ b/hosts/homes/ambroisie@mousqueton/default.nix
@@ -4,15 +4,6 @@
   # Google specific configuration
   home.homeDirectory = "/usr/local/google/home/ambroisie";
 
-  # Some tooling (e.g: SSH) need to use this library
-  home.sessionVariables = {
-    LD_PRELOAD = "/usr/grte/v5/lib64/libnss_cache.so.2\${LD_PRELOAD:+:}$LD_PRELOAD";
-  };
-
-  systemd.user.sessionVariables = {
-    LD_PRELOAD = "/usr/grte/v5/lib64/libnss_cache.so.2\${LD_PRELOAD:+:}$LD_PRELOAD";
-  };
-
   programs.git.package = lib.mkForce pkgs.emptyDirectory;
 
   services.gpg-agent.enable = lib.mkForce false;

From ec79be2a451f9af5464778f54f662626021dbb7b Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 28 Nov 2023 14:35:12 +0000
Subject: [PATCH 2/3] home: xdg: set 'ANDROID_USER_HOME'

---
 modules/home/xdg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/home/xdg/default.nix b/modules/home/xdg/default.nix
index af9ec18..3bba198 100644
--- a/modules/home/xdg/default.nix
+++ b/modules/home/xdg/default.nix
@@ -39,6 +39,7 @@ in
   # I want a tidier home
   config.home.sessionVariables = with config.xdg; lib.mkIf cfg.enable {
     ANDROID_HOME = "${dataHome}/android";
+    ANDROID_USER_HOME = "${configHome}/android";
     CARGO_HOME = "${dataHome}/cargo";
     DOCKER_CONFIG = "${configHome}/docker";
     GDBHISTFILE = "${dataHome}/gdb/gdb_history";

From f4cc63c711e69d2e07319d29b6f472c3128e3544 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 28 Nov 2023 14:39:48 +0000
Subject: [PATCH 3/3] home: direnv: remove 'ANDROID_SDK_HOME'

Turns out this is supposed to be used for configuration, and it makes
some tools error out due to a sanity check...

I'm not pleased about this, but whatever.
---
 modules/home/direnv/lib/android.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/home/direnv/lib/android.sh b/modules/home/direnv/lib/android.sh
index 3f730c2..fa2f856 100644
--- a/modules/home/direnv/lib/android.sh
+++ b/modules/home/direnv/lib/android.sh
@@ -47,10 +47,9 @@ use_android() {
         esac
     done
 
-    export ANDROID_SDK_HOME="$ANDROID_HOME"
     export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$ndk_version"
     export ANDROID_ROOT="$ANDROID_HOME"
-    export ANDROID_SDK_ROOT="$ANDROID_SDK_HOME"
+    export ANDROID_SDK_ROOT="$ANDROID_HOME"
     export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
 
     PATH_add "$ANDROID_NDK_HOME"