From 7f462688d3945d1cfea2f42b9a1b263062355512 Mon Sep 17 00:00:00 2001
From: David Lick <david@dvdt.dev>
Date: Mon, 13 Nov 2023 18:32:49 -0500
Subject: [PATCH] updates nixos config

- adds applications to david user
- disables wireguard
- enables tor
---
 machines/configuration.nix  | 23 +++++++++++++----------
 machines/laptop/default.nix | 30 +++++++++++++-----------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/machines/configuration.nix b/machines/configuration.nix
index 5627453..867fa42 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -12,13 +12,18 @@
 		extraGroups = [ "networkmanager" "wheel" ];
 		shell = pkgs.zsh;
 		packages = with pkgs; [
-			firefox
-			thunderbird
-			sparrow
-			freecad
+			cura
+			dig
 			element-desktop
+			firefox
+			freecad
+			nmap
+			sparrow
+			sublime-music
+			thunderbird
 			timeshift
-			transmission-qt
+			tor-browser-bundle-bin
+			transmission-gtk
 			unison
 		];
 	};
@@ -59,6 +64,7 @@
 			git
 			htop
 			lsof
+			mullvad-vpn
 			tree
 			unzip
 			vim
@@ -107,12 +113,9 @@
 			};
 			pulse.enable = true;
 		};
-		transmission = {
+		tor = {
 			enable = true;
-			user = "transmission";
-			group = "transmission";
-			openFirewall = true;
-			openRPCPort = true;
+			client.enable = true;
 		};
 		udev.packages = with pkgs; [
 			gnome.gnome-settings-daemon
diff --git a/machines/laptop/default.nix b/machines/laptop/default.nix
index 9fd7570..924c3f4 100644
--- a/machines/laptop/default.nix
+++ b/machines/laptop/default.nix
@@ -10,23 +10,7 @@
 	networking.firewall.allowedTCPPorts = [ ];
 	networking.firewall.allowedUDPPorts = [ 51820 ];
 
-	networking.wg-quick.interfaces = {
-		wg0 = {
-			address = [ "10.8.0.4/24" ];
-			dns = [ "10.0.10.20" "10.0.10.1" ];
-			privateKeyFile = "/root/wg-home.privkey";
-
-			peers = [
-				{
-					publicKey = "KRI5BtJHsU9RWvf1syJ8zWkKtH9RMg/R/v88j1IH6iE=";
-					presharedKeyFile = "/root/wg-preshared.key";
-					allowedIPs = [ "0.0.0.0/0" ];
-					endpoint = "vpn.dvdt.dev:51820";
-					persistentKeepalive = 25;
-				}
-			];
-		};
-	};
+	security.pki.certificateFiles = [ "/root/ominous-law.local.crt" ];
 
 	hardware.bluetooth.enable = true;
 
@@ -40,6 +24,18 @@
 		
 	boot.initrd.secrets."/crypto_keyfile.bin" = null;
 
+	services.avahi = {
+		nssmdns = true;
+		enable = true;
+		ipv4 = true;
+		ipv6 = true;
+		publish = {
+			enable = true;
+			addresses = true;
+			workstation = true;
+		};
+	};
+
 	services.power-profiles-daemon.enable = false;
 	services.thermald.enable = true;
 	services.tlp = {