Merge pull request #174 from codepuncher/2024-06-10

2024 06 10
codepuncher · Jun 10, 2024 · 08549ad · 08549ad
2 parents c7e62cf + 40608eb
commit 08549ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/nvim/lua/plugins/configs/telescope.lua b/nvim/lua/plugins/configs/telescope.lua
@@ -5,7 +5,7 @@ end
 
 local actions = require('telescope.actions')
 local actions_state = require('telescope.actions.state')
-local trouble = require('trouble.providers.telescope')
+local trouble = require('trouble.sources.telescope')
 
 local M = {}
 
@@ -35,8 +35,8 @@ telescope.setup({
     },
     theme = 'dropdown',
     mappings = {
-      i = { ['<c-t>'] = trouble.open_with_trouble },
-      n = { ['<c-t>'] = trouble.open_with_trouble },
+      i = { ['<c-t>'] = trouble.open },
+      n = { ['<c-t>'] = trouble.open },
     },
   },
   pickers = {

diff --git a/shell/aliases b/shell/aliases
@@ -225,11 +225,17 @@ project_open() {
 
 	if [ -z "${1}" ]; then
 		NEW_PATH="${WP_PATH}"
+
+		tmux setw automatic-rename
 	else
-		NEW_PATH="${WP_PATH}/${1}/bedrock"
-		if [[ ! -d "${NEW_PATH}" ]]; then
-			NEW_PATH="${WP_PATH}/${1}"
+		NEW_PATH="${WP_PATH}/${1}"
+		if [[ -d "${NEW_PATH}/bedrock" ]]; then
+			NEW_PATH="${NEW_PATH}/bedrock"
+		elif [[ -d "${NEW_PATH}/site" ]]; then
+			NEW_PATH="${NEW_PATH}/site"
 		fi
+
+		tmux rename-window "${1}"
 	fi
 
 	if [ -z "${2}" ]; then