From 71ccafd5657459d0c0da3e65a00a78d2753ab575 Mon Sep 17 00:00:00 2001
From: DeveloperDurp <DeveloperDurp@durp.info>
Date: Sat, 20 Jul 2024 17:01:22 -0500
Subject: [PATCH] update

---
 .config/kanshi/config | 11 ++++++---
 .ideavimrc            | 55 +++++++++++++++++++++++++++++++++++++++----
 .zshrc                | 14 +++++++----
 3 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/.config/kanshi/config b/.config/kanshi/config
index 1adf28d..767a04f 100644
--- a/.config/kanshi/config
+++ b/.config/kanshi/config
@@ -1,13 +1,12 @@
 profile {
-  output DP-6 enable position 3440,1440
   output DP-7 enable position 0,1440
   output DP-5 enable position 0,0
   output eDP-1 disable
 }
 
 profile {
-  output DP-7 enable position 0,1440
-  output DP-5 enable position 0,0
+  output DP-2 enable position 0,1440
+  output DP-8 enable position 0,0
   output eDP-1 disable
 }
 
@@ -35,6 +34,12 @@ profile {
   output eDP-1 disable
 }
 
+profile {
+  output DP-2 enable position 0,1440
+  output DP-6 enable position 0,0
+  output eDP-1 disable
+}
+
 profile {
   output eDP-1 enable position 0,0
 }
diff --git a/.ideavimrc b/.ideavimrc
index 17777b7..27ba5ec 100644
--- a/.ideavimrc
+++ b/.ideavimrc
@@ -10,6 +10,7 @@ set visualbell
 set ignorecase
 set smartcase
 set notimeout
+set clipboard+=unnamed
 
 " 3rd party
 set which-key
@@ -50,7 +51,11 @@ noremap <C-l> <C-w>l
 noremap <C-k> <C-w>k
 noremap <C-j> <C-w>j
 
-" File Navigation
+" Navigation
+let g:WhichKeyDesc_GoToFile = "<leader>ff Go to file"
+let g:WhichKeyDesc_RecentFiles = "<leader><leader> Recent files"
+let g:WhichKeyDesc_RecentLocations = "<leader>fl Recent locations"
+let g:WhichKeyDesc_NewScratchFile = "<leader>fs New scratch file"
 map <leader>ff <action>(GoToFile)
 map <leader><leader> <action>(RecentFiles)
 map <leader>fl <action>(RecentLocations)
@@ -61,6 +66,11 @@ nnoremap <C-d> <C-d>zz
 nnoremap <C-u> <C-u>zz
 
 " Window Management
+let g:WhichKeyDesc_WindowManagement = "<leader>% Window management"
+let g:WhichKeyDesc_SplitVertically = "<leader>% Split vertically"
+let g:WhichKeyDesc_SplitHorizontally = "<leader>\" Split horizontally"
+let g:WhichKeyDesc_CloseContent = "<leader>x Close content"
+let g:WhichKeyDesc_MoveEditorToOppositeTabGroup = "<leader>wm Move editor to opposite tab group"
 map <leader>% <action>(SplitVertically)
 map <leader>" <action>(SplitHorizontally)
 map <leader>x <action>(CloseContent)
@@ -71,14 +81,26 @@ inoremap <C-j> <Action>(PopupMenu-selectNext)
 inoremap <C-k> <Action>(PopupMenu-selectPrev)
 
 " Debug options
+let g:WhichKeyDesc_DebugOptions = "<leader>dd Debug options"
+let g:WhichKeyDesc_ToggleLineBreakpoint = "<leader>db Toggle line breakpoint"
 map <leader>dd <action>(Debug)
 map <leader>db <action>(ToggleLineBreakpoint)
 
 " Actions
+let g:WhichKeyDesc_Actions = "<leader>a Actions"
+let g:WhichKeyDesc_ShowIntentionActions = "<leader>am Show intention actions"
+let g:WhichKeyDesc_SearchEverywhere = "<leader>as Search everywhere"
 map <leader>am <action>(ShowIntentionActions)
 map <leader>as <action>(SearchEverywhere)
 
 " Refactoring
+let g:WhichKeyDesc_Refactoring = "<leader>r Refactoring"
+let g:WhichKeyDesc_RenameElement = "<leader>rn Rename element"
+let g:WhichKeyDesc_ExtractMethod = "<leader>re Extract method"
+let g:WhichKeyDesc_IntroduceVariable = "<leader>rv Introduce variable"
+let g:WhichKeyDesc_IntroduceField = "<leader>rf Introduce field"
+let g:WhichKeyDesc_ChangeSignature = "<leader>rs Change signature"
+let g:WhichKeyDesc_QuickListPopupAction = "<leader>rr Quick list popup action"
 map <leader>rn <action>(RenameElement)
 map <leader>re <action>(ExtractMethod)
 map <leader>rv <action>(IntroduceVariable)
@@ -87,22 +109,45 @@ map <leader>rs <action>(ChangeSignature)
 map <leader>rr <action>(Refactorings.QuickListPopupAction)
 
 " Go To Code
+let g:WhichKeyDesc_GoToCode = "<leader>g Go to code"
+let g:WhichKeyDesc_GoToDeclaration = "<leader>gd Go to declaration"
+let g:WhichKeyDesc_GotoTypeDeclaration = "<leader>gy Goto type declaration"
+let g:WhichKeyDesc_GotoImplementation = "<leader>gi Goto implementation"
+let g:WhichKeyDesc_ShowUsages = "<leader>gu Show usages"
+let g:WhichKeyDesc_GotoTest = "<leader>gt Goto test"
+let g:WhichKeyDesc_Back = "<leader>gb Back"
+let g:WhichKeyDesc_Forward = "<leader>gf Forward"
 map <leader>gd <action>(GoToDeclaration)
 map <leader>gy <action>(GotoTypeDeclaraton)
 map <leader>gi <action>(GotoImplementation)
 map <leader>gu <action>(ShowUsages)
 map <leader>gt <action>(GotoTest)
-map <leader>gf <action>(Back)
-map <leader>gb <action>(Forward)
+map <leader>gb <action>(Back)
+map <leader>gf <action>(Forward)
 
 " Go Tag
+let g:WhichKeyDesc_GoTag = "<leader>gt Go tag"
+let g:WhichKeyDesc_GoTag_AddKey = "<leader>gt Add Tag"
 map <leader>gt :action IntentionActionAsAction_com.goide.inspections.tag.GoTagAddKeyIntention<CR>
 
 " Errors
+let g:WhichKeyDesc_Errors = "<leader>e Errors"
+let g:WhichKeyDesc_NextError = "<leader>en Next error in solution"
+let g:WhichKeyDesc_PrevError = "<leader>ep Previous error in solution"
 map <leader>en <action>(ReSharperGotoNextErrorInSolution)
 map <leader>ep <action>(ReSharperGotoPrevErrorInSolution)
 
 " Menu
+let g:WhichKeyDesc_Menu = "<leader>m Menu"
+let g:WhichKeyDesc_Menu_Main = "<leader>mm Main menu"
+let g:WhichKeyDesc_AnalyzeMenu = "<leader>ma Analyze Menu"
+let g:WhichKeyDesc_BuildMenu = "<leader>mb Build Menu"
+let g:WhichKeyDesc_CodeMenu = "<leader>mc Code menu"
+let g:WhichKeyDesc_FindMenuGroup = "<leader>mf Find menu group"
+let g:WhichKeyDesc_GoToMenu = "<leader>mg Go to menu"
+let g:WhichKeyDesc_ScopeViewPopupMenu = "<leader>ms Scope view popup menu"
+let g:WhichKeyDesc_EditorTabPopupMenu = "<leader>mt Editor tab popup menu"
+let g:WhichKeyDesc_ToolWindowsGroup = "<leader>mw Tool windows group"
 map <leader>mm <action>(MainMenu)
 map <leader>ma <action>(AnalyzeMenu)
 map <leader>mb <action>(BuildMenu)
@@ -113,5 +158,5 @@ map <leader>ms <action>(ScopeViewPopupMenu)
 map <leader>mt <action>(EditorTabPopupMenu)
 map <leader>mw <action>(ToolWindowsGroup)
 
-" Unit Tests
-map <leader>tr <action>(RunClass)
\ No newline at end of file
+" Run
+map <leader>rc <action>(RunClass)
diff --git a/.zshrc b/.zshrc
index 502aa5f..02e5297 100644
--- a/.zshrc
+++ b/.zshrc
@@ -36,7 +36,7 @@ eval "$(oh-my-posh init zsh --config ~/.config/ohmyposh/config.toml)"
 
 if command -v tmux &> /dev/null && [[ "$TERMINAL_EMULATOR" == "JetBrains-JediTerm" ]]  && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
     cwd=$(pwd)
-    session_name="$JetBrainsEditor-$(basename "$cwd" | tr -d '.')"
+    session_name="JediTerm-$(basename "$cwd" | tr -d '.')"
 
     if tmux has-session -t $session_name; then
         tmux attach -t $session_name
@@ -45,9 +45,15 @@ if command -v tmux &> /dev/null && [[ "$TERMINAL_EMULATOR" == "JetBrains-JediTer
     fi
 fi
 
-#if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
-#  exec tmux attach
-#fi
+if command -v tmux &> /dev/null && [[ ! "$TERMINAL_EMULATOR" == "JetBrains-JediTerm" ]]  && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
+    session_name="general"
+
+    if tmux has-session -t $session_name; then
+        tmux attach -t $session_name
+    else
+        tmux new -s $session_name
+    fi
+fi
 
 if [[ -f "/opt/homebrew/bin/brew" ]] then
   # If you're using macOS, you'll want this enabled