From ee8671e63326ad0473ea44222d93d35132d9e9ef Mon Sep 17 00:00:00 2001
From: root <root@fudo.org>
Date: Tue, 25 Aug 2020 22:05:59 -0700
Subject: [PATCH 1/2] Minor local changes on spark

---
 .gitignore      |  2 +-
 hosts/spark.nix | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 947f765..e0f8ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 configuration.nix
-hardware-configuration.nix
 *~
+hardware-configuration.nix
diff --git a/hosts/spark.nix b/hosts/spark.nix
index bc2adae..b8a6834 100644
--- a/hosts/spark.nix
+++ b/hosts/spark.nix
@@ -11,15 +11,33 @@ in {
     ../hardware-configuration.nix
   ];
 
+  nixpkgs.config.permittedInsecurePackages = [
+    "google-chrome-81.0.4044.138"
+  ];
+
+  environment.systemPackages = with pkgs; [
+    # androidStudioPackages.canary
+    androidenv.androidPkgs_9_0.platform-tools
+    cmake
+    glxinfo
+    opencv4
+    qemu_kvm
+    signal-cli
+    signal-desktop
+    teamviewer
+    thunderbird
+    wireshark
+  ];
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi = {
     canTouchEfiVariables = true;
-    efibootmgr = {
-      efiDisk = "/dev/sda1";
-    };
+  };
 
-    # efiSysMountPoint = "/boot/efi";
+  programs = {
+    adb.enable = true;
+    bash.enableCompletion = true;
   };
 
   networking.hostName = hostname;
@@ -29,4 +47,13 @@ in {
   hardware.opengl.driSupport32Bit = true;
   hardware.opengl.driSupport = true;
 
+  services = {
+    trezord.enable = true;
+  };
+
+  virtualisation.libvirtd = {
+    enable = true;
+    qemuPackage = pkgs.qemu_kvm;
+    onShutdown = "shutdown";
+  };
 }

From 944f3f3eafb38b104234fa052361d485f7c62e4f Mon Sep 17 00:00:00 2001
From: root <root@fudo.org>
Date: Sun, 30 Aug 2020 23:18:51 -0700
Subject: [PATCH 2/2] Switch spark to profile/site

---
 hosts/spark.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hosts/spark.nix b/hosts/spark.nix
index b8a6834..e86fc06 100644
--- a/hosts/spark.nix
+++ b/hosts/spark.nix
@@ -6,8 +6,6 @@ let
 in {
   imports = [
     ../defaults.nix
-    ../networks/sea.fudo.org.nix
-    ../profiles/desktop.nix
     ../hardware-configuration.nix
   ];
 
@@ -29,6 +27,12 @@ in {
     wireshark
   ];
 
+  fudo.common = {
+    profile = "desktop";
+    site = "seattle";
+    enable-gui = true;
+  };
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi = {