fish shell configuration

conf/fish/lws.fish

@@ -0,0 +1,6 @@
+# ~/.config/fish/config.fish
+# ~/.config/fish/conf.d/
+
+# cp $LWS/conf/fish/lws.fish $HOME/.config/fish/conf.d/
+
+set -U fish_prompt_pwd_dir_length 0

conf/wsl.conf

@@ -1,21 +0,0 @@
-# https://learn.microsoft.com/en-us/windows/wsl/wsl-config
-
-[boot]
-systemd=false
-
-[user]
-default=lachtan
-
-[automount]
-enabled = true
-
-[network]
-generateHosts = true
-generateResolvConf = false
-
-[interop]
-enabled = false
-appendWindowsPath = false
-
-[gpu]
-enabled = true

fishrc

@@ -1,11 +0,0 @@
-# ~/.config/fish/config.fish
-# echo "source $LWS/fishrc" > $__fish_config_dir/conf.d/lws.fish
-
-# $__fish_config_dir/conf.d (by default, ~/.config/fish/conf.d/)
-# $__fish_sysconf_dir/conf.d (by default, /etc/fish/conf.d/)
-
-set -gx PAGER less
-set -g fish_prompt_pwd_dir_length 0
-
-# set -g fish_autosuggestion_enabled 0
-# fish_config theme choose "fish default"

functions.sh

@@ -134,7 +134,3 @@ function true_false() {
   # [[ "${1,,}" =~ ^(1|true|yes)$ ]]
   [[ "${1@L}" =~ ^(1|true|yes)$ ]]
 }
-
-function is_wsl() {
-  grep -q -i wsl /proc/version
-}

install.sh

@@ -2,29 +2,11 @@
 
 set -E -o errexit -o nounset -o pipefail
 
-function install_lws() {
-  local LWS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
-
-  if grep -q -e "source.*$LWS_DIR/bashrc" $HOME/.bashrc; then
-    echo "SKIP: Linux Workspace configuration already exists in $HOME/.bashrc !"
-  else
-    echo "Adding to $HOME/.bashrc"
-    echo "source '$LWS_DIR/bashrc'" >> "$HOME/.bashrc"
-  fi
-
-  local FISH_CONF_DIR="$HOME/.config/fish"
-  local FISH_CONF_LWS="$FISH_CONF_DIR/conf.d/lws.fish"
-
-  if [[ -d "$FISH_CONF_DIR" ]]; then
-    if [[ -f "$FISH_CONF_LWS" ]]; then
-      echo "SKIP: Linux Workspace configuration already exists in $FISH_CONF_LWS !"
-    else
-      echo "Adding to $FISH_CONF_LWS"
-      echo "source $LWS_DIR/fishrc" > "$FISH_CONF_LWS"
-    fi
-  else
-    echo "Fish configuration directory not found, skipping fish setup."
-  fi
-}
-
-install_lws
+if grep -q -e 'source\s+.*/linux-workspace/bashrc\s*$' $HOME/.bashrc; then
+  echo "Linux Workspace configuration already exists in .bashrc !"
+  exit 1
+else
+  readonly SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
+  echo "Adding to $HOME/.bashrc"
+  echo "source '$SCRIPT_DIR/bashrc'" >> "$HOME/.bashrc"
+fi

rc/01-path.sh

@@ -1,2 +1 @@
 prepend_path_try "$HOME/.local/bin"
-prepend_path_try "$HOME/bin"

rc/cargo.sh

@@ -1 +1,3 @@
-source_try "$HOME/.cargo/env"
+if [[ -f "$HOME/.cargo/env" ]]; then
+  source "$HOME/.cargo/env"
+fi

rc/nvm.sh

@@ -1,8 +0,0 @@
-NVM_DIR="$HOME/.nvm"
-if [ -d "$NVM_DIR" ]; then
-  export NVM_DIR
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-else
-  unset NVM_DIR
-fi

rc/ssh-agent.sh

@@ -1,51 +1,9 @@
 # Start ssh agent for private key
 
-function _log() {
-  xlog "[ssh-agent] $*"
-}
-
-_SSH_AGENT_NO_KEYS=1
-_SSH_AGENT_NOT_RUNNING=2
-
 for key in id_ecdsa id_rsa; do
   key_filename="$HOME/.ssh/$key"
-
-  if [ -f "$key_filename" ]; then
-    _log "SSH key: $key_filename"
-
-    if is_wsl; then
-      _log "WSL ON"
-
-      if [ -z "$SSH_AUTH_SOCK" ]; then
-        export SSH_AUTH_SOCK=$HOME/.ssh/ssh-agent.sock
-      fi
-
-      _log "SSH_AUTH_SOCK: $SSH_AUTH_SOCK"
-
-      ssh-add -L &> /dev/null
-      ssh_add_status=$?
-
-      if [[ -S "$SSH_AUTH_SOCK" && $ssh_add_status -eq $_SSH_AGENT_NOT_RUNNING ]]; then
-        _log "SSH agent does not running, delete $SSH_AUTH_SOCK"
-        rm -f "$SSH_AUTH_SOCK"
-      fi
-
-      if [[ ! -S "$SSH_AUTH_SOCK" || $ssh_add_status -eq $_SSH_AGENT_NOT_RUNNING ]]; then
-        _log "Starting ssh-agent"
-        eval "$(ssh-agent -s -a "$SSH_AUTH_SOCK")"
-      fi
-
-      ssh-add -L &> /dev/null
-      ssh_add_status=$?
-
-      if [[ $ssh_add_status -eq $_SSH_AGENT_NO_KEYS ]]; then
-        _log "Adding SSH key to agent"
-        ssh-add "$key_filename"
-      fi
-    else
-      eval "$(keychain --eval --quiet --agents ssh $key)"
-    fi
-
+  if [ -f $key_filename ]; then
+    eval $(keychain --eval --quiet --agents ssh $key)
     break
   fi
 done

rc/wsl.sh

@@ -0,0 +1,10 @@
+function is_wsl()
+{
+  grep -q -i wsl /proc/version
+}
+
+if is_wsl; then
+  prepend_path_try "$HOME/.local/bin"
+  append_path_try "$HOME/.arkade/bin"
+  append_path_try "$HOME/.cargo/bin"
+fi