diff --git a/dotfiles/tmux/tmux.conf b/dotfiles/tmux/tmux.conf
index f4222ac..202f183 100644
--- a/dotfiles/tmux/tmux.conf
+++ b/dotfiles/tmux/tmux.conf
@@ -3,7 +3,6 @@ set-option -g default-terminal 'screen-254color'
 set-option -g terminal-overrides ',xterm-256color:RGB'
 
 set -g prefix ^A
-set -g base-index 1              # start indexing windows at 1 instead of 0
 set -g detach-on-destroy off     # don't exit from tmux when closing a session
 set -g escape-time 0             # zero-out escape time delay
 set -g history-limit 1000000     # increase history size (from 2,000)
@@ -11,15 +10,50 @@ set -g renumber-windows on       # renumber all windows when any window is close
 set -g set-clipboard on          # use system clipboard
 set -g status-position top       # macOS / darwin style
 set -g default-terminal "${TERM}"
-setw -g mode-keys vi
 set -g pane-active-border-style 'fg=magenta,bg=default'
 set -g pane-border-style 'fg=brightblack,bg=default'
-
+set -g mouse on
 #bind-key -r B run-shell "~/.config/tmux/scripts/sessionizer.sh ~/omerxx/omerxx.com"
 
 set -g @fzf-url-fzf-options '-p 60%,30% --prompt="   " --border-label=" Open URL "'
 set -g @fzf-url-history-limit '2000'
 
+# Vim style pane selection
+bind h select-pane -L
+bind j select-pane -D 
+bind k select-pane -U
+bind l select-pane -R
+
+# Start windows and panes at 1, not 0
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# Use Alt-arrow keys without prefix key to switch panes
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+# Shift arrow to switch windows
+bind -n S-Left  previous-window
+bind -n S-Right next-window
+
+# Shift Alt vim keys to switch windows
+bind -n M-H previous-window
+bind -n M-L next-window
+
+# set vi-mode
+set-window-option -g mode-keys vi
+# keybindings
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
+bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
+
+bind '"' split-window -v -c "#{pane_current_path}"
+bind % split-window -h -c "#{pane_current_path}"
+
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-yank'
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 2e048c7..2c2481d 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -82,28 +82,13 @@ in
     ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
     ssh.startAgent = true;
     steam.enable = true;
-    # sway = {
-    #   enable = true;
-    #   wrapperFeatures.gtk = true; # so that gtk works properly
-    #   extraPackages = with pkgs; [
-    #     swaylock
-    #     swayidle
-    #     wl-clipboard
-    #     wf-recorder
-    #     mako # notification daemon
-    #     grim
-    #     slurp
-    #     alacritty # Alacritty is the default terminal in the config
-    #     dmenu # Dmenu is the default in the config but i recommend wofi since its wayland native
-    #   ];
-    #   extraSessionCommands = ''
-    #     export SDL_VIDEODRIVER=wayland
-    #     export QT_QPA_PLATFORM=wayland
-    #     export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
-    #     export _JAVA_AWT_WM_NONREPARENTING=1
-    #     export MOZ_ENABLE_WAYLAND=1
-    #   '';
-    # };
+    
+    nix-ld.enable = true;
+    # Sets up all the libraries to load
+    nix-ld.libraries = with pkgs; [
+        stdenv.cc.cc
+        zlib
+    ];
   };
 
   # Allow unfree packages
@@ -122,7 +107,6 @@ in
   environment.plasma5.excludePackages = with pkgs.libsForQt5; [
     baloo
     elisa
-    gwenview
     khelpcenter
     oxygen
     plasma-browser-integration
diff --git a/modules/local-dev.nix b/modules/local-dev.nix
index 85b632e..1ff99c2 100644
--- a/modules/local-dev.nix
+++ b/modules/local-dev.nix
@@ -15,7 +15,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    #bun
+    bun
     clang
     docker-compose
     gcc