diff --git a/home/desktop/niri/default.nix b/home/desktop/niri/default.nix
index e116e99..8dca46d 100644
--- a/home/desktop/niri/default.nix
+++ b/home/desktop/niri/default.nix
@@ -10,6 +10,8 @@
     ../../workstation.nix
   ];
 
+  programs.waybar.settings.mainBar.modules-left = ["niri/workspaces" "niri/window"];
+
   programs.fuzzel = {
     enable = true;
     settings = {
@@ -44,6 +46,16 @@
       spawn-at-startup = [
         {command = [(lib.getExe pkgs.xwayland-satellite)];}
       ];
+      layout = {
+        preset-column-widths = [
+          {proportion = 1.0;}
+          {proportion = 1.0 / 2.0;}
+        ];
+      };
+      environment = {
+        NIXOS_OZONE_WL = "1";
+        DISPLAY = ":1";
+      };
       binds = with config.lib.niri.actions; {
         "Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)];
         "Mod+O".action.spawn = [(lib.getExe pkgs.cosmic-files)];
@@ -55,12 +67,14 @@
         "Mod+Ctrl+WheelScrollRight".action = move-column-right;
 
         "Mod+Right".action = focus-column-right;
+        "Mod+Ctrl+Right".action = move-column-right;
         "Mod+L".action = focus-column-right;
         "Mod+Ctrl+L".action = move-column-right;
 
         "Mod+WheelScrollLeft".action = focus-column-left;
         "Mod+Ctrl+WheelScrollLeft".action = move-column-left;
         "Mod+Left".action = focus-column-left;
+        "Mod+Ctrl+Left".action = move-column-left;
         "Mod+H".action = focus-column-left;
         "Mod+Ctrl+H".action = move-column-left;
 
@@ -70,16 +84,28 @@
         "Mod+Comma".action = consume-or-expel-window-left;
         "Mod+Period".action = consume-or-expel-window-right;
 
+        "Mod+F".action = fullscreen-window;
         "Mod+Q".action = close-window;
 
         "Mod+Shift+Escape".action = quit;
+        "Mod+Escape".action.spawn = lib.getExe config.programs.hyprlock.package;
 
         "Mod+WheelScrollDown".action = focus-workspace-down;
         "Mod+WheelScrollUp".action = focus-workspace-up;
         "Mod+Ctrl+WheelScrollDown".action = move-column-to-workspace-down;
         "Mod+Ctrl+WheelScrollUp".action = move-column-to-workspace-up;
 
-        "Mod+M".action = maximize-column;
+        "Mod+J".action = focus-workspace-down;
+        "Mod+K".action = focus-workspace-up;
+        "Mod+Ctrl+J".action = move-column-to-workspace-down;
+        "Mod+Ctrl+K".action = move-column-to-workspace-up;
+
+        "Mod+Down".action = focus-workspace-down;
+        "Mod+Up".action = focus-workspace-up;
+        "Mod+Ctrl+Down".action = move-column-to-workspace-down;
+        "Mod+Ctrl+Up".action = move-column-to-workspace-up;
+
+        "Mod+M".action = switch-preset-column-width;
         "Mod+G".action = toggle-window-floating;
 
         "Print".action = screenshot;
diff --git a/home/desktop/utils/waybar.nix b/home/desktop/utils/waybar.nix
index b0cae61..02d90cb 100644
--- a/home/desktop/utils/waybar.nix
+++ b/home/desktop/utils/waybar.nix
@@ -7,9 +7,24 @@
         layer = "bottom";
         position = "top";
         height = 36;
-        modules-right = ["mpris" "idle_inhibitor" "pulseaudio" "clock" "tray" "battery"];
+        modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "pulseaudio" "clock" "tray" "battery"];
+        "cpu" = {
+          "format" = "{icon}";
+          "format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
+        };
+        "power-profiles-daemon" = {
+          "format" = "{icon}";
+          "tooltip-format" = "Power profile: {profile}\nDriver: {driver}";
+          "tooltip" = true;
+          "format-icons" = {
+            "default" = "";
+            "performance" = "";
+            "balanced" = "";
+            "power-saver" = "";
+          };
+        };
         clock = {
-          format = "📅 {:%a %b-%d lib, %I:%M %p}";
+          format = "📅 {:%a %b-%d, %I:%M %p}";
         };
         idle_inhibitor = {
           format = "{icon}";
diff --git a/home/workstation.nix b/home/workstation.nix
index f4e68c0..2e9b0c2 100644
--- a/home/workstation.nix
+++ b/home/workstation.nix
@@ -28,6 +28,7 @@
     playerctl
     quickemu
     devenv
+    bottles
   ];
 
   services.udiskie = {