From 941e3031d72a262cf460a0f3c974b475a177ce4e Mon Sep 17 00:00:00 2001
From: DeveloperDurp <DeveloperDurp@durp.info>
Date: Sun, 14 Jul 2024 17:38:22 -0500
Subject: [PATCH] update

---
 .ideavimrc | 28 +++++++++++++++-------------
 .zshrc     | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/.ideavimrc b/.ideavimrc
index 0781ddd..3c0f69d 100644
--- a/.ideavimrc
+++ b/.ideavimrc
@@ -24,14 +24,13 @@ let g:WhichKey_PrefixColor = "#f335b2"
 let g:WhichKey_SortOrder = "by_key_prefix_first"
 
 " NerdTree
-plug 'preservim/nerdtree'
-set NerdTree
-nnoremap <C-n> :NerdTree<CR>
+Plug 'preservim/nerdtree'
+nnoremap <C-n> :NERDTree<CR>
 
-let g:NerdTreeWinSize = 30
-let g:NerdTreeMapPreview = 0
-let g:NerdTreeActivateNode = 'l'
-let g:NERDTreeMapJumpParent = 'h'
+let g:NERDTreeWinSize=30
+let g:NERDTreeMapPreview=0
+let g:NERDTreeMapActivateNode='l'
+let g:NERDTreeMapJumpParent='h'
 
 let mapleader=' '
 
@@ -64,6 +63,7 @@ nnoremap <C-u> <C-u>zz
 map <leader>% <action>(SplitVertically)
 map <leader>" <action>(SplitHorizontally)
 map <leader>x <action>(CloseContent)
+map <leader>wm <action>(MoveEditorToOppositeTabGroup)
 
 " Popup Navigation
 inoremap <C-j> <Action>(PopupMenu-selectNext)
@@ -103,9 +103,11 @@ map <leader>ep <action>(ReSharperGotoPrevErrorInSolution)
 
 " Menu
 map <leader>mm <action>(MainMenu)
-map <leader>my <action>(GotoTypeDeclaraton)
-map <leader>mi <action>(GotoImplementation)
-map <leader>mu <action>(ShowUsages)
-map <leader>mt <action>(GotoTest)
-map <leader>mf <action>(Back)
-map <leader>mb <action>(Forward)
+map <leader>ma <action>(AnalyzeMenu)
+map <leader>mb <action>(BuildMenu)
+map <leader>mc <action>(CodeMenu)
+map <leader>mf <action>(FindMenuGroup)
+map <leader>mg <action>(GoToMenu)
+map <leader>ms <action>(ScopeViewPopupMenu)
+map <leader>mt <action>(EditorTabPopupMenu)
+map <leader>mw <action>(ToolWindowsGroup)
diff --git a/.zshrc b/.zshrc
index 8efa725..1f5e508 100644
--- a/.zshrc
+++ b/.zshrc
@@ -23,6 +23,7 @@ alias pwsh='pwsh -NoLogo'
 alias pbpaste='xclip -selection clipboard -o'
 alias ls='eza'
 alias ll='eza -l'
+alias lg='lazygit'
 alias tree='eza -T'
 alias cat='bat -P'
 alias network='nmtui'
@@ -33,10 +34,21 @@ alias connectvpn='sudo openvpn ~/Documents/openvpn/openvpn.ovpn'
 
 eval "$(oh-my-posh init zsh --config ~/.config/ohmyposh/config.toml)"
 
-if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
-  exec tmux attach
+if command -v tmux &> /dev/null && [[ "$TERMINAL_EMULATOR" == "JetBrains-JediTerm" ]]  && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
+    cwd=$(pwd)
+    session_name="goland-$(basename "$cwd" | tr -d '.')"
+
+    if tmux has-session -t $session_name; then
+        tmux attach -t $session_name
+    else
+        tmux new -s $session_name
+    fi
 fi
 
+#if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
+#  exec tmux attach
+#fi
+
 if [[ -f "/opt/homebrew/bin/brew" ]] then
   # If you're using macOS, you'll want this enabled
   eval "$(/opt/homebrew/bin/brew shellenv)"