diff --git a/machines/nucturne/default.nix b/machines/nucturne/default.nix
index 299bdad..73c1a2e 100644
--- a/machines/nucturne/default.nix
+++ b/machines/nucturne/default.nix
@@ -19,6 +19,8 @@
     # enable X11 with lightdm and i3
     graphical = {
       enable = true;
+      sway.enable = true;
+      i3.enable = false;
       # set dpi if used in mobile applications
 #      dpi = 180;
     };
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 2ee6d9d..ae7c1f5 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -57,6 +57,10 @@ with lib; {
         printing.enable = true;
       };
 
+      programs.nm-applet = {
+        enable = true;
+      };
+
       sound.enable = true;
 
       hardware = {
diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix
index 7ee9a11..a22dbdd 100644
--- a/users/ellmau/default.nix
+++ b/users/ellmau/default.nix
@@ -11,6 +11,7 @@
     ./zsh.nix
 
     ./sway.nix
+    ./waybar.nix
   ];
   services = {
     gnome-keyring = {
diff --git a/users/ellmau/sway.nix b/users/ellmau/sway.nix
index 075b8a8..34581a0 100644
--- a/users/ellmau/sway.nix
+++ b/users/ellmau/sway.nix
@@ -18,7 +18,7 @@
           "${modifier}+Shift+q" = "kill";
           "${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -show drun";
           "${modifier}+Tab" = "exec ${pkgs.rofi}/bin/rofi -show window";
-          "${modifier}+BackSpace" = "mode $mode_system";
+          "${modifier}+BackSpace" = ''mode "$mode_system"'';
         };
       keycodebindings =
         let
@@ -37,8 +37,11 @@
       window = {
         titlebar = true;
       };
+
+      bars = [];
     };
     extraConfig = ''
+      set $mode_system System (l) lock, (CTRL+e) logout, (CTRL+r) reboot, (CTRL+s) shutdown
       mode "$mode_system" {
         bindsym l exec --no-startup-id $i3lockwall, mode "default"
         bindsym Ctrl+e exec --no-startup-id swaymsg exit, mode "default"
diff --git a/users/ellmau/waybar.nix b/users/ellmau/waybar.nix
index 48de95d..cb507cc 100644
--- a/users/ellmau/waybar.nix
+++ b/users/ellmau/waybar.nix
@@ -2,11 +2,50 @@
 {
   programs.waybar = {
     enable = true;
+    systemd.enable = true;
     settings = {
       mainBar = {
         modules-left = [ "sway/workspaces" "sway/mode" ];
         modules-center = [ "sway/window" ];
-        modules-right = [ "sway/tray" ];
+        modules-right = [ "idle_inhibitor" "sway/language" "battery" "network#wg" "network" "clock" "tray" ];
+
+        idle_inhibitor = {
+          format = "{icon}";
+          format-icons = {
+            activated = "";
+            deactivated = "";
+          };
+          battery = {
+            states = {
+              good = 95;
+              warning = 30;
+              critical = 15;
+            };
+            format = "{capacity}% {icon}";
+            format-charging = "{capacity}% ";
+            format-plugged = "{capacity}% ";
+            format-alt = "{time} {icon}";
+            format-icons = [ "" "" "" "" "" ];
+          };
+          network = {
+            format-wifi = "{essid} ({signalStrength}%) ";
+            format-ethernet = "{ipaddr}/{cidr} ";
+            tooltip-format = "{ifname} via {gwaddr} ";
+            format-linked = "{ifname} (No IP) ";
+            format-disconnected = "Disconnected ⚠";
+            format-alt = "{ifname}: {ipaddr}/{cidr}";
+          };
+          
+          "network#wg" = {
+            interface = "wg-stelnet";
+            format-wifi = "{essid} ({signalStrength}%) ";
+            format-ethernet = "{ipaddr}/{cidr} ";
+            tooltip-format = "{ifname} via {gwaddr} ";
+            format-linked = "{ifname} (No IP) ";
+            format-disconnected = "Disconnected ⚠";
+            format-alt = "{ifname}: {ipaddr}/{cidr}";
+          };
+        };
       };
     };
   };