Add more paths

12 files changed, 33 insertions, 32 deletions

diff --git a/rc/connect.kak b/rc/connect.kak
index 71b4ca1..d9efaf6 100644
--- a/rc/connect.kak
+++ b/rc/connect.kak
@@ -1,5 +1,6 @@
-# Save the connect path
-declare-option -hidden str connect_path %sh(dirname "$kak_source")
+# Save the connect paths
+declare-option -hidden str connect_root_path %sh(dirname "$kak_source")
+declare-option -hidden str connect_modules_path "%opt{connect_root_path}/connect/modules"
 
 # Default modules
 hook global ModuleLoaded connect %{
@@ -42,10 +43,10 @@ provide-module connect %{
   set-option global connect_paths "%val{config}/connect/aliases" "%val{config}/connect/commands"
 
   # Require modules
-  define-command connect-require -params 1 -shell-script-candidates %(find "$kak_opt_connect_path/connect/modules" -type f -name '*.kak' -exec basename '{}' .kak ';') -docstring 'Require connect module' %{
+  define-command connect-require -params 1 -shell-script-candidates %(find "$kak_opt_connect_modules_path" -type f -name '*.kak' -exec basename '{}' .kak ';') -docstring 'Require connect module' %{
     # Handle “Already defined module”
     try %{
-      source "%opt{connect_path}/connect/modules/%arg{1}/%arg{1}.kak"
+      source "%opt{connect_modules_path}/%arg{1}/%arg{1}.kak"
     }
     require-module "connect-%arg{1}"
   }
@@ -54,16 +55,16 @@ provide-module connect %{
   define-command connect-terminal -params .. -shell-completion -docstring 'Open a new terminal' %{
     terminal sh -c %{
       kak_opt_prelude_path=$1
-      kak_opt_connect_path=$2
+      kak_opt_connect_root_path=$2
       kak_opt_connect_environment=$3
       kak_opt_connect_environment_paths=$4
       kak_session=$5
       kak_client=$6
 
-      . "$kak_opt_connect_path/connect/env/default.env"
-      . "$kak_opt_connect_path/connect/env/overrides.env"
-      . "$kak_opt_connect_path/connect/env/kakoune.env"
-      . "$kak_opt_connect_path/connect/env/git.env"
+      . "$kak_opt_connect_root_path/connect/env/default.env"
+      . "$kak_opt_connect_root_path/connect/env/overrides.env"
+      . "$kak_opt_connect_root_path/connect/env/kakoune.env"
+      . "$kak_opt_connect_root_path/connect/env/git.env"
 
       eval "$kak_opt_connect_environment"
 
@@ -72,7 +73,7 @@ provide-module connect %{
       [ "$1" ] && "$@" || "$SHELL"
     } -- \
       %opt{prelude_path} \
-      %opt{connect_path} \
+      %opt{connect_root_path} \
       %opt{connect_environment} \
       %opt{connect_environment_paths} \
       %val{session} \
@@ -83,16 +84,16 @@ provide-module connect %{
   define-command connect-shell -params 1.. -shell-completion -docstring 'Execute commands in a shell' %{
     nop %sh{
       # kak_opt_prelude_path
-      # kak_opt_connect_path
+      # kak_opt_connect_root_path
       # kak_opt_connect_environment
       # kak_opt_connect_environment_paths
       # kak_session
       # kak_client
 
-      . "$kak_opt_connect_path/connect/env/default.env"
-      . "$kak_opt_connect_path/connect/env/overrides.env"
-      . "$kak_opt_connect_path/connect/env/kakoune.env"
-      . "$kak_opt_connect_path/connect/env/git.env"
+      . "$kak_opt_connect_root_path/connect/env/default.env"
+      . "$kak_opt_connect_root_path/connect/env/overrides.env"
+      . "$kak_opt_connect_root_path/connect/env/kakoune.env"
+      . "$kak_opt_connect_root_path/connect/env/git.env"
 
       eval "$kak_opt_connect_environment"
 
@@ -105,16 +106,16 @@ provide-module connect %{
       rm connect.sh
 
       kak_opt_prelude_path=$1
-      kak_opt_connect_path=$2
+      kak_opt_connect_root_path=$2
       kak_opt_connect_environment=$3
       kak_opt_connect_environment_paths=$4
       kak_session=$5
       kak_server_working_directory=$6
 
-      . "$kak_opt_connect_path/connect/env/default.env"
-      . "$kak_opt_connect_path/connect/env/overrides.env"
-      . "$kak_opt_connect_path/connect/env/kakoune.env"
-      . "$kak_opt_connect_path/connect/env/git.env"
+      . "$kak_opt_connect_root_path/connect/env/default.env"
+      . "$kak_opt_connect_root_path/connect/env/overrides.env"
+      . "$kak_opt_connect_root_path/connect/env/kakoune.env"
+      . "$kak_opt_connect_root_path/connect/env/git.env"
 
       eval "$kak_opt_connect_environment"
 
@@ -125,7 +126,7 @@ provide-module connect %{
       [ "$1" ] && "$@" || "$SHELL"
     } -- \
       %opt{prelude_path} \
-      %opt{connect_path} \
+      %opt{connect_root_path} \
       %opt{connect_environment} \
       %opt{connect_environment_paths} \
       %val{session} \
diff --git a/rc/connect/env/overrides.env b/rc/connect/env/overrides.env
index 5c43fe1..59772ca 100644
--- a/rc/connect/env/overrides.env
+++ b/rc/connect/env/overrides.env
@@ -1,5 +1,5 @@
 # Connect paths
-paths=$kak_opt_connect_path/connect
+paths=$kak_opt_connect_root_path/connect
 PATH=$kak_opt_connect_environment_paths:$paths/aliases:$paths/commands:$PATH:$paths/tools
 
 VISUAL=:edit
diff --git a/rc/connect/modules/broot/broot.kak b/rc/connect/modules/broot/broot.kak
index 89ebb98..3ebbd6e 100644
--- a/rc/connect/modules/broot/broot.kak
+++ b/rc/connect/modules/broot/broot.kak
@@ -6,7 +6,7 @@ provide-module connect-broot %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/broot/aliases" "%opt{connect_path}/connect/modules/broot/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/broot/aliases" "%opt{connect_modules_path}/broot/commands"
 
   # Commands
   define-command broot -params .. -file-completion -docstring 'Open files with Broot' %{
diff --git a/rc/connect/modules/dmenu/dmenu.kak b/rc/connect/modules/dmenu/dmenu.kak
index ec0d654..17fdd8c 100644
--- a/rc/connect/modules/dmenu/dmenu.kak
+++ b/rc/connect/modules/dmenu/dmenu.kak
@@ -9,7 +9,7 @@ provide-module connect-dmenu %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/dmenu/aliases" "%opt{connect_path}/connect/modules/dmenu/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/dmenu/aliases" "%opt{connect_modules_path}/dmenu/commands"
 
   # Commands
   # Files
diff --git a/rc/connect/modules/dolphin/dolphin.kak b/rc/connect/modules/dolphin/dolphin.kak
index f5cda01..761ebbb 100644
--- a/rc/connect/modules/dolphin/dolphin.kak
+++ b/rc/connect/modules/dolphin/dolphin.kak
@@ -6,7 +6,7 @@ provide-module connect-dolphin %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/dolphin/aliases" "%opt{connect_path}/connect/modules/dolphin/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/dolphin/aliases" "%opt{connect_modules_path}/dolphin/commands"
 
   # Commands
   define-command dolphin -params .. -file-completion -docstring 'Open files with Dolphin' %{
diff --git a/rc/connect/modules/fifo/fifo.kak b/rc/connect/modules/fifo/fifo.kak
index 01b692b..3866337 100644
--- a/rc/connect/modules/fifo/fifo.kak
+++ b/rc/connect/modules/fifo/fifo.kak
@@ -3,7 +3,7 @@ provide-module connect-fifo %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/fifo/aliases" "%opt{connect_path}/connect/modules/fifo/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/fifo/aliases" "%opt{connect_modules_path}/fifo/commands"
 
   # Commands
   define-command fifo -params 1.. -shell-completion -docstring 'Run command in a fifo buffer' %{
diff --git a/rc/connect/modules/fzf/fzf.kak b/rc/connect/modules/fzf/fzf.kak
index 1e239a8..e874755 100644
--- a/rc/connect/modules/fzf/fzf.kak
+++ b/rc/connect/modules/fzf/fzf.kak
@@ -10,7 +10,7 @@ provide-module connect-fzf %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/fzf/aliases" "%opt{connect_path}/connect/modules/fzf/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/fzf/aliases" "%opt{connect_modules_path}/fzf/commands"
 
   # Commands
   # Files
diff --git a/rc/connect/modules/fzy/fzy.kak b/rc/connect/modules/fzy/fzy.kak
index fea7bcd..f30d272 100644
--- a/rc/connect/modules/fzy/fzy.kak
+++ b/rc/connect/modules/fzy/fzy.kak
@@ -9,7 +9,7 @@ provide-module connect-fzy %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/fzy/aliases" "%opt{connect_path}/connect/modules/fzy/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/fzy/aliases" "%opt{connect_modules_path}/fzy/commands"
 
   # Commands
   # Files
diff --git a/rc/connect/modules/lf/lf.kak b/rc/connect/modules/lf/lf.kak
index 132b1c9..6609f85 100644
--- a/rc/connect/modules/lf/lf.kak
+++ b/rc/connect/modules/lf/lf.kak
@@ -6,7 +6,7 @@ provide-module connect-lf %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/lf/aliases" "%opt{connect_path}/connect/modules/lf/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/lf/aliases" "%opt{connect_modules_path}/lf/commands"
 
   # Commands
   define-command lf -params .. -file-completion -docstring 'Open files with lf' %{
diff --git a/rc/connect/modules/nnn/nnn.kak b/rc/connect/modules/nnn/nnn.kak
index ec8a3b0..63929d5 100644
--- a/rc/connect/modules/nnn/nnn.kak
+++ b/rc/connect/modules/nnn/nnn.kak
@@ -6,7 +6,7 @@ provide-module connect-nnn %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/nnn/aliases" "%opt{connect_path}/connect/modules/nnn/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/nnn/aliases" "%opt{connect_modules_path}/nnn/commands"
 
   # Commands
   define-command nnn -params .. -file-completion -docstring 'Open files with nnn' %{
diff --git a/rc/connect/modules/rofi/rofi.kak b/rc/connect/modules/rofi/rofi.kak
index e3a0900..d53a5c8 100644
--- a/rc/connect/modules/rofi/rofi.kak
+++ b/rc/connect/modules/rofi/rofi.kak
@@ -9,7 +9,7 @@ provide-module connect-rofi %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/rofi/aliases" "%opt{connect_path}/connect/modules/rofi/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/rofi/aliases" "%opt{connect_modules_path}/rofi/commands"
 
   # Commands
   # Files
diff --git a/rc/connect/modules/wofi/wofi.kak b/rc/connect/modules/wofi/wofi.kak
index 84476e4..f774b50 100644
--- a/rc/connect/modules/wofi/wofi.kak
+++ b/rc/connect/modules/wofi/wofi.kak
@@ -9,7 +9,7 @@ provide-module connect-wofi %{
   require-module connect
 
   # Register our paths
-  set-option -add global connect_paths "%opt{connect_path}/connect/modules/wofi/aliases" "%opt{connect_path}/connect/modules/wofi/commands"
+  set-option -add global connect_paths "%opt{connect_modules_path}/wofi/aliases" "%opt{connect_modules_path}/wofi/commands"
 
   # Commands
   # Files