From a2be692e45b3d6f87e89ffca7134e979eff9297c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Fri, 9 Jan 2026 14:10:21 +0100
Subject: [PATCH] Remove android tools

---
 flake.lock                | 30 +++++++++++++++---------------
 home/git/default.nix      |  2 +-
 hosts/Aloria/default.nix  |  1 -
 hosts/Arendia/default.nix |  1 -
 hosts/Common/android.nix  |  5 -----
 hosts/Common/default.nix  |  1 +
 6 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 hosts/Common/android.nix

diff --git a/flake.lock b/flake.lock
index e6b78ff..5a0aca8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,11 +132,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767619743,
-        "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=",
+        "lastModified": 1767930051,
+        "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f",
+        "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1767646366,
-        "narHash": "sha256-zvbgX5YTof1kxHVQ5iRaQXw3PJ2PhTLIlxGk5J/2krQ=",
+        "lastModified": 1767950946,
+        "narHash": "sha256-1uAvkp3rbtF4fdjiiXfGydNOLFcG6J0/LXbHFgQLxKY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "219274a265f05f24fbea676a975d0ddf37cbfe77",
+        "rev": "3fabc71263f7765c342740db5360a2308ece715d",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767621589,
-        "narHash": "sha256-L0A4daBtEuponvKr5YM4wn8btDku0Cs2Eu5b+EtTgSk=",
+        "lastModified": 1767893586,
+        "narHash": "sha256-fOMYp8L0k1e/lS9+wii6t52VU1EHGLfHZ2yN4VgfUwQ=",
         "owner": "vicinaehq",
         "repo": "vicinae",
-        "rev": "b79669006c4e49e32f2ae889c1294cd62c8071d5",
+        "rev": "a11af8cf1a4bd15692852e1abc1ecc0d62c4d50e",
         "type": "github"
       },
       "original": {
diff --git a/home/git/default.nix b/home/git/default.nix
index 74a2fb4..1f5845c 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -16,7 +16,7 @@
             credentials.helper = "store";
             pull.rebase = false;
             push.autoSetupRemove = true;
-            branch.autoSetupMerge = "simple";
+            branch.autoSetupMerge = true;
             init.defaultBranch = "master";
             diff.noprefix = true;
             color.ui = "auto";
diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix
index 6f1385b..d1457fc 100644
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@@ -7,7 +7,6 @@ in {
         (import ../Common/desktop.nix { inherit inputs pkgs config; })
         (import ../Common/nfs.nix { inherit pkgs serverIP; })
         (import ../Common/zfs.nix {inherit inputs pkgs config; })
-        (import ../Common/android.nix { inherit pkgs; })
     ];
 
     hardware.graphics.extraPackages = [
diff --git a/hosts/Arendia/default.nix b/hosts/Arendia/default.nix
index d9ef3d2..202e946 100644
--- a/hosts/Arendia/default.nix
+++ b/hosts/Arendia/default.nix
@@ -7,7 +7,6 @@ in {
         (import ../Common/desktop.nix { inherit inputs pkgs config; })
         (import ../Common/nfs.nix { inherit pkgs serverIP; })
         (import ../Common/zfs.nix {inherit inputs pkgs config; })
-        (import ../Common/android.nix {inherit inputs pkgs config; })
     ];
 
     hardware.graphics.extraPackages = [
diff --git a/hosts/Common/android.nix b/hosts/Common/android.nix
deleted file mode 100644
index eff675d..0000000
--- a/hosts/Common/android.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.adb.enable = true;
-  users.users.user.extraGroups = ["adbusers"];
-}
diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix
index e2b6171..a978f5b 100644
--- a/hosts/Common/default.nix
+++ b/hosts/Common/default.nix
@@ -105,6 +105,7 @@
     ];
 
     environment.systemPackages = with pkgs; [
+        android-tools
         virtiofsd
         wget
         curl