use intellij as git mergetool, update tmux theme

This commit is contained in:
Salar Rahmanian 2025-10-04 15:19:46 -07:00
parent 91aa2d907a
commit 57313eb0d8
4 changed files with 6 additions and 7 deletions

View file

@ -15,8 +15,8 @@ in
extraConfig = tmuxConfig;
plugins = with pkgs.tmuxPlugins; [
sensible
tokyo-night-tmux
yank
kanagawa
{
plugin = tokyo-night-tmux;
extraConfig = ''