diff --git a/nix/user/dev.nix b/nix/user/dev.nix
index 70bac64..384df76 100644
--- a/nix/user/dev.nix
+++ b/nix/user/dev.nix
@@ -7,7 +7,7 @@
     nix-direnv.enable = true;
   };
 
-  # home.packages = with pkgs; [
-  #   harlequin
-  # ];
+  home.packages = with pkgs; [
+    visidata
+  ];
 }
diff --git a/nix/user/git.nix b/nix/user/git.nix
index 366588f..ff59b05 100644
--- a/nix/user/git.nix
+++ b/nix/user/git.nix
@@ -61,4 +61,19 @@
       ".envrc"
     ];
   };
+
+  programs.lazygit = {
+    enable = true;
+    settings = {
+      theme.lightTheme = "true";
+      git = {
+        log = {
+          format = "%C(yellow)%h%Creset %C(bold blue)<%an>%Creset %s %Cgreen(%cr)%Creset";
+          graph = "true";
+        };
+      };
+    };
+  };
+
+  programs.jujutsu.enable = true;
 }
diff --git a/nix/user/nvim.nix b/nix/user/nvim.nix
index 7cab6ee..d54a704 100644
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -57,6 +57,7 @@
       img-clip-nvim
       markdown-preview-nvim
       vim-markdown
+      plantuml-syntax
       bullets-vim
       obsidian-nvim
       nvim-dap
diff --git a/nix/user/sh.nix b/nix/user/sh.nix
index 080a9c6..61b2265 100644
--- a/nix/user/sh.nix
+++ b/nix/user/sh.nix
@@ -74,7 +74,8 @@
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
   programs.btop.enable = true;
-
+  programs.ranger.enable = true;
+ 
   home.packages = with pkgs; [
     fd
     du-dust
diff --git a/nix/user/tmux.nix b/nix/user/tmux.nix
index 4d416fd..5680f6f 100644
--- a/nix/user/tmux.nix
+++ b/nix/user/tmux.nix
@@ -25,6 +25,8 @@
       bind % split-window -h -c "#{pane_current_path}"
       bind c new-window -a -c "#{pane_current_path}"
 
+      bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
+
       #######################################
       # status line
       #######################################
diff --git a/nvim/base.lua b/nvim/base.lua
index b952b79..babed6d 100644
--- a/nvim/base.lua
+++ b/nvim/base.lua
@@ -26,7 +26,8 @@ vim.opt.smartcase = true
 vim.opt.hidden = true
 vim.opt.splitright = true
 vim.opt.splitbelow = true
-vim.opt.swapfile = false
+vim.opt.swapfile = true
+vim.opt.directory= '~/.cache/nvim/swap//,$TEMP//,/tmp//'
 vim.opt.wildmode = 'longest,list'
 vim.opt.wildignore = vim.opt.wildignore + 'main,*.o,*.d,*.aux,*.bbl,*.lof,*.loa,*.blg,*.fdb_latexmk,*.fls,*.tdo,*.pdf,*.pyc'
 vim.opt.spell = false
diff --git a/nvim/keymaps.lua b/nvim/keymaps.lua
index deb0786..bcf6154 100644
--- a/nvim/keymaps.lua
+++ b/nvim/keymaps.lua
@@ -19,6 +19,14 @@ vim.keymap.set('t', '<C-M-j>', '<C-\\><C-n><C-w>j', {})
 vim.keymap.set('t', '<C-M-k>', '<C-\\><C-n><C-w>k', {})
 vim.keymap.set('t', '<C-M-l>', '<C-\\><C-n><C-w>l', {})
 vim.keymap.set('n', '<leader>zm', '<C-W>_<C-W>|', { noremap = true, silent = true })
+vim.keymap.set('n', '<C-M-Y>', '<C-w>5<', {})
+vim.keymap.set('n', '<C-M-U>', '<C-w>5+', {})
+vim.keymap.set('n', '<C-M-I>', '<C-w>5-', {})
+vim.keymap.set('n', '<C-M-O>', '<C-w>5>', {})
+vim.keymap.set('t', '<C-M-Y>', '<C-\\><C-n><C-w>5<', {})
+vim.keymap.set('t', '<C-M-U>', '<C-\\><C-n><C-w>5+', {})
+vim.keymap.set('t', '<C-M-I>', '<C-\\><C-n><C-w>5-', {})
+vim.keymap.set('t', '<C-M-O>', '<C-\\><C-n><C-w>5>', {})
 
 
 vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
diff --git a/nvim/plugins.lua b/nvim/plugins.lua
index c9de307..24e944c 100644
--- a/nvim/plugins.lua
+++ b/nvim/plugins.lua
@@ -284,6 +284,7 @@ require("obsidian").setup({
       ["x"] = { char = "", hl_group = "ObsidianDone" },
       ["~"] = { char = "󰰱", hl_group = "ObsidianTilde" },
       ["!"] = { char = "", hl_group = "ObsidianImportant" },
+      ["?"] = { char = "?", hl_group = "ObsidianImportant" },
     },
   },
 })