update

config/shell/.bashrc

@@ -2,6 +2,16 @@
 
 [[ $- == *i* ]] || return
 
+if type fish &>/dev/null; then
+	alias f="exec fish"
+
+	if [[ ${UY_ENABLE_FISH_AUTO_LOGIN:-0} == 1 ]] &&
+		[[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then
+		shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=''
+		exec fish $LOGIN_OPTION
+	fi
+fi
+
 HISTCONTROL=ignoreboth
 HISTSIZE=16384
 HISTFILESIZE=32768
@@ -52,16 +62,6 @@ if [[ ${UY_USING_SSH_AGENT:-0} == 1 ]]; then
 	}
 fi
 
-if type fish &>/dev/null; then
-	alias f="exec fish"
-
-	if [[ ${UY_ENABLE_FISH_AUTO_LOGIN:-0} == 1 ]] &&
-		[[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then
-		shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=''
-		exec fish $LOGIN_OPTION
-	fi
-fi
-
 if type starship &>/dev/null; then
 	eval $(starship init bash)
 fi

config/shell/.config/fish/conf.d/10-sshs.fish

@@ -1,7 +1,7 @@
 # ssh with encrypted private keys
 # $ssh_keys should be set in advance or left empty to use the default keys
 
-if set -q ENABLE_GPG_AGENT_SSH; and test $ENABLE_GPG_AGENT_SSH != "0";\
+if set -q UY_ENABLE_GPG_AGENT_SSH; and test $UY_ENABLE_GPG_AGENT_SSH != "0";\
    and type -q gpg-init; and type -q gpgconf
 
    true # do nothing

config/shell/.config/zsh/conf.d/02-completions.zsh

@@ -1,4 +1,10 @@
-fpath=(~/.zfunc $fpath)
+if [ -d "$HOME/.zfunc" ]; then
+	fpath=($HOME/.zfunc $fpath)
+fi
+
+if [ -d "$HOME/.zsh/completions" ]; then
+    fpath=($HOME/.zsh/completions $fpath)
+fi
 
 # Cache compinit: only regenerate dump once daily
 autoload -Uz compinit

config/shell/.config/zsh/conf.d/10-env.zsh

@@ -29,3 +29,9 @@ fi
 # Catppuccin Mocha — autosuggestions color
 
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#6c7086"
+
+# Vscode shell integration
+
+if (( $+commands[code] )) && [[ "$TERM_PROGRAM" == "vscode" ]]; then
+    source "$(code --locate-shell-integration-path zsh)"
+fi

config/shell/.config/zsh/funcs.d/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

config/shell/.zshrc

@@ -1,21 +1,9 @@
-# lrx completions
-fpath=(/home/kolkas/.zsh/completions $fpath)
 #!/hint/zsh
 
 [[ $- != *i* ]] && return
 
-
 for _f in "${XDG_CONFIG_HOME:-$HOME/.config}"/zsh/conf.d/*.zsh(N); do
 	source "$_f"
 done
 
-for _f in "${XDG_CONFIG_HOME:-$HOME/.config}"/zsh/funcs.d/*.zsh(N); do
-	source "$_f"
-done
-
-for _f in "${XDG_CONFIG_HOME:-$HOME/.config}"/zsh/funcs.d/_*(N); do
-	source "$_f"
-done
-
-
 unset _f