From c33d0dcba1a8b23295bc5784ef9094ce767ff916 Mon Sep 17 00:00:00 2001
From: th3r00t <tty303@proton.me>
Date: Tue, 19 Aug 2025 11:18:05 -0400
Subject: [PATCH] Added blocked host, fixed formatting of waybar

---
 home.nix                              | 12 +++++++
 home/config/qutebrowser/blocked-hosts |  1 +
 includes/waybar.nix                   | 47 +++++++++++++++------------
 3 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 home/config/qutebrowser/blocked-hosts

diff --git a/home.nix b/home.nix
index 527142c..498cd56 100644
--- a/home.nix
+++ b/home.nix
@@ -32,6 +32,11 @@
 		recursive = true;
 		executable = true; 
 	};
+	home.file.".config/qutebrowser/blocked-hosts" = {
+		source = ./home/config/qutebrowser/blocked-hosts;
+		recursive = true;
+		executable = true; 
+	};
 	home.file.".ssh/allowed_signers".text = ''
 		* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH8P/3yzsruekSaZ9b+yk429VTcfCtI1j8jnkNbPAgnr th3r00t@nixos
 	'';
@@ -42,6 +47,7 @@
 	programs.nix-index.enable = true;
 	fonts.fontconfig.enable = true;
 	home.packages = with pkgs; [
+		autossh
 		mesa-demos
 		bluez
 		bluez-tools
@@ -116,6 +122,12 @@
 		rustup
 		wayvnc
 		power-profiles-daemon
+		xfce.thunar
+		xfce.thunar-volman
+		xfce.thunar-vcs-plugin
+		xfce.thunar-archive-plugin
+		xfce.thunar-media-tags-plugin
+		gvfs
 	];
 	programs.wofi = {
 		enable = true;
diff --git a/home/config/qutebrowser/blocked-hosts b/home/config/qutebrowser/blocked-hosts
new file mode 100644
index 0000000..90e3d86
--- /dev/null
+++ b/home/config/qutebrowser/blocked-hosts
@@ -0,0 +1 @@
+rom.modapk48.com/wp-content/uploads/qnjuar.css?ver=1.1.5
diff --git a/includes/waybar.nix b/includes/waybar.nix
index c4d39e0..b505b45 100644
--- a/includes/waybar.nix
+++ b/includes/waybar.nix
@@ -7,7 +7,7 @@
 				layer = "top";
 				position = "top";
 				height = 30;
-				modules-left = [ "hyprland/workspaces" "hyprland/mode" "hyprland/window" ];
+				modules-left = [ "hyprland/workspaces" "hyprland/submap" "hyprland/window" ];
 				modules-center = [ "clock" ];
 				modules-right = [
 					"mpd"
@@ -31,6 +31,11 @@
 				"hyprland/window" = {
 					max-length = 50;
 				};
+				"hyprland/submap" = {
+					"format"="✌️ {}";
+					"max-length"= "8";
+					"tooltip"= false;
+				};
 				"keyboard-state"= {
 					"numlock"= true;
 					"capslock"= true;
@@ -124,11 +129,11 @@
 					"format-charging"= "{capacity}% {icon} ";
 					"format-plugged"= "{capacity}%  ";
 					"format-alt"= "{time} {icon} ";
-					"format-good"= "";
+					"format-good"= "{capacity}% {icon} ";
 					"format-icons"= ["" "" "" "" ""];
 				};
 				"battery#bat2"= {
-					"bat"= "BAT2";
+					"bat"= "BAT1";
 				};
 				"power-profiles-daemon"= {
 					"format"= "{icon}";
@@ -293,6 +298,13 @@ padding: 0 10px;
 				 /* color: #ffffff; */
 }
 
+@keyframes blink {
+	to {
+		/* background-color: #ffffff; */
+color: #000000;
+	}
+}
+
 #window,
 #workspaces {
 margin: 0 4px;
@@ -322,13 +334,6 @@ color: #4fd6be;
 			 /* background-color: #26A65B; */
 }
 
-@keyframes blink {
-	to {
-		/* background-color: #ffffff; */
-color: #000000;
-	}
-}
-
 /* Using steps() instead of linear as a timing function to limit cpu usage */
 #battery.critical:not(.charging) {
 	/* background-color: #f53c3c; */
@@ -339,6 +344,17 @@ color: #ff007c;
 			 animation-iteration-count: infinite;
 			 animation-direction: alternate;
 }
+#battery.warning {
+color: rgba(255, 210, 4, 1);
+}
+
+#battery.critical {
+color: rgba(238, 46, 36, 1);
+}
+
+#battery.charging {
+color: rgba(217, 216, 216, 1);
+}
 
 #power-profiles-daemon {
 	padding-right: 15px;
@@ -618,17 +634,6 @@ margin:     0px 5px 0px 5px;
 						min-width:  30px;
 }
 
-#battery.warning {
-color: rgba(255, 210, 4, 1);
-}
-
-#battery.critical {
-color: rgba(238, 46, 36, 1);
-}
-
-#battery.charging {
-color: rgba(217, 216, 216, 1);
-}
 
 #custom-storage.warning {
 color: rgba(255, 210, 4, 1);