diff --git a/_home/.chezmoiexternal.yaml b/_home/.chezmoiexternal.yaml index a5362b7..9f0adc3 100644 --- a/_home/.chezmoiexternal.yaml +++ b/_home/.chezmoiexternal.yaml @@ -64,29 +64,6 @@ {{- end -}} {{- end }} -{{- with $repo := "theimpostor/osc" -}} -{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} -{{- $_ := set $externals ".local/bin/osc" (dict - "type" "archive-file" - "url" (printf "https://github.com/%s/releases/download/%s/osc_linux_x86_64.tar.gz" $repo $version) - "path" "osc" - "executable" true - "refreshPeriod" $defaultRefresh -) -}} -{{- end -}} -{{- end }} - -{{- with $repo := "Lifailon/lazyjournal" -}} -{{- with $version := (gitHubLatestRelease $repo).GetTagName -}} -{{- $_ := set $externals ".local/bin/lazyjournal" (dict - "type" "file" - "url" (printf "https://github.com/%s/releases/download/%s/lazyjournal-%s-linux-amd64" $repo $version $version) - "executable" true - "refreshPeriod" $defaultRefresh -) -}} -{{- end -}} -{{- end }} - {{- $externals | toYaml }} ".config/sz.env/lib/ble.sh.curl": type: "archive" diff --git a/_home/private_dot_config/starship.toml b/_home/private_dot_config/starship.toml deleted file mode 100644 index 45402f4..0000000 --- a/_home/private_dot_config/starship.toml +++ /dev/null @@ -1,101 +0,0 @@ -# Customized, based on tokyo-night - -# global prompt configuration ( https://starship.rs/config/#prompt ) -format = """ -[░▒▓](#a3aed2)\ -$os\ -[](bg:#769ff0 fg:#a3aed2)\ -$directory\ -[](fg:#769ff0 bg:#394260)\ -$git_branch\ -$git_status\ -[](fg:#394260 bg:#212736)\ -$nodejs\ -$rust\ -$golang\ -[](fg:#212736 bg:#1d2230)\ -$time\ -[](fg:#212736 bg:#1d2230)\ -$cmd_duration\ -$status\ -[ ](fg:#1d2230)\ -$line_break$character""" - -command_timeout = 1500 # milliseconds; default is 500 - -[profiles] -transient = """ -$time\ -[](fg:#212736 bg:#1d2230)\ -$character""" - - -[os] -style = "bg:#a3aed2 fg:#090c0c" -disabled = false - -# Without NerdFont -#[os.symbols] -#Windows = " Win" - -# NerdFont - see https://www.nerdfonts.com/cheat-sheet -[os.symbols] -Windows = " " - -[directory] -style = "fg:#e3e5e5 bg:#769ff0" -format = "[ $path ]($style)" -truncation_length = 3 -truncation_symbol = "…/" - -[directory.substitutions] -"Documents" = "󰈙 " -"Downloads" = " " -"Music" = " " -"Pictures" = " " - -[git_branch] -symbol = "" -style = "bg:#394260" -format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)' - -[git_status] -style = "bg:#394260" -format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)' - -[nodejs] -symbol = "" -style = "bg:#212736" -format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)' - -[rust] -symbol = "" -style = "bg:#212736" -format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)' - -[golang] -symbol = "" -style = "bg:#212736" -format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)' - -[time] -disabled = false -time_format = "%R" # Hour:Minute Format -style = "bg:#1d2230" -format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)' - -[cmd_duration] -min_time = 500 # milliseconds -# nerd font version: -format = 'prev: [[  $duration ](fg:#a0a9cb bg:#1d2230)]($style)' -# General UNICODE font version: -# format = '[[ ⧗ $duration ](fg:#a0a9cb bg:#1d2230)]($style)' -# Emoji version: -# format = '[[ ⌛ $duration ](fg:#a0a9cb bg:#1d2230)]($style)' - -[status] -disabled = false - -[character] -disabled = false - diff --git a/_home/private_dot_config/sz.env/PATH_truestuff.env b/_home/private_dot_config/sz.env/PATH_truestuff.env index 0095c06..bced20c 100644 --- a/_home/private_dot_config/sz.env/PATH_truestuff.env +++ b/_home/private_dot_config/sz.env/PATH_truestuff.env @@ -1,8 +1,6 @@ #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' -if is_cmd midclt && [ -z "$SCALE_POOL" ]; then - export SCALE_POOL=szmedia - +if is_cmd midclt; then export SCALE_POOL="$(midclt call "kubernetes.config" 2>/dev/null | jq -r '.pool')" [ -n "$SCALE_POOL" ] && [ "$SCALE_POOL" != "null" ] || export SCALE_POOL="$(midclt call "pool.query" 2>/dev/null | jq -r '.[0].name')" [ -d "/mnt/$SCALE_POOL" ] || unset SCALE_POOL diff --git a/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env index be73805..772818f 100644 --- a/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env +++ b/_home/private_dot_config/sz.env/aaa_zsh_0_perp.env @@ -8,18 +8,11 @@ if [[ "${BASE_SHELL}" == "zsh" ]]; then mkdir -p $ZSH_CACHE_DIR/completions mkdir -p "$HOME/.local/share/zsh/completions" - # Remove duplicates from fpath, and add local completion dir - fpath=( $( - for d in $( - awk '!seen[$0]++' <( - echo "$HOME/.local/share/zsh/completions" - printf '%s\n' $fpath - ) - ); do - [ -d "$d" ] && echo "$d" - done - ) ) - + [ -d "$HOME/.local/share/zsh/completions" ] && fpath=( + $HOME/.local/share/zsh/completions + $fpath + ) + skip_global_compinit=1 # # Jump to the bottom of the screen diff --git a/_home/private_dot_local/bin/executable_load-zellij b/_home/private_dot_local/bin/executable_load-zellij index 6b2428b..4399ad7 100644 --- a/_home/private_dot_local/bin/executable_load-zellij +++ b/_home/private_dot_local/bin/executable_load-zellij @@ -15,7 +15,7 @@ BASE_SHELL=$(basename "$SHELL") if is_sourced; then zellij-cleanup() { - env which zellij > /dev/null && env which zellij | grep -E "^$HOME" | ${SUDO:-} xargs -tr rm + which zellij > /dev/null && which zellij | grep -E "^$HOME" | ${SUDO:-} xargs -tr rm [[ -d "$HOME/.cache/zellij" ]] && echo "$HOME/.cache/zellij" | ${SUDO:-} xargs -tr rm -fR find /tmp -maxdepth 1 -mindepth 1 -type d -name 'zellij*' -print0 | ${SUDO:-} xargs -r0t rm -fR if [[ -d "$HOME/.cache/zellij" ]]; then @@ -26,8 +26,7 @@ if is_sourced; then fi } refresh-zellij() { -${SET:-:} -x - if [ -z "$(env which zellij)" ] && ! [ -x ~/.local/bin/zellij ]; then + if [ -z "$(which zellij)" ] && ! [ -x ~/.local/bin/zellij ]; then if [[ ! -r /tmp/zellij/bootstrap/zellij ]]; then printf "Grabbing zellij from the web!\n" bash <(curl -sL zellij.dev/launch) "--help" > /dev/null 2>&1 || true @@ -49,14 +48,13 @@ ${SET:-:} -x } zellij-completion() { if [[ "${BASE_SHELL}" == "zsh" ]]; then - type _zellij > /dev/null \ - || . <( env zellij setup --generate-completion zsh | sed -Ee 's/^(_(zellij) ).*/compdef \1\2/' ) + . <( env zellij setup --generate-completion zsh | sed -Ee 's/^(_(zellij) ).*/compdef \1\2/' ) else . <( env zellij setup --generate-completion "$BASE_SHELL" ) fi } ${SET:-:} -x - if [[ -n "$(env which zellij)" ]]; then + if [[ -n "$(which zellij)" ]]; then zellij-completion fi ${SET:-:} -x diff --git a/_home/private_dot_local/bin/symlink_vi b/_home/private_dot_local/bin/symlink_vi index 732ff53..f280f47 100644 --- a/_home/private_dot_local/bin/symlink_vi +++ b/_home/private_dot_local/bin/symlink_vi @@ -1 +1 @@ -nvim +nvim.AppImage diff --git a/_home/private_dot_local/bin/symlink_vim b/_home/private_dot_local/bin/symlink_vim index 732ff53..f280f47 100644 --- a/_home/private_dot_local/bin/symlink_vim +++ b/_home/private_dot_local/bin/symlink_vim @@ -1 +1 @@ -nvim +nvim.AppImage diff --git a/_home/private_dot_local/bin/symlink_vim.tiny b/_home/private_dot_local/bin/symlink_vim.tiny index 732ff53..f280f47 100644 --- a/_home/private_dot_local/bin/symlink_vim.tiny +++ b/_home/private_dot_local/bin/symlink_vim.tiny @@ -1 +1 @@ -nvim +nvim.AppImage diff --git a/_home/private_dot_local/bin/symlink_vimdiff b/_home/private_dot_local/bin/symlink_vimdiff index 732ff53..f280f47 100644 --- a/_home/private_dot_local/bin/symlink_vimdiff +++ b/_home/private_dot_local/bin/symlink_vimdiff @@ -1 +1 @@ -nvim +nvim.AppImage