diff --git a/flake.lock b/flake.lock
index f4fd57d..9e76f9f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,11 +74,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1699826676,
-        "narHash": "sha256-L7816eSomVqG1lw07eTMBexHo6F5XxpSiSER+8GXGgU=",
+        "lastModified": 1700076060,
+        "narHash": "sha256-fisxBv+v62yXFpkGCv+qdE8P4hsUJfd+iQoYGgNhMZ4=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "23fea46815371a8e1a0fa340be34d80624cd9bcc",
+        "rev": "2040444da9eb3a9b2438bf98c0568ce06ec4c1e4",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699783872,
-        "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
+        "lastModified": 1700087144,
+        "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "280721186ab75a76537713ec310306f0eba3e407",
+        "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1699701045,
-        "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
+        "lastModified": 1699997707,
+        "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
         "owner": "NixOs",
         "repo": "nixos-hardware",
-        "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
+        "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+        "lastModified": 1699963925,
+        "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+        "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1699907094,
-        "narHash": "sha256-9Brl2FJ+xIBRk3CNYsFWzx4pvRYUuM5fSps+GVswTzE=",
+        "lastModified": 1700166954,
+        "narHash": "sha256-f9+JUFDUzwmM+em8wqWgHvgTO4qCCYtKPUZ+nlVIirA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "9693ccc6b8835a960224c57cb1eb2faceabeda14",
+        "rev": "04d24fb0e6258af7bbe51b29308e670de81a7d2f",
         "type": "github"
       },
       "original": {
diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index 5e7b78a..280f3e3 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -30,6 +30,7 @@
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
   nix.settings.auto-optimise-store = true;
+  nix.settings.trusted-users = [ "root" "tacocat" ];
 
   nix.gc = {
     automatic = true;
@@ -52,19 +53,27 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.geoclue2.enable = true;
+  services.tlp.enable = true;
 
   # Enable sound.
   sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  services.pipewire.audio.enable = true;
+  # hardware.pulseaudio.enable = true;
+  # services.pipewire.audio.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    audio.enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+  };
 
   xdg.portal = {
     enable = true;
-    wlr.enable = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-    ];
+    # wlr.enable = true;
+    # extraPortals = with pkgs; [
+      # xdg-desktop-portal-wlr
+      # xdg-desktop-portal-gtk
+    # ];
   };
 
   hardware.opengl = {
@@ -93,13 +102,14 @@
   ];
 
   programs.sway.enable = true;
+  programs.sway.wrapperFeatures.gtk = true;
   programs.sway.extraPackages = with pkgs; [
     swaylock
     swayidle
     brightnessctl
   ];
 
-  # programs.waybar.enable = true;
+  programs.waybar.enable = true;
   # programs.nm-applet.enable = true;
 
   environment = {
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/home.nix b/users/tacocat/home.nix
index cd2a744..2537296 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -14,6 +14,7 @@
     ];
     packages = with pkgs; [
       rnote
+      libreoffice
       texlive.combined.scheme-medium
       libsixel
       aspell
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 b/users/tacocat/wayland/sway/config
index 8a8e620..7de8c8f 100755
--- a/users/tacocat/wayland/sway/config
+++ b/users/tacocat/wayland/sway/config
@@ -1,6 +1,5 @@
 # Default config for sway
 
-include ~/.config/sway/config.d/*
 include /etc/sway/config.d/*
 
 #
@@ -66,7 +65,7 @@ bar swaybar_command waybar
 # Example configuration:
 #
 exec swayidle -w \
-         timeout 300 'swaylock -f -c D3869B' \
+         timeout 600 'swaylock -f -c 000000' \
          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
          before-sleep 'swaylock -f -c 000000'
 
@@ -279,3 +278,5 @@ bindsym $mod+r mode "resize"
 #    blur on
 
 # xwayland enable
+
+include ~/.config/sway/config.d/*
diff --git a/users/tacocat/wayland/sway/config.d/autostart b/users/tacocat/wayland/sway/config.d/autostart
index ef2e24b..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 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 = [