diff --git a/modules/home/hyprland/conf/waybar/config.jsonc b/modules/home/hyprland/conf/waybar/config.jsonc
index da28b29..a413c71 100644
--- a/modules/home/hyprland/conf/waybar/config.jsonc
+++ b/modules/home/hyprland/conf/waybar/config.jsonc
@@ -89,6 +89,13 @@
     }
   },
 
+  "hyprland/window": {
+    "format": "{title}",
+    "tooltip-format": "{title}",
+    "rewrite": { "^(.{30}).+": "$1..." },
+    "separate-outputs": true
+  },
+
   "clock": {
     "format": "{:%Y/%m/%d %H:%M}",
     "format-alt": "{:%I:%M%p 周%u}",
@@ -103,11 +110,7 @@
     "spacing": 0,
     "tooltip-format": "{title}",
     "on-click": "activate",
-    "on-click-middle": "close",
-    "ignore-list": ["Alacritty"],
-    "app_ids-mapping": {
-      "firefoxdeveloperedition": "firefox-developer-edition"
-    }
+    "on-click-middle": "close"
   },
 
   "tray": {
diff --git a/profiles/apollo/network.nix b/profiles/apollo/network.nix
index c699d57..8aeb697 100644
--- a/profiles/apollo/network.nix
+++ b/profiles/apollo/network.nix
@@ -15,30 +15,33 @@
 
     enableIPv6 = true;
 
-    # Set up bridge network
-    interfaces.eno1 = {
-      useDHCP = false;
-      wakeOnLan = {
-        enable = true;
-        policy = [
-          "magic"
-        ];
-      };
-    };
-
     bridges = {
       br0 = { interfaces = [ "eno1" ]; };
     };
 
-    interfaces.br0 = {
-      useDHCP = false;
-      ipv4.addresses = [
-        {
-          address = "10.7.43.10";
-          prefixLength = 24;
-        }
-      ];
+    # Set up bridge network
+    interfaces = {
+      eno1 = {
+        useDHCP = false;
+        wakeOnLan = {
+          enable = true;
+          policy = [
+            "magic"
+          ];
+        };
+      };
+
+      br0 = {
+        useDHCP = false;
+        ipv4.addresses = [
+          {
+            address = "10.7.43.10";
+            prefixLength = 24;
+          }
+        ];
+      };
     };
+
     defaultGateway = {
       address = "10.7.43.30";
       interface = "br0";