fix starship probs

plugins/extras/defaults.d/000-base.sh

@@ -25,10 +25,6 @@ export HISTIGNORE="[   ]*:&:bg:fg:exit:clear";   # Don't save these commands in
 export HISTORY_COMMAND="history -a; history -c; history -r;"; # flush each command to history immediately
 stty -ixon;
 
-# bindings
-bind '"\C-l"':redraw-current-line; # <Ctrl>-l
-bind '"\e\C-l"':clear-screen;      # <Escape>-<Ctrl>-l
-
 # see environ manfile - just setting up my shell environment
 export LESS='-iMR';      # Case insensite search, verbose prompting and raw output
 export PAGER=less;       # Used to display text / man files
@@ -39,19 +35,13 @@ export GIT_EDITOR=vim;
 export EDITOR=$GIT_EDITOR;
 export VISUAL=$EDITOR;
 
-# export DEFAULT_PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin;
-# export PATH=${DEFAULT_PATH}:${HOME}/.bin;
-
-if [[ -d "${HOME}/.dotnet" ]]; then
-	export DOTNET_CLI_TELEMETRY_OPTOUT=1;
-	export DOTNETPATH=~/.dotnet/;
-	export PATH=${DOTNETPATH}:${PATH};
-fi
-
 if [[ -d "${HOME}/.bin" ]]; then
 	PATH=${HOME}/.bin:${PATH};
 fi
 
+# bindings
+bind '"\C-l"':redraw-current-line; # <Ctrl>-l
+bind '"\e\C-l"':clear-screen;      # <Escape>-<Ctrl>-l
 
 # http://stackoverflow.com/questions/410616/increasing-the-maximum-number-of-tcp-ip-connections-in-linux
 # run these to increase concurrent connections in linux

plugins/ssh/ssh.sh

@@ -39,6 +39,7 @@ ssh_pubkey(){
   ssh-keygen -y -f $1;
 }
 
+# generate a new key
 ssh_newkey() {
 	local name=$1;
 	local comment=$2;

plugins/starship/defaults.d/starship.toml

@@ -1,21 +1,17 @@
-# Inserts a blank line between shell prompts
 add_newline = true
 
 scan_timeout = 50
 
 format = "$all"
 
-# Replace the "❯" symbol in the prompt with "➜"
-[character]                            # The name of the module we are configuring is "character"
-success_symbol = "[➜](bold green)"     # The "success_symbol" segment is being set to "➜" with the color "bold green"
+[character]
+success_symbol = "[➜](bold green)"
 
-
-# Disable the package module, hiding it from the prompt completely
 [package]
 disabled = true
 
 [kubernetes]
-format = 'on [⛵ ($user on )($cluster in )$context \($namespace\)](dimmed green) '
+format = '[⛵ $context](dimmed green) '
 disabled = false
 
 [git_metrics]

plugins/starship/starship.sh

@@ -1,6 +1,7 @@
 #!/bin/env bash
 
 STARSHIP_VERSION=${STARSHIP_VERSION:-"latest"};
+STARSHIP_CONFIG_DIR="${FILES_USER_CONFIG}/starship";
 
 if ! [[ -f "$(which starship 2>&1)" ]] && [[ -d "${HOME}/.asdf" ]]; then
     asdf plugin add starship;
@@ -9,11 +10,11 @@ if ! [[ -f "$(which starship 2>&1)" ]] && [[ -d "${HOME}/.asdf" ]]; then
 fi
 
 if [[ -f "$(which starship 2>&1)" ]]; then
-	export STARSHIP_CONFIG_DIR="${FILES_USER_CONFIG}/starship";
 	export STARSHIP_CACHE="${STARSHIP_CONFIG_DIR}/cache";
+	export STARSHIP_CONFIG="${STARSHIP_CONFIG_DIR}/starship.toml";
 
 	files_debug_log "[starship] installing default config";
-    [[ -f "${STARSHIP_CONFIG_DIR}/starship.toml" ]] || ln -sf  "${FILES_PLUGIN_ROOT}/defaults.d/starship.toml" ${STARSHIP_CONFIG_DIR};
+    [[ -f "${STARSHIP_CONFIG_DIR}/starship.toml" ]] || ln -sf  "${FILES_PLUGIN_ROOT}/defaults.d/starship.toml" ${STARSHIP_CONFIG};
 
 	starship_run() {
 		local shell=${1:-bash};

plugins/wezterm/defaults.d/wezterm.lua

@@ -33,34 +33,34 @@ config.window_background_opacity = 0.5;
 config.keys = {
     -- This will create a new split and run your default program inside it
     {
-        key="s",
+        key="i",
         mods="CTRL|SHIFT",
         action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}
     },
     {
-        key="i",
+        key="s",
         mods="CTRL|SHIFT",
         action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}
     },
     {
         key="j",
         mods="CTRL|SHIFT",
-        action=wezterm.action{AdjustPaneSize={"Down", 2}}
+        action=wezterm.action{AdjustPaneSize={"Down", 4}}
     },
     {
         key="k",
-        mods="CTRL|SHIFT",
-        action=wezterm.action{AdjustPaneSize={"Up", 2}}
+        mods="CTRL|ALT",
+        action=wezterm.action{AdjustPaneSize={"Up", 4}}
     },
     {
         key="h",
-        mods="CTRL|SHIFT",
-        action=wezterm.action{AdjustPaneSize={"Left", 2}}
+        mods="CTRL|ALT",
+        action=wezterm.action{AdjustPaneSize={"Left", 4}}
     },
     {
         key="l",
-        mods="CTRL|SHIFT",
-        action=wezterm.action{AdjustPaneSize={"Right", 2}}
+        mods="CTRL|ALT",
+        action=wezterm.action{AdjustPaneSize={"Right", 4}}
     },
     {
         key="h",
@@ -85,7 +85,12 @@ config.keys = {
     {
         key="w",
         mods="CTRL",
-        action=wezterm.action{CloseCurrentTab={confirm=false}}
+        action=wezterm.action{CloseCurrentPane={confirm=false}}
+    },
+    {
+        key="w",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{CloseCurrentTab={confirm=true}}
     }
 };