diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index d47e1b8..bd744c5 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -13,6 +13,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conform.nvim": { "branch": "master", "commit": "6dc1603ea408f476a57937bbeaf7f86520a21a98" },
   "dashboard-nvim": { "branch": "master", "commit": "a0a78099658c7d4be3714f657b18ca8285d5d106" },
+  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
   "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
   "flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
   "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
diff --git a/nvim/lua/plugins/diffview.lua b/nvim/lua/plugins/diffview.lua
new file mode 100644
index 0000000..e4a3402
--- /dev/null
+++ b/nvim/lua/plugins/diffview.lua
@@ -0,0 +1,3 @@
+return {
+	"sindrets/diffview.nvim",
+}
diff --git a/script/tmux-init.sh b/script/tmux-init.sh
new file mode 100755
index 0000000..616601b
--- /dev/null
+++ b/script/tmux-init.sh
@@ -0,0 +1,20 @@
+#/bin/bash
+
+echo 'Init tmux config'
+src=$HOME/.tmux.conf
+if [ -e $src ]; then
+  mv $src $src.bak
+fi
+ln -s $HOME/.dotfile/tmux/.tmux.conf $src
+
+
+echo 'Install tpm'
+if [ ! -e ~/.tmux/plugins/tpm ]; then
+  git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+fi
+
+echo 'Install tmux plugin by tpm'
+$HOME/.tmux/plugins/tpm/bin/install_plugins
+
+echo 'Reload tmux'
+tmux source ~/.tmux.conf
\ No newline at end of file
diff --git a/.tmux.conf b/tmux/.tmux.conf
similarity index 84%
rename from .tmux.conf
rename to tmux/.tmux.conf
index fb37b47..33ccc7a 100644
--- a/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -44,5 +44,11 @@ set-option -g set-titles on
 #set-option -g set-titles-string "#{session_name} - #{host}"
 set-option -g set-titles-string "#{session_name}"
 
-# tmux resurrect
-run-shell ~/.tmux/plugins/tmux-resurrect/resurrect.tmux
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'junegunn/fzf'
+set -g @plugin 'tmux-plugins/tmux-fzf'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
\ No newline at end of file