diff --git a/files/helix/.config/helix/config.toml b/files/helix/.config/helix/config.toml
index 0ab8f4c..faf3c19 100644
--- a/files/helix/.config/helix/config.toml
+++ b/files/helix/.config/helix/config.toml
@@ -4,29 +4,29 @@ theme = "everforest_light_modded"
 line-number = "relative"
 cursor-shape.insert = "bar"
 insert-final-newline = false
-rulers = [80, 100]
+# rulers = [80, 100]
 true-color = true
 
-# Minimum severity to show a diagnostic after the end of a line
-end-of-line-diagnostics = "hint"
-
 [editor.whitespace.render]
 tab = "all"
-space = "all"
+# space = "all"
 
 [editor.indent-guides]
 render = true
 
+[editor.soft-wrap]
+wrap-at-text-width = true
+
 [editor.lsp]
 display-inlay-hints = true
 
-[editor.inline-diagnostics]
-# Minimum severity to show a diagnostic on the primary cursor's line.
-cursor-line = "error"
-
 [keys.normal]
 "_" = ["extend_line_up", "extend_to_line_bounds"]
 "+" = ["extend_line_down", "extend_to_line_bounds"]
 
 [keys.normal.g]
 "b" = ":echo git show %sh{git blame -L %{cursor_line},+1 %{buffer_name} | awk '{print $1}'}"
+
+[keys.normal.z]
+s = ":set soft-wrap.enable true"
+S = ":set soft-wrap.enable false"
diff --git a/files/kitty/.config/kitty/kitty.conf b/files/kitty/.config/kitty/kitty.conf
index ff103e4..285f850 100644
--- a/files/kitty/.config/kitty/kitty.conf
+++ b/files/kitty/.config/kitty/kitty.conf
@@ -4,15 +4,16 @@
 
 #: kitty has very powerful font management. You can configure
 #: individual font faces and even specify special fonts for particular
-#: characters.
+#
 
-# kitty +list-fonts
-font_family       JetBrainsMono NFM
-bold_font         JetBrainsMono NFM Bold
-italic_font       JetBrainsMono NFM Italic
-bold_italic_font  JetBrainsMono NFM Bold Italic
+# BEGIN_KITTY_FONTS
+font_family      family='BlexMono Nerd Font Mono' style=Medium
+bold_font        family='BlexMono Nerd Font Mono' style='SemiBold'
+italic_font      family='BlexMono Nerd Font Mono' style='SemiBold Italic'
+bold_italic_font auto
+# END_KITTY_FONTS: characters.
 
-font_size 10
+font_size 11
 
 #: Font size (in pts)
 
@@ -900,7 +901,7 @@ confirm_os_window_close 0
 
 #: Tab bar {{{
 
-tab_bar_edge bottom
+tab_bar_edge top
 
 #: The edge to show the tab bar on, top or bottom.
 
diff --git a/files/shell/.shellrc.alias b/files/shell/.shellrc.alias
index f010d6c..e8bd19f 100644
--- a/files/shell/.shellrc.alias
+++ b/files/shell/.shellrc.alias
@@ -23,8 +23,8 @@ alias nupdate="nix-channel --update"
 
 # https://github.com/loqusion/typix
 alias typix="nix flake init --refresh -t github:loqusion/typix"
-alias twatch="nix run .#watch"
-alias tbuild="nix run .#build"
+alias twatch="typst watch"
+alias tbuild="tpst build"
 alias tlsp="nix-shell -p tinymist"
 
 alias nlatex="nix-shell -p texlive.combined.scheme-full"
@@ -38,7 +38,7 @@ alias ls='ls --color --hyperlink'
 alias nssh='SSH_AUTH_SOCK= ssh'
 alias o='xdg-open'  # to change a mime use: `xdg-mime default APPLICATION HANDLE`
 t() {
-    tmux new-session -A -s ${1:-dev}
+    tmux new-session -A -s ${1:-tmux}
 }
 
 # password hash (sed needed when using in docker-compose)
diff --git a/files/tmux/.tmux.conf b/files/tmux/.tmux.conf
index 4fab86a..d0b7a2a 100644
--- a/files/tmux/.tmux.conf
+++ b/files/tmux/.tmux.conf
@@ -51,6 +51,9 @@ bind-key -n 'M-!' select-layout even-horizontal
 bind-key -n 'M-@' select-layout even-vertical
 bind-key -n 'M-#' select-layout main-vertical
 
+# move windows
+bind-key -n M-. command-prompt -p "Swap window with:" "swap-window -t :'%%'"
+
 set -g main-pane-width 40%
 
 # resize panes
@@ -85,10 +88,11 @@ set-option -g set-titles-string "#H: #W"
 set -g pane-border-style fg="#e3ddcc"
 
 # Status
-set -g status-style "bg=default"
-set -g status-right "#[fg=yellow]#H @#S #[fg=blue]#{=100:pane_current_path} #[fg=red](#(cd #{pane_current_path}; git rev-parse --abbrev-ref HEAD)) #[fg=black]"
+set -g status-style bg=default
+set -g message-style bg=default
+set -g status-right "#[fg=yellow]#H(#S) #[fg=blue]#{=100:pane_current_path}#[fg=black]"
 set -g status-right-length 200
 set -g status-left ""
-setw -g window-status-format "#I:#W "
-setw -g window-status-current-format "#[fg=green]#I:#W*"
+set -g window-status-format "#I:#W "
+set -g window-status-current-format "#[underscore]#I:#W#[nounderscore] "