From 8377a0b8b793d506748790641ab036ad81fb3553 Mon Sep 17 00:00:00 2001
From: servostar <sven.vogel123@web.de>
Date: Sat, 23 Dec 2023 12:13:43 +0100
Subject: [PATCH] added android to dev

---
 configuration.nix |  4 ++--
 dev/android.nix   | 11 +++++++++++
 dev/default.nix   |  3 ++-
 settings.nix      |  9 ++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 dev/android.nix

diff --git a/configuration.nix b/configuration.nix
index 144ed9f..3a2140b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,16 +5,16 @@ in
 {
     imports = [
         ./hardware-configuration.nix # Include the results of the hardware scan.
+        ./core              # core system components
+        ./system            # system components such as kernel
         ./nix-settings.nix  # nix related config
         ./users
         ./.luks-swap.nix
         ./fonts.nix         # system wide font settings
         ./extra             # extra packages
-        ./core              # core system components
         ./dev               # development stuff
         ./games             # games
         ./hardware          # hardware specific settings
-        ./system            # system components such as kernel
     ];
 
     # This value determines the NixOS release from which the default
diff --git a/dev/android.nix b/dev/android.nix
new file mode 100644
index 0000000..782561e
--- /dev/null
+++ b/dev/android.nix
@@ -0,0 +1,11 @@
+{ pkgs, lib, config, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    programs.adb.enable = true;
+
+    services.udev.packages = [
+        pkgs.android-udev-rules
+    ];
+}
diff --git a/dev/default.nix b/dev/default.nix
index 22c452c..5e736b8 100644
--- a/dev/default.nix
+++ b/dev/default.nix
@@ -12,5 +12,6 @@ in
     ++ lib.optionals settings.dev.python3.enable [ ./python3.nix ]
     ++ lib.optionals settings.virtualisation.waydroid [ ./waydroid.nix ]
     ++ lib.optionals settings.virtualisation.wine.enable [ ./wine.nix ]
-    ++ lib.optionals settings.dev.arduino.enable [ ./arduino.nix ];
+    ++ lib.optionals settings.dev.arduino.enable [ ./arduino.nix ]
+    ++ lib.optionals settings.dev.android.enable [ ./android.nix ];
 }
diff --git a/settings.nix b/settings.nix
index 3156f15..1d3e9f3 100644
--- a/settings.nix
+++ b/settings.nix
@@ -21,7 +21,7 @@ with import <nixpkgs> {};
         };
     };
 
-    fish = true;
+    fish = false;
 
     plasma5 = {
         enable = true;
@@ -42,7 +42,7 @@ with import <nixpkgs> {};
         };
         qemu = {
             enable = true;
-            virt-manager = true;
+            virt-manager = false;
         };
         waydroid = false;
         wine = {
@@ -74,6 +74,9 @@ with import <nixpkgs> {};
             enable = false;  # enable arduino development platform
             ide2 = true;    # wether to use IDE 2.x or deprecated 1.x
         };
+        android = {
+            enable = true;
+        };
         lsp = {
             enable = true;
             # various language server
@@ -103,7 +106,7 @@ with import <nixpkgs> {};
 
     networking = {
         wireguard = true;   # enable wireguard protocol
-        hostname = "servostar-nixos-desktop";
+        hostname = "servostar-nixos-flex";
     };
 
     games = {