diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index 94e3154..280f3e3 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -53,6 +53,7 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.geoclue2.enable = true;
+  services.tlp.enable = true;
 
   # Enable sound.
   sound.enable = true;
@@ -61,6 +62,7 @@
 
   services.pipewire = {
     enable = true;
+    audio.enable = true;
     alsa.enable = true;
     pulse.enable = true;
   };
diff --git a/users/tacocat/helix/default.nix b/users/tacocat/helix/default.nix
index de92851..c90d03d 100644
--- a/users/tacocat/helix/default.nix
+++ b/users/tacocat/helix/default.nix
@@ -39,6 +39,11 @@
         scrolloff = 5;
         middle-click-paste = false;
         cursorline = true;
+        cursor-shape = {
+          insert = "bar";
+          normal = "block";
+          select = "block";
+        };
         auto-format = false;
         idle-timeout = 400;
         color-modes = true;
diff --git a/users/tacocat/shell/default.nix b/users/tacocat/shell/default.nix
index 3eeba85..810bf01 100644
--- a/users/tacocat/shell/default.nix
+++ b/users/tacocat/shell/default.nix
@@ -13,7 +13,6 @@
     settings = {
       add_newline = false;
       format = lib.concatStrings [
-        # "$line_break"
         "$shlvl"
         "$directory"
         "$git_branch"
@@ -23,6 +22,7 @@
         "$package"
         "$nix_shell"
         "$cmd_duration"
+        "$line_break"
         "$status"
         "$character"
       ];
diff --git a/users/tacocat/shell/fish.nix b/users/tacocat/shell/fish.nix
index 6050a16..1ad4b26 100644
--- a/users/tacocat/shell/fish.nix
+++ b/users/tacocat/shell/fish.nix
@@ -1,8 +1,22 @@
-{...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       set -g fish_greeting
+
+      fish_vi_key_bindings
+      set -g fish_cursor_insert line
     '';
+    plugins = [
+      {
+        name = "z";
+        src = pkgs.fetchFromGitHub {
+          owner = "jethrokuan";
+          repo = "z";
+          rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
+          sha256 = "+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
+        };
+      }
+    ];
   };
 }
diff --git a/users/tacocat/wayland/sway/config.d/autostart b/users/tacocat/wayland/sway/config.d/autostart
index ef75403..7ab84a8 100755
--- a/users/tacocat/wayland/sway/config.d/autostart
+++ b/users/tacocat/wayland/sway/config.d/autostart
@@ -1,5 +1,5 @@
 exec nm-applet
-# exec systemctl --user restart waybar
+exec systemctl --user restart wireplumber
 exec gammastep-indicator
 exec dunst
 #exec swayidle -w \
diff --git a/users/tacocat/wayland/waybar/default.nix b/users/tacocat/wayland/waybar/default.nix
index 0dd7995..792072c 100644
--- a/users/tacocat/wayland/waybar/default.nix
+++ b/users/tacocat/wayland/waybar/default.nix
@@ -9,7 +9,7 @@
         modules-left = [
           "sway/mode"
           "sway/workspaces"
-          "custom/arrow10"
+          # "custom/arrow10"
           "sway/window"
         ];
         modules-right = [