diff --git a/home/sam/config/waybar/config.jsonc b/home/sam/config/waybar/config.jsonc
index 4ff14b7..5d46247 100644
--- a/home/sam/config/waybar/config.jsonc
+++ b/home/sam/config/waybar/config.jsonc
@@ -3,11 +3,41 @@
   "position": "top",
   "height": 32,
 
-  "modules-left": ["wlr/workspaces"],
-  "modules-center": ["clock"],
-  "modules-right": ["pulseaudio", "network", "tray"],
+  "modules-left": ["niri/workspaces"],
+  "modules-center": ["niri/window"],
+  "modules-right": [
+    "keyboard-state",
+    "cpu",
+    "memory",
+    "network",
+    "pulseaudio",
+    "tray",
+    "clock"
+  ],
 
   "clock": { "format": "{:%a %d %b %H:%M}" },
-  "pulseaudio": { "format": " {volume}%" },
-  "network": { "format-wifi": " {signalStrength}%", "format-ethernet": "󰈀", "format-disconnected": "󰖪" }
+
+  "cpu": { "format": " {usage}%" },
+  "memory": { "format": "󰍛 {percentage}%" },
+
+  "network": {
+    "format-wifi": " {signalStrength}%",
+    "format-ethernet": "󰈀",
+    "format-disconnected": "󰖪"
+  },
+
+  "pulseaudio": {
+    "format": " {volume}%",
+    "format-muted": "󰖁"
+  },
+
+  "keyboard-state": {
+    "numlock": true,
+    "capslock": true,
+    "format": "{name} {icon}",
+    "format-icons": {
+      "locked": "",
+      "unlocked": ""
+    }
+  }
 }