diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 723ead3e..a8b35c46 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -38,8 +38,6 @@
   services = {
     gpg-agent.pinentryFlavor = "gnome3";
     avizo.enable = true;
-    blueman-applet.enable = true;
-    network-manager-applet.enable = true;
     syncthing.enable = true;
     udiskie = {
       enable = true;
diff --git a/home/waybar/default.mustache b/home/waybar/default.mustache
index c34f0f1c..15f82f9c 100644
--- a/home/waybar/default.mustache
+++ b/home/waybar/default.mustache
@@ -59,6 +59,8 @@ tooltip {
 #window,
 #mpris,
 #pulseaudio,
+#network,
+#bluetooth,
 #backlight,
 #battery,
 #clock,
@@ -72,7 +74,8 @@ tooltip {
 #window,
 #mpris,
 #tray,
-#custom-separator {
+#backlight,
+#battery {
     color: @base05;
 }
 
@@ -96,12 +99,20 @@ tooltip {
     color: @base08;
 }
 #pulseaudio {
+    color: @base09;
+}
+#network {
+    color: @base0A;
+}
+#bluetooth {
     color: @base0B;
 }
+#clock.calendar {
+    color: @base0C;
+}
 #clock {
     color: @base0D;
 }
-#backlight,
-#battery {
-    color: @base05;
+#custom-separator {
+    color: @base0E;
 }
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 5b76322d..e2f5405a 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -26,6 +26,9 @@
       "modules-right" = [
         "custom/notification"
         "pulseaudio"
+        "network"
+        "bluetooth"
+        "clock#calendar"
         "clock"
         "custom/separator"
         "backlight"
@@ -122,9 +125,25 @@
         format = "{icon} {temperatureC}°C";
         format-icons = ["󱃃" "󰔏" "󱃂"];
       };
-      clock = {
-        format = "{:󰃭 %Y-%m-%d 󰥔 %R}";
-        format-alt = "{:󰥔 %R}";
+      network = {
+        format-icons = ["󰤟 " "󰤢 " "󰤥 " "󰤨 "];
+        format-wifi = "{icon}";
+        format-ethernet = "󰈁 ";
+        tooltip-format = "{essid} ({signalStrength}%)";
+        format-linked = "󰈂 ";
+        format-disconnected = "󰈂 ";
+      };
+      bluetooth = {
+        format = "󰂯 ";
+        format-disabled = "󰂲 ";
+        format-off = "󰂲 ";
+        format-on = "󰂯 ";
+        format-connected = "󰂱 ";
+        tooltip-format = "{status} | {device_alias}";
+        on-click = "${pkgs.blueman}/bin/blueman-manager";
+      };
+      "clock#calendar" = {
+        format = "{:󰃭 %Y-%m-%d}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
         calendar = {
           mode = "month";
@@ -146,6 +165,7 @@
           on-scroll-down = "shift_down";
         };
       };
+      clock = {format = "{:󰥔 %R}";};
       backlight = {
         format = "{icon} ";
         tooltip-format = "{percent}%";