From 4335e928951b7d95125f900fea1e689437c4c170 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Fri, 18 Apr 2025 04:15:54 -0400
Subject: [PATCH] Add back Droid, second go around will surely work

---
 flake.lock                         | 26 ++++++++++++++++++++++++++
 flake.nix                          | 28 +++++++++++++++++++++-------
 hosts/droid/default.nix            | 17 +++++++++++++++++
 hosts/droid/id_ed25519.pub         |  1 +
 hosts/droid/users/default.nix      |  4 ++++
 hosts/droid/users/main/default.nix | 11 +++++++++++
 6 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 hosts/droid/default.nix
 create mode 100644 hosts/droid/id_ed25519.pub
 create mode 100644 hosts/droid/users/default.nix
 create mode 100644 hosts/droid/users/main/default.nix

diff --git a/flake.lock b/flake.lock
index 5c63ab3f..b737dc19 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,29 @@
 {
   "nodes": {
+    "avf": {
+      "locked": {
+        "lastModified": 1744940518,
+        "narHash": "sha256-pkbIduXLW85yB5wV6j72Gpxz5JJhuJBZxhXWsJ4BMd8=",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/avf-channel-24.11-aarch64.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/avf-channel-24.11-aarch64.tar.xz"
+      }
+    },
+    "avf-channel": {
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-56qCMHw9q2hkyh6qlbrTKTN102OfZPkXVI4YGLa5Wgc=",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/nixos-channel-24.11-aarch64.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/nixos-channel-24.11-aarch64.tar.xz"
+      }
+    },
     "blender": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -442,6 +466,8 @@
     },
     "root": {
       "inputs": {
+        "avf": "avf",
+        "avf-channel": "avf-channel",
         "blender": "blender",
         "disko": "disko",
         "hm": "hm",
diff --git a/flake.nix b/flake.nix
index 8eba137a..04311a67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,14 +1,10 @@
 {
   inputs = {
-    # System inputs
+    # General inputs
     stable.url = "nixpkgs/nixos-24.11";
     unstable.url = "nixpkgs/nixos-unstable";
 
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.1";
-      inputs.nixpkgs.follows = "stable";
-    };
-
+    # System inputs
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "stable";
@@ -16,6 +12,12 @@
 
     impermanence.url = "github:nix-community/impermanence";
 
+    lanzaboote = {
+      url = "github:nix-community/lanzaboote/v0.4.1";
+      inputs.nixpkgs.follows = "stable";
+    };
+
+    # Service inputs
     mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
       inputs.nixpkgs.follows = "stable";
@@ -23,6 +25,10 @@
 
     minecraft.url = "github:Infinidoge/nix-minecraft";
 
+    # Android inputs
+    avf.url = "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/avf-channel-24.11-aarch64.tar.xz";
+    avf-channel.url = "https://github.com/nix-community/nixos-avf/releases/download/nixos-24.11/nixos-channel-24.11-aarch64.tar.xz";
+
     # Home inputs
     hm = {
       url = "github:nix-community/home-manager/release-24.11";
@@ -39,11 +45,17 @@
   outputs = {
     stable,
     unstable,
-    lanzaboote,
+
     disko,
     impermanence,
+    lanzaboote,
+
     mailserver,
     minecraft,
+
+    avf,
+    avf-channel,
+
     hm,
     nur,
     blender,
@@ -68,6 +80,8 @@
       intuos = mkNix [ ./hosts/intuos ] unstable; # Wacom Intuos Tablet
       redmond = mkNix [ ./hosts/redmond ] stable; # Lenovo Dual-Boot
 
+      droid = mkNix [ ./hosts/droid ] avf-channel; # Android Virtualization Framework
+
       midas = mkNix [ ./hosts/midas ] stable; # Dell Optiplex 5040
       kitty = mkNix [ ./hosts/kitty ] stable; # Dell Optiplex 7010
       prophet = mkNix [ ./hosts/prophet ] stable; # Oracle Neoverse-N1
diff --git a/hosts/droid/default.nix b/hosts/droid/default.nix
new file mode 100644
index 00000000..c2715746
--- /dev/null
+++ b/hosts/droid/default.nix
@@ -0,0 +1,17 @@
+{ lib, avf, ... }:
+{
+  imports = [
+    ./users
+    ../../modules/system
+    avf.nixosModules.avf
+  ];
+
+  networking.hostName = "droid";
+
+  system = {
+    desktop.enable = true;
+    stateVersion = "25.05";
+  };
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}
diff --git a/hosts/droid/id_ed25519.pub b/hosts/droid/id_ed25519.pub
new file mode 100644
index 00000000..e36a85de
--- /dev/null
+++ b/hosts/droid/id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl
diff --git a/hosts/droid/users/default.nix b/hosts/droid/users/default.nix
new file mode 100644
index 00000000..57e7f20b
--- /dev/null
+++ b/hosts/droid/users/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./main ];
+}
diff --git a/hosts/droid/users/main/default.nix b/hosts/droid/users/main/default.nix
new file mode 100644
index 00000000..637ec3ca
--- /dev/null
+++ b/hosts/droid/users/main/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+{
+  avf.defaultUser = config.sysusers.main;
+
+  home-manager.users."${config.sysusers.main}".home = {
+    desktop.enable = true;
+    gaming.enable = true;
+    production.enable = true;
+    stateVersion = lib.mkForce config.system.stateVersion;
+  };
+}