From 48927ca38a6a84c530993a48a69caf5654fd151e Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Tue, 1 Aug 2023 23:54:21 +0200
Subject: [PATCH] dump

feat(hardware): add android to udev
fix(home/desktop): use new gtk-theme Colloid
fix(home/default): update golang to latest
---
 home/default.nix           |  3 ++-
 home/desktop.nix           | 10 ++++++++--
 home/firefox.nix           | 19 +++++++++++++++----
 nixos/desktop/default.nix  |  2 +-
 nixos/hardware/default.nix |  4 ++++
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index b721ef3..0427baa 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -49,7 +49,8 @@
 		# pure-prompt
 		# vimPlugins.nvim-lspconfig
 		# vimPlugins.nerdtree
-		go_1_18 gcc libcap
+		#go_1_18
+		go gcc libcap
 		gopls
 		# cargo
 		rustup
diff --git a/home/desktop.nix b/home/desktop.nix
index c93d716..c22409d 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -64,10 +64,16 @@
 			# package = pkgs.yaru-theme;
 			# name = "Yaru-dark";
 
-			package = pkgs.flat-remix-gtk;
-			name = "Flat-Remix-GTK-Blue-Darkest";
+			# package = pkgs.flat-remix-gtk;
+			# name = "Flat-Remix-GTK-Blue-Darkest";
 			# name = "Flat-Remix-GTK-Blue-Darkest-NoBorder";
 			# name = "Flat-Remix-GTK-Blue-Darker";
+			package = pkgs.colloid-gtk-theme.override {
+				sizeVariants = [ "compact" ];
+				tweaks = [ "black" "rimless" ];
+				themeVariants = [ "all" ];
+			};
+			name = "Colloid-Compact";
 		};
 		iconTheme = {
 			package = pkgs.yaru-theme;
diff --git a/home/firefox.nix b/home/firefox.nix
index 16f212a..a8cb509 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -13,6 +13,7 @@
 			bookmarks = {
 				"github".url = "https://github.com";
 			};
+			search.default = "DuckDuckGo";
 			settings = {
 				"extensions.pocket.enabled" = false;
 				#----
@@ -30,12 +31,22 @@
 				"privacy.trackingprotection.enabled" = true;
 				"privacy.trackingprotection.cryptomining.enabled" = true;
 				"privacy.trackingprotection.fingerprinting.enabled" = true;
+				# new
+				# https everywhere
+				"dom.security.https_only_mode" = true;
+				"dom.security.https_only_mode_ever_enabled" = true;
+				# DNS over HTTPS disabled
+				"doh-rollout.disable-heuristics" = true;
+				"network.trr.mode" = 5;
+				# autofill (TODO)
+				"dom.forms.autocomplete.formautofill" = false;
+				"extensions.formautofill.creditCards.enabled" = false;
 			};
 			extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-			# ublock-origin
-			#	umatrix
-			# browserpass-ce
-			# tree-style-tab
+			  ublock-origin
+			  umatrix
+			  browserpass
+			  tree-style-tab
 			];
 			userChrome = ''
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index a79949c..49a693d 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -36,7 +36,7 @@
 
 	# syncthing
 	networking.firewall.allowedTCPPorts = [ 22000 ];
-	networking.firewall.allowedUDPPorts = [ 22000 ];
+	networking.firewall.allowedUDPPorts = [ 22000 21027 ];
 
 	programs.browserpass.enable = true;
 
diff --git a/nixos/hardware/default.nix b/nixos/hardware/default.nix
index 8ea40ba..4af98ac 100644
--- a/nixos/hardware/default.nix
+++ b/nixos/hardware/default.nix
@@ -49,6 +49,10 @@
 	networking.useNetworkd = true;
 	networking.useDHCP = false;
 
+	services.udev.packages = with pkgs; [
+		android-udev-rules
+	];
+
 	environment.systemPackages = with pkgs; [
 		pciutils
 		wireguard-tools