From 2084da9ff463bd604c67da824ca45e23a47e7a57 Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Tue, 16 Jul 2024 19:39:13 -0700
Subject: [PATCH] misc changes

Old changes I never committed
---
 .../nixos/services/adguardhome/default.nix    | 12 ++++++
 systems/aarch64-linux/pi4/default.nix         |  1 -
 systems/x86_64-linux/gospel/default.nix       | 38 ++++++++++++++++---
 systems/x86_64-linux/gospel/zfs.nix           |  6 +--
 4 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/modules/nixos/services/adguardhome/default.nix b/modules/nixos/services/adguardhome/default.nix
index 850f069..21f55d5 100644
--- a/modules/nixos/services/adguardhome/default.nix
+++ b/modules/nixos/services/adguardhome/default.nix
@@ -27,6 +27,18 @@ in {
       mutableSettings = true;
       host = "0.0.0.0";
       port = 3000;
+      settings = {
+        filtering.rewrites = [
+          {
+            domain = "adguardhome.kilonull.com";
+            answer = "192.168.113.13";
+          }
+          {
+            domain = "*.kilonull.com";
+            answer = "192.168.113.13";
+          }
+        ];
+      };
     };
 
     services.nginx = {
diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix
index d0f0e3d..c44d286 100644
--- a/systems/aarch64-linux/pi4/default.nix
+++ b/systems/aarch64-linux/pi4/default.nix
@@ -34,7 +34,6 @@
     services.tailscale = {
       enable = true;
       configureClientRouting = true;
-      configureServerRouting = true;
     };
     services.openssh.enable = true;
     services.octoprint = {
diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index d2f0c46..c7370e5 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -71,16 +71,24 @@
     system.monitoring.enable = true;
   };
 
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "overlay2";
-    rootless = {
+  programs.adb.enable = true;
+
+  virtualisation = {
+    libvirtd.enable = true;
+
+    docker = {
       enable = true;
-      setSocketVariable = true;
+      storageDriver = "overlay2";
+      rootless = {
+        enable = true;
+        setSocketVariable = true;
+      };
     };
   };
 
-  # boot.binfmt.emulatedSystems = ["aarch64-linux" "armv6l-linux"];
+  programs.virt-manager.enable = true;
+
+  boot.binfmt.emulatedSystems = ["aarch64-linux" "armv6l-linux"];
   networking = {
     hostName = "gospel";
     useDHCP = false;
@@ -106,6 +114,9 @@
 
     cryptsetup
     paperkey
+
+    chromium
+
     unzip
     p7zip
     nix-index
@@ -116,6 +127,21 @@
     esptool
     minicom
     signal-desktop
+    ncdu
+
+    cntr
+
+    bundler
+    bundix
+    nix-output-monitor
+
+    iw
+    wpa_supplicant
+
+    mqttui
+    openscad
+
+    zoom-us
   ];
 
   # This value determines the NixOS release from which the default
diff --git a/systems/x86_64-linux/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix
index 18cb338..66151b0 100644
--- a/systems/x86_64-linux/gospel/zfs.nix
+++ b/systems/x86_64-linux/gospel/zfs.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   boot.supportedFilesystems = ["zfs"];
   networking.hostId = "f8616592";
   boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;