diff --git a/.config/configfiles/lockscreen.jpg b/.config/configfiles/lockscreen.jpg deleted file mode 100644 index a289238..0000000 Binary files a/.config/configfiles/lockscreen.jpg and /dev/null differ diff --git a/.config/configfiles/lockscreen.png b/.config/configfiles/lockscreen.png new file mode 100644 index 0000000..3bd0ef2 Binary files /dev/null and b/.config/configfiles/lockscreen.png differ diff --git a/.config/configfiles/wallpaper.png b/.config/configfiles/wallpaper.png index c8566b8..a01acb2 100644 Binary files a/.config/configfiles/wallpaper.png and b/.config/configfiles/wallpaper.png differ diff --git a/.config/kanshi/config b/.config/kanshi/config index 9ac7214..d5f5aff 100644 --- a/.config/kanshi/config +++ b/.config/kanshi/config @@ -1,13 +1,12 @@ profile { - output eDP-1 enable - output eDP-1 mode 1920x1080 scale 1 position 0,0 + output DP-6 enable position 3440,1440 + output DP-7 enable position 0,1440 + output DP-5 enable position 0,0 + output eDP-1 disable } profile { - output eDP-1 disable - output DP-6 mode 2560x1440 scale 1 position 3440,1440 - output DP-7 mode 3440x1440 scale 1 position 0,1440 - output DP-5 mode 3440x1440 scale 1 position 0,0 + output eDP-1 enable position 0,0 } # You can get the names of your outputs by running: swaymsg -t get_outputs diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml index e69de29..b1b2d4a 100644 --- a/.config/lazygit/config.yml +++ b/.config/lazygit/config.yml @@ -0,0 +1,24 @@ +gui: + theme: + activeBorderColor: + - '#cba6f7' + - bold + inactiveBorderColor: + - '#a6adc8' + optionsTextColor: + - '#89b4fa' + selectedLineBgColor: + - '#313244' + cherryPickedCommitBgColor: + - '#45475a' + cherryPickedCommitFgColor: + - '#cba6f7' + unstagedChangesColor: + - '#f38ba8' + defaultFgColor: + - '#cdd6f4' + searchingActiveBorderColor: + - '#f9e2af' + + authorColors: + '*': '#b4befe' diff --git a/.config/sway/config b/.config/sway/config index c09ce56..7d34d78 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -186,5 +186,8 @@ bindsym XF86MonBrightnessUp exec brightnessctl s +10% # ScreenShot bindsym $mod+p exec grim -g "$(slurp)" - | wl-copy -default_border none +# Border +default_border pixel +gaps inner 5 + include /etc/sway/config.d/* diff --git a/.config/swaylock/config b/.config/swaylock/config index f2e0b1b..777c66e 100644 --- a/.config/swaylock/config +++ b/.config/swaylock/config @@ -33,7 +33,7 @@ text-wrong-color=eba0ac # daemonize indicator-caps-lock # datestr=%A -image=$HOME/.config/configfiles/lockscreen.jpg +image=$HOME/.config/configfiles/lockscreen.png scaling=fill font=UbuntuMono font-size=20 diff --git a/.config/waybar/config b/.config/waybar/config index 6695c81..9832f6d 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -5,7 +5,7 @@ "spacing": 15, "modules-left": ["sway/workspaces","sway/mode"], "modules-center": ["clock"], - "modules-right": ["tray","network", "battery","pulseaudio"], + "modules-right": ["tray","idle_inhibitor","network", "battery","pulseaudio"], "sway/mode": { "format": "{}" }, @@ -51,4 +51,11 @@ "icon-size": 20, "spacing": 10 }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "\uf06e", + "deactivated": "\uf070" + } + } } diff --git a/.fzf.completion.zsh b/.fzf.completion.zsh index f12afca..d6eab33 100644 --- a/.fzf.completion.zsh +++ b/.fzf.completion.zsh @@ -1,13 +1,162 @@ +### key-bindings.zsh ### +# ____ ____ +# / __/___ / __/ +# / /_/_ / / /_ +# / __/ / /_/ __/ +# /_/ /___/_/ key-bindings.zsh +# +# - $FZF_TMUX_OPTS +# - $FZF_CTRL_T_COMMAND +# - $FZF_CTRL_T_OPTS +# - $FZF_CTRL_R_OPTS +# - $FZF_ALT_C_COMMAND +# - $FZF_ALT_C_OPTS + + +# Key bindings +# ------------ + +# The code at the top and the bottom of this file is the same as in completion.zsh. +# Refer to that file for explanation. +if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then + __fzf_key_bindings_options="options=(${(j: :)${(kv)options[@]}})" +else + () { + __fzf_key_bindings_options="setopt" + 'local' '__fzf_opt' + for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do + if [[ -o "$__fzf_opt" ]]; then + __fzf_key_bindings_options+=" -o $__fzf_opt" + else + __fzf_key_bindings_options+=" +o $__fzf_opt" + fi + done + } +fi + +'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases' + +{ +if [[ -o interactive ]]; then + +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + +# CTRL-T - Paste the selected file path(s) into the command line +__fzf_select() { + setopt localoptions pipefail no_aliases 2> /dev/null + local item + FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path" "${FZF_CTRL_T_OPTS-} -m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) "$@" < /dev/tty | while read item; do + echo -n "${(q)item} " + done + local ret=$? + echo + return $ret +} + +__fzfcmd() { + [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; } && + echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf" +} + +fzf-file-widget() { + LBUFFER="${LBUFFER}$(__fzf_select)" + local ret=$? + zle reset-prompt + return $ret +} +if [[ "${FZF_CTRL_T_COMMAND-x}" != "" ]]; then + zle -N fzf-file-widget + bindkey -M emacs '^T' fzf-file-widget + bindkey -M vicmd '^T' fzf-file-widget + bindkey -M viins '^T' fzf-file-widget +fi + +# ALT-C - cd into the selected directory +fzf-cd-widget() { + setopt localoptions pipefail no_aliases 2> /dev/null + local dir="$( + FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path" "${FZF_ALT_C_OPTS-} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) < /dev/tty)" + if [[ -z "$dir" ]]; then + zle redisplay + return 0 + fi + zle push-line # Clear buffer. Auto-restored on next prompt. + BUFFER="builtin cd -- ${(q)dir:a}" + zle accept-line + local ret=$? + unset dir # ensure this doesn't end up appearing in prompt expansion + zle reset-prompt + return $ret +} +if [[ "${FZF_ALT_C_COMMAND-x}" != "" ]]; then + zle -N fzf-cd-widget + bindkey -M emacs '\ec' fzf-cd-widget + bindkey -M vicmd '\ec' fzf-cd-widget + bindkey -M viins '\ec' fzf-cd-widget +fi + +# CTRL-R - Paste the selected command from history into the command line +fzf-history-widget() { + local selected num + setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null + # Ensure the associative history array, which maps event numbers to the full + # history lines, is loaded, and that Perl is installed for multi-line output. + if zmodload -F zsh/parameter p:history 2>/dev/null && (( ${#commands[perl]} )); then + selected="$(printf '%1$s\t%2$s\000' "${(vk)history[@]}" | + perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\s+(.*)/, $1)}++) { s/\n/\n\t/gm; print; }' | + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" + else + selected="$(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' | + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" + fi + local ret=$? + if [ -n "$selected" ]; then + if num=$(awk '{print $1; exit}' <<< "$selected" | grep -o '^[1-9][0-9]*'); then + zle vi-fetch-history -n $num + else # selected is a custom query, not from history + LBUFFER="$selected" + fi + fi + zle reset-prompt + return $ret +} +zle -N fzf-history-widget +bindkey -M emacs '^R' fzf-history-widget +bindkey -M vicmd '^R' fzf-history-widget +bindkey -M viins '^R' fzf-history-widget +fi + +} always { + eval $__fzf_key_bindings_options + 'unset' '__fzf_key_bindings_options' +} +### end: key-bindings.zsh ### +### completion.zsh ### # ____ ____ # / __/___ / __/ # / /_/_ / / /_ # / __/ / /_/ __/ # /_/ /___/_/ completion.zsh # -# - $FZF_TMUX (default: 0) -# - $FZF_TMUX_OPTS (default: '-d 40%') -# - $FZF_COMPLETION_TRIGGER (default: '**') -# - $FZF_COMPLETION_OPTS (default: empty) +# - $FZF_TMUX (default: 0) +# - $FZF_TMUX_OPTS (default: empty) +# - $FZF_COMPLETION_TRIGGER (default: '**') +# - $FZF_COMPLETION_OPTS (default: empty) +# - $FZF_COMPLETION_PATH_OPTS (default: empty) +# - $FZF_COMPLETION_DIR_OPTS (default: empty) + # Both branches of the following `if` do the same thing -- define # __fzf_completion_options such that `eval $__fzf_completion_options` sets @@ -67,41 +216,46 @@ fi # control. There are several others that could wreck havoc if they are set # to values we don't expect. With the following `emulate` command we # sidestep this issue entirely. -'emulate' 'zsh' '-o' 'no_aliases' +'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases' # This brace is the start of try-always block. The `always` part is like # `finally` in lesser languages. We use it to *always* restore user options. { - -# Bail out if not interactive shell. -[[ -o interactive ]] || return 0 +# The 'emulate' command should not be placed inside the interactive if check; +# placing it there fails to disable alias expansion. See #3731. +if [[ -o interactive ]]; then # To use custom commands instead of find, override _fzf_compgen_{path,dir} -if ! declare -f _fzf_compgen_path > /dev/null; then - _fzf_compgen_path() { - echo "$1" - command find -L "$1" \ - -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \ - -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' - } -fi - -if ! declare -f _fzf_compgen_dir > /dev/null; then - _fzf_compgen_dir() { - command find -L "$1" \ - -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \ - -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' - } -fi +# +# _fzf_compgen_path() { +# echo "$1" +# command find -L "$1" \ +# -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \ +# -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' +# } +# +# _fzf_compgen_dir() { +# command find -L "$1" \ +# -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \ +# -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' +# } ########################################################### +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + __fzf_comprun() { if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then _fzf_comprun "$@" - elif [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; }; then + elif [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; }; then shift - if [ -n "$FZF_TMUX_OPTS" ]; then + if [ -n "${FZF_TMUX_OPTS-}" ]; then fzf-tmux ${(Q)${(Z+n+)FZF_TMUX_OPTS}} -- "$@" else fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%} -- "$@" @@ -137,7 +291,10 @@ __fzf_generic_path_completion() { tail=$6 setopt localoptions nonomatch - eval "base=$base" + if [[ $base = *'$('* ]] || [[ $base = *'<('* ]] || [[ $base = *'>('* ]] || [[ $base = *':='* ]] || [[ $base = *'`'* ]]; then + return + fi + eval "base=$base" 2> /dev/null || return [[ $base = *"/"* ]] && dir="$base" while [ 1 ]; do if [[ -z "$dir" || -d ${dir} ]]; then @@ -145,9 +302,25 @@ __fzf_generic_path_completion() { leftover=${leftover/#\/} [ -z "$dir" ] && dir='.' [ "$dir" != "/" ] && dir="${dir/%\//}" - matches=$(eval "$compgen $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS" __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" | while read item; do - echo -n "${(q)item}$suffix " - done) + matches=$( + export FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-}") + unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE + if declare -f "$compgen" > /dev/null; then + eval "$compgen $(printf %q "$dir")" | __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" + else + if [[ $compgen =~ dir ]]; then + walker=dir,follow + rest=${FZF_COMPLETION_DIR_OPTS-} + else + walker=file,dir,follow,hidden + rest=${FZF_COMPLETION_PATH_OPTS-} + fi + __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" --walker "$walker" --walker-root="$dir" ${(Q)${(Z+n+)rest}} < /dev/tty + fi | while read item; do + item="${item%$suffix}$suffix" + echo -n "${(q)item} " + done + ) matches=${matches% } if [ -n "$matches" ]; then LBUFFER="$lbuf$matches$tail" @@ -183,7 +356,7 @@ _fzf_complete() { args=("$@") sep= for i in {0..${#args[@]}}; do - if [[ "${args[$i]}" = -- ]]; then + if [[ "${args[$i]-}" = -- ]]; then sep=$i break fi @@ -207,28 +380,47 @@ _fzf_complete() { type $post > /dev/null 2>&1 || post=cat _fzf_feed_fifo "$fifo" - matches=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS $str_arg" __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ') + matches=$( + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \ + FZF_DEFAULT_OPTS_FILE='' \ + __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ') if [ -n "$matches" ]; then LBUFFER="$lbuf$matches" fi command rm -f "$fifo" } +# To use custom hostname lists, override __fzf_list_hosts. +# The function is expected to print hostnames, one per line as well as in the +# desired sorting and with any duplicates removed, to standard output. +if ! declare -f __fzf_list_hosts > /dev/null; then + __fzf_list_hosts() { + setopt localoptions nonomatch + command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \ + <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts 2> /dev/null | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ + <(command grep -v '^\s*\(#\|$\)' /etc/hosts 2> /dev/null | command grep -Fv '0.0.0.0' | command sed 's/#.*//') | + awk '{for (i = 2; i <= NF; i++) print $i}' | sort -u + } +fi + _fzf_complete_telnet() { - _fzf_complete +m -- "$@" < <( - command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0' | - awk '{if (length($2) > 0) {print $2}}' | sort -u - ) + _fzf_complete +m -- "$@" < <(__fzf_list_hosts) } +# The first and the only argument is the LBUFFER without the current word that contains the trigger. +# The current word without the trigger is in the $prefix variable passed from the caller. _fzf_complete_ssh() { - _fzf_complete +m -- "$@" < <( - setopt localoptions nonomatch - command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?]') \ - <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ - <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') | - awk '{if (length($2) > 0) {print $2}}' | sort -u - ) + local tokens=(${(z)1}) + case ${tokens[-1]} in + -i|-F|-E) + _fzf_path_completion "$prefix" "$1" + ;; + *) + local user= + [[ $prefix =~ @ ]] && user="${prefix%%@*}@" + _fzf_complete +m -- "$@" < <(__fzf_list_hosts | awk -v user="$user" '{print user $0}') + ;; + esac } _fzf_complete_export() { @@ -250,8 +442,9 @@ _fzf_complete_unalias() { } _fzf_complete_kill() { - _fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <( - command ps -ef | sed 1d + _fzf_complete -m --header-lines=1 --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <( + command ps -eo user,pid,ppid,start,time,command 2> /dev/null || + command ps -eo user,pid,ppid,time,args # For BusyBox ) } @@ -278,25 +471,22 @@ fzf-completion() { [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("") # When the trigger starts with ';', it becomes a separate token - if [[ ${LBUFFER} = *"${tokens[-2]}${tokens[-1]}" ]]; then - tokens[-2]="${tokens[-2]}${tokens[-1]}" + if [[ ${LBUFFER} = *"${tokens[-2]-}${tokens[-1]}" ]]; then + tokens[-2]="${tokens[-2]-}${tokens[-1]}" tokens=(${tokens[0,-2]}) fi lbuf=$LBUFFER tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))} - # Kill completion (do not require trigger sequence) - if [ "$cmd" = kill -a ${LBUFFER[-1]} = ' ' ]; then - tail=$trigger - tokens+=$trigger - lbuf="$lbuf$trigger" - fi # Trigger sequence given if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then - d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir}) + d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS-cd pushd rmdir}) [ -z "$trigger" ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}} + if [[ $prefix = *'$('* ]] || [[ $prefix = *'<('* ]] || [[ $prefix = *'>('* ]] || [[ $prefix = *':='* ]] || [[ $prefix = *'`'* ]]; then + return + fi [ -n "${tokens[-1]}" ] && lbuf=${lbuf:0:-${#tokens[-1]}} if eval "type _fzf_complete_${cmd} > /dev/null"; then @@ -321,9 +511,11 @@ fzf-completion() { zle -N fzf-completion bindkey '^I' fzf-completion +fi } always { # Restore the original options. eval $__fzf_completion_options 'unset' '__fzf_completion_options' } +### end: completion.zsh ### diff --git a/.zshrc b/.zshrc index ab1a9b8..4aaaacd 100644 --- a/.zshrc +++ b/.zshrc @@ -9,9 +9,10 @@ export GEM_HOME="$HOME/gems" export PATH="$HOME/.local/bin:$HOME/gems/bin:/usr/local/go/bin:$HOME/go/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" export GOBIN=~/go/bin export BAT_THEME="Catppuccin Mocha" +export LS_COLORS="$(vivid generate catppuccin-mocha)" export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=none,fg=white,bold" #eval $(thefuck --alias) -# + alias tf=terraform alias k=kubectl alias ls='ls --color' @@ -22,7 +23,7 @@ alias pbpaste='xclip -selection clipboard -o' alias ls='eza' alias ll='eza -l' alias tree='eza -T' -alias cat='bat' +alias cat='bat -P' alias network='nmtui' alias docker='podman' alias sudo='sudo ' @@ -104,12 +105,21 @@ zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' # Shell integrations -eval "$(fzf --zsh)" -eval "$(zoxide init --cmd cd zsh)" -eval "$(bw completion --shell zsh); compdef _bw bw;" +#eval "$(fzf --zsh)" +#eval "$(zoxide init --cmd cd zsh)" +#eval "$(bw completion --shell zsh); compdef _bw bw;" source ~/.fzf.completion.zsh source ~/.fzf.key-bindings.zsh +source ~/.zoxide.completions.zsh +source ~/.bw.completions.zsh + +runinti () +{ + fzf --zsh > ~/.fzf.completion.zsh + zoxide init --cmd cd zsh > ~/.zoxide.completions.zsh + bw completion --shell zsh > ~/.bw.completions.zsh +} unlockbw () { diff --git a/ansible/roles/packages/vars/Pop!_OS-22.04.yml b/ansible/roles/packages/vars/Pop!_OS-22.04.yml index be8c370..6b57cc5 100644 --- a/ansible/roles/packages/vars/Pop!_OS-22.04.yml +++ b/ansible/roles/packages/vars/Pop!_OS-22.04.yml @@ -18,6 +18,7 @@ required_packages_brew: - bat - eza - fastfetch + - vivid apt_keys: - https://packages.microsoft.com/keys/microsoft.asc