Compare commits

..

9 commits

22 changed files with 705 additions and 69 deletions

View file

@ -21,11 +21,23 @@ completions:
$(call msg,Generating Completions) $(call msg,Generating Completions)
@./lib/completions/update.sh @./lib/completions/update.sh
## fzf | update fzf shell scripts
.PHONY: fzf
fzf: lib/.fzf/completion.zsh lib/.fzf/key-bindings.zsh
lib/.fzf/%.zsh: FORCE
wget -O $@ \
https://raw.githubusercontent.com/junegunn/fzf/master/shell/$*.zsh
## db, d-build | build docker image ## db, d-build | build docker image
.PHONY: db d-build .PHONY: db d-build
db d-build: db d-build:
$(call msg,Building Docker Image) $(call msg,Building Docker Image)
@docker build -f docker/Dockerfile -t dots . @DOCKER_BUILDKIT=1 docker build \
--secret id=GITHUB_TOKEN \
--progress=plain \
-f docker/Dockerfile \
-t dots .
## dr, d-run | run docker image ## dr, d-run | run docker image
.PHONY: dr d-run .PHONY: dr d-run
@ -37,6 +49,8 @@ dr d-run:
dr-keep: dr-keep:
docker run -it dots docker run -it dots
FORCE:
.DEFAULT_GOAL = help .DEFAULT_GOAL = help
GOAL_STYLE = b_magenta GOAL_STYLE = b_magenta
HELP_SEP = {a.b_green}->>{a.end} HELP_SEP = {a.b_green}->>{a.end}

View file

@ -1,42 +1,71 @@
# syntax = docker/dockerfile:1.3
FROM debian:bookworm-20220822-slim FROM debian:bookworm-20220822-slim
ENV TERM='xterm-256color' \ ARG UID=1000
HOME='/root' ARG GID=1000
ARG USER=daylin
COPY ./docker/install_packages.sh /usr/bin/install_packages RUN groupadd -g "${GID}" "${USER}" \
&& useradd -rm -s /usr/bin/zsh -u "${UID}" -g "${GID}" "${USER}"
RUN install_packages \ ENV TERM='xterm-256color'
COPY ./docker/install-packages.sh /usr/bin/install-packages
RUN install-packages \
ca-certificates \ ca-certificates \
locales \ locales \
gcc \
tmux \ tmux \
curl \ curl \
gawk \ gawk \
zsh \ zsh \
vim \ vim \
git \ git \
neovim python-is-python3 \
python3
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen locale-gen
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
WORKDIR /root
USER "${USER}"
WORKDIR /home/"${USER}"
RUN sh -c "$(curl -fsLS https://chezmoi.io/get)" RUN sh -c "$(curl -fsLS https://chezmoi.io/get)"
COPY . .dotfiles COPY . .dotfiles
RUN ./bin/chezmoi init --apply -S ~/.dotfiles
RUN ./bin/chezmoi init \
--apply \
-S ~/.dotfiles \
--promptString 'git email=daylinmorgan@gmail.com,git name=Daylin Morgan' \
--promptBool 'use gui configs=false'
ENV DOTFILES_DIR="$HOME/.dotfiles" \ ENV DOTFILES_DIR="$HOME/.dotfiles" \
PATH="$PATH:$HOME/bin:$HOME/.dotfiles/bin" PATH="$PATH:$HOME/bin:$HOME/.dotfiles/bin"
# setup eget for tools script # switch back to root for the secrets
RUN curl https://zyedidia.github.io/eget.sh | sh && mv ./eget ./bin/eget USER root
RUN --mount=type=secret,id=GITHUB_TOKEN \
GITHUB_TOKEN=$(cat /run/secrets/GITHUB_TOKEN) \
/home/daylin/.dotfiles/docker/install-tools.sh
USER daylin
# use eget to fetch yq and some needed tools ENV DOTFILES_DIR="/home/daylin/.dotfiles" \
RUN tools $(cat .dotfiles/docker/tools.txt) PATH="$PATH:/home/daylin/bin:/home/daylin/.dotfiles/bin"
# RUN tree
RUN echo "$PATH"
# get shell extensions # get shell extensions
RUN sheldon -q --config-file ~/.config/sheldon/plugins.toml lock RUN sheldon -q --config-file ~/.config/sheldon/plugins.toml lock
# install general tools used by neovim
RUN ~/.dotfiles/docker/install-dev-envs.sh
# install astronvim
RUN ~/.config/astronvim/install.sh
CMD ["zsh"] CMD ["zsh"]

View file

@ -1,6 +0,0 @@
# TODO
- [ ] lunarvim
- [ ] install node
- [ ] install rustup/cargo
- [ ] run packer install command

20
docker/install-dev-envs.sh Executable file
View file

@ -0,0 +1,20 @@
#!/usr/bin/env bash
export PATH="$HOME/bin:$PATH"
is-executable() {
[ -x "$(command -v "$1")" ]
}
install-cargo-rustup() {
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path
}
install-npm() {
fnm install 'v18.5.0'
}
install-cargo-rustup
if is-executable fnm; then
install-npm
fi

25
docker/install-tools.sh Executable file
View file

@ -0,0 +1,25 @@
#!/usr/bin/env bash
# eget() {
# "$HOME/bin/eget" "$@"
# }
#
export PATH="$PATH:/home/daylin/bin:/home/daylin/.dotfiles/bin"
export EGET_BIN=/home/$USER/bin
export DOTFILES_DIR=/home/$USER/.dotfiles
curl https://zyedidia.github.io/eget.sh | sh && mv ./eget ./bin/eget
tools $(cat "$DOTFILES_DIR/docker/tools.txt")
# eget rossmacarthur/sheldon
eget tree-sitter/tree-sitter
# installing nvim
eget neovim/neovim --to ./nvim.appimage --pre-release
./nvim.appimage --appimage-extract
./squashfs-root/AppRun --version
mv squashfs-root /
ln -s /squashfs-root/AppRun /usr/bin/nvim
rm nvim.appimage

View file

@ -1,4 +1,8 @@
atuin
fnm
fzf
lazygit
lsd
ripgrep
starship starship
sheldon sheldon
ripgrep
lsd

View file

@ -19,7 +19,7 @@ INSTALL_NO=${RED}✗${NORMAL}
shopt -s nullglob shopt -s nullglob
BINARY_FILES=($HOME/bin/*) BINARY_FILES=($HOME/bin/*)
export EGET_BIN=$HOME/bin export EGET_BIN=${EGET_BIN:-$HOME/bin}
alias eget="eget --system linux/amd64" alias eget="eget --system linux/amd64"
post_download_install() { post_download_install() {

View file

@ -3,55 +3,55 @@
set -e set -e
deps=( deps=(
rg # ripgrep rg # ripgrep
lazygit lazygit
gdu gdu
btm # bottom btm # bottom
python python
node node
tree-sitter tree-sitter
) )
# TODO: make sure tree-sitter is rust version? # TODO: make sure tree-sitter is rust version?
is-cmd() { is-cmd() {
if [ -x "$(command -v "$1")" ]; then if [ -x "$(command -v "$1")" ]; then
return 0 return 0
else else
return 1 return 1
fi fi
} }
install-astronvim(){ install-astronvim() {
echo "Installing astronvim" echo "Installing astronvim"
if [[ -d ~/.config/nvim ]]; then if [[ -d ~/.config/nvim ]]; then
echo "backing up old nvim config" echo "backing up old nvim config"
mv ~/.config/nvim ~/.config/nvim.bak-$(date +'%s') mv ~/.config/nvim ~/.config/nvim.bak-"$(date +'%s')"
fi fi
if [[ -d ~/.local/share/nvim ]]; then if [[ -d ~/.local/share/nvim ]]; then
echo "backing up old nvim directory" echo "backing up old nvim directory"
mv ~/.local/share/nvim ~/.local/share/nvim-$(date +'%s') mv ~/.local/share/nvim ~/.local/share/nvim-"$(date +'%s')"
mkdir ~/.local/share/nvim mkdir ~/.local/share/nvim
fi fi
git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
echo "add brute force method of ignoring version complaints" echo "add brute force method of ignoring version complaints"
git -C "$HOME/.config/nvim" am "$HOME/.config/astronvim/patches/0001-remove-version-check.patch" git -C "$HOME/.config/nvim" am "$HOME/.config/astronvim/patches/0001-remove-version-check.patch"
nvim --headless -c 'autocmd User PackerComplete quitall' nvim --headless -c 'autocmd User PackerComplete quitall'
} }
echo "Checking for optional dependencies" echo "Checking for optional dependencies"
check-dep(){ check-dep() {
if is-cmd "$1"; then if is-cmd "$1"; then
printf '%15s \033[32m%s\033[0m\n' "$1" 'yes' printf '%15s \033[32m%s\033[0m\n' "$1" 'yes'
else else
printf '%15s \033[31m%s\033[0m\n' "$1" 'no' printf '%15s \033[31m%s\033[0m\n' "$1" 'no'
fi fi
} }
install-astronvim install-astronvim
@ -60,5 +60,5 @@ echo
echo "checking for dependencies" echo "checking for dependencies"
for dep in "${deps[@]}"; do for dep in "${deps[@]}"; do
check-dep "$dep" check-dep "$dep"
done done

View file

@ -13,9 +13,36 @@ return {
["<leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" }, ["<leader>bj"] = { "<cmd>BufferLinePick<cr>", desc = "Pick to jump" },
["<leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" }, ["<leader>bt"] = { "<cmd>BufferLineSortByTabs<cr>", desc = "Sort by tabs" },
["<leader>bp"] = { "<cmd>:bp<cr>", desc = "Previous Buffer" }, ["<leader>bp"] = { "<cmd>:bp<cr>", desc = "Previous Buffer" },
-- disable default bindings
["<C-Down>"] = false,
["<C-Left>"] = false,
["<C-Right>"] = false,
["<C-Up>"] = false,
["<C-q>"] = false,
["<C-s>"] = false,
["<leader>fh"] = false,
["<leader>fm"] = false,
["<leader>fn"] = false,
["<leader>fo"] = false,
["<leader>sb"] = false,
["<leader>sc"] = false,
["<leader>sh"] = false,
["<leader>sk"] = false,
["<leader>sm"] = false,
["<leader>sn"] = false,
["<leader>sr"] = false,
["q:"] = "<Nop>",
-- navigating wrapped lines
j = { "gj", desc = "Navigate down" },
k = { "gk", desc = "Navigate down" },
}, },
t = { t = {
-- setting a mapping to false will disable it -- setting a mapping to false will disable it
-- ["<esc>"] = false, -- ["<esc>"] = false,
}, },
} }
-- map('n', 'j', "v:count ? 'j' : 'gj'", { expr = true, noremap = true })
-- map('n', 'k', "v:count ? 'k' : 'gk'", { expr = true, noremap = true })
-- map('n', "<C-j>","}",{noremap = true})
-- map('n', "<C-k>","{",{noremap = true})

View file

@ -1,4 +1,4 @@
-- from https://code.mehalter.com/projects/68/files-- from https://code.mehalter.com/projects/68/files -- from https://code.mehalter.com/projects/68/files
return { return {
opt = { opt = {
conceallevel = 2, -- enable conceal conceallevel = 2, -- enable conceal
@ -9,8 +9,9 @@ return {
list = true, -- show whitespace characters list = true, -- show whitespace characters
listchars = { tab = "│→", extends = "", precedes = "", trail = "·", nbsp = "" }, listchars = { tab = "│→", extends = "", precedes = "", trail = "·", nbsp = "" },
showbreak = "", showbreak = "",
spellfile = vim.fn.expand "~/.config/astronvim/lua/user/spell/en.utf-8.add", spellfile = vim.fn.expand("~/.config/astronvim/lua/user/spell/en.utf-8.add"),
thesaurus = vim.fn.expand "~/.config/astronvim/lua/user/spell/mthesaur.txt", timeoutlen = 300,
thesaurus = vim.fn.expand("~/.config/astronvim/lua/user/spell/mthesaur.txt"),
wrap = true, -- soft wrap lines wrap = true, -- soft wrap lines
}, },
g = { g = {

View file

@ -0,0 +1,12 @@
return {
ensure_installed = {
"cssls",
"gopls",
"html",
"jsonls",
"pyright",
"sumneko_lua",
"texlab",
"yamlls",
},
}

View file

@ -0,0 +1,10 @@
return {
ensure_installed = {
"shellcheck",
"stylua",
"black",
"isort",
"shfmt",
"shellcheck",
},
}

View file

@ -0,0 +1 @@
return { window = { border = "none" } }

View file

@ -1,5 +1,5 @@
return function() return function()
vim.cmd [[ vim.cmd([[
autocmd BufNewFile,BufRead Knitfile set syntax=lua autocmd BufNewFile,BufRead Knitfile set syntax=lua
]] ]])
end end

View file

@ -20,3 +20,56 @@ unbind %
# Set default term to xterm # Set default term to xterm
set -g default-terminal "xterm-256color" set -g default-terminal "xterm-256color"
set-option -ga terminal-overrides ",xterm-256color:Tc" set-option -ga terminal-overrides ",xterm-256color:Tc"
# --> Catppuccin (Mocha)
thm_bg="#1e1e2e"
thm_fg="#cdd6f4"
thm_cyan="#89dceb"
thm_black="#181825"
thm_gray="#313244"
thm_magenta="#cba6f7"
thm_pink="#f5c2e7"
thm_red="#f38ba8"
thm_green="#a6e3a1"
thm_yellow="#f9e2af"
thm_blue="#89b4fa"
thm_orange="#fab387"
thm_black4="#585b70"
# status
set -g status "on"
set -g status-bg "${thm_bg}"
set -g status-justify "left"
set -g status-left-length "100"
set -g status-right-length "100"
# # messages
set -g message-style "fg=${thm_cyan},bg=${thm_gray},align=centre"
set -g message-command-style "fg=${thm_cyan},bg=${thm_gray},align=centre"
#
# # panes
set -g pane-border-style "fg=${thm_gray}"
set -g pane-active-border-style "fg=${thm_blue}"
#
# # windows
setw -g window-status-activity-style "fg=${thm_fg},bg=${thm_bg},none"
setw -g window-status-separator ""
setw -g window-status-style "fg=${thm_fg},bg=${thm_bg},none"
#
# # --------=== Statusline
#
set -g status-left ""
set -g status-right "#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S "
#
# # current_dir
setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} "
setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_fg,bg=$thm_bg] #{b:pane_current_path} "
#
# # parent_dir/current_dir
# # setw window-status-format "#[fg=colour232,bg=colour111] #I #[fg=colour222,bg=colour235] #(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) "
# # setw window-status-current-format "#[fg=colour232,bg=colour208] #I #[fg=colour255,bg=colour237] #(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) "
#
# # --------=== Modes
setw -g clock-mode-colour "${thm_blue}"
setw -g mode-style "fg=${thm_pink} bg=${thm_black4} bold"

View file

@ -1,10 +1,10 @@
tool: &default tool: &default
asset: x86_64-unknown-linux-gnu asset: x86_64-unknown-linux-gnu
# environment # environment
sheldon: sheldon:
user: rossmacarthur user: rossmacarthur
starship: starship:
user: starship user: starship
asset: starship-x86_64-unknown-linux-gnu.tar.gz asset: starship-x86_64-unknown-linux-gnu.tar.gz
@ -30,6 +30,8 @@ gum:
user: charmbracelet user: charmbracelet
asset: linux_x86_64.tar.gz asset: linux_x86_64.tar.gz
custom_flags: "--asset ^.sbom" custom_flags: "--asset ^.sbom"
fzf:
user: junegunn
# system monitoring # system monitoring
bottom: bottom:
@ -40,7 +42,6 @@ bottom:
btop: btop:
user: aristocratos user: aristocratos
# git # git
lazygit: lazygit:
user: jesseduffield user: jesseduffield
@ -81,4 +82,3 @@ gdu:
asset: gdu_linux_amd64.tgz asset: gdu_linux_amd64.tgz
lf: lf:
user: gokcehan user: gokcehan

324
lib/.fzf/completion.zsh Normal file
View file

@ -0,0 +1,324 @@
# ____ ____
# / __/___ / __/
# / /_/_ / / /_
# / __/ / /_/ __/
# /_/ /___/_/ completion.zsh
#
# - $FZF_TMUX (default: 0)
# - $FZF_TMUX_OPTS (default: '-d 40%')
# - $FZF_COMPLETION_TRIGGER (default: '**')
# - $FZF_COMPLETION_OPTS (default: empty)
# Both branches of the following `if` do the same thing -- define
# __fzf_completion_options such that `eval $__fzf_completion_options` sets
# all options to the same values they currently have. We'll do just that at
# the bottom of the file after changing options to what we prefer.
#
# IMPORTANT: Until we get to the `emulate` line, all words that *can* be quoted
# *must* be quoted in order to prevent alias expansion. In addition, code must
# be written in a way works with any set of zsh options. This is very tricky, so
# careful when you change it.
#
# Start by loading the builtin zsh/parameter module. It provides `options`
# associative array that stores current shell options.
if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then
# This is the fast branch and it gets taken on virtually all Zsh installations.
#
# ${(kv)options[@]} expands to array of keys (option names) and values ("on"
# or "off"). The subsequent expansion# with (j: :) flag joins all elements
# together separated by spaces. __fzf_completion_options ends up with a value
# like this: "options=(shwordsplit off aliases on ...)".
__fzf_completion_options="options=(${(j: :)${(kv)options[@]}})"
else
# This branch is much slower because it forks to get the names of all
# zsh options. It's possible to eliminate this fork but it's not worth the
# trouble because this branch gets taken only on very ancient or broken
# zsh installations.
() {
# That `()` above defines an anonymous function. This is essentially a scope
# for local parameters. We use it to avoid polluting global scope.
'local' '__fzf_opt'
__fzf_completion_options="setopt"
# `set -o` prints one line for every zsh option. Each line contains option
# name, some spaces, and then either "on" or "off". We just want option names.
# Expansion with (@f) flag splits a string into lines. The outer expansion
# removes spaces and everything that follow them on every line. __fzf_opt
# ends up iterating over option names: shwordsplit, aliases, etc.
for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do
if [[ -o "$__fzf_opt" ]]; then
# Option $__fzf_opt is currently on, so remember to set it back on.
__fzf_completion_options+=" -o $__fzf_opt"
else
# Option $__fzf_opt is currently off, so remember to set it back off.
__fzf_completion_options+=" +o $__fzf_opt"
fi
done
# The value of __fzf_completion_options here looks like this:
# "setopt +o shwordsplit -o aliases ..."
}
fi
# Enable the default zsh options (those marked with <Z> in `man zshoptions`)
# but without `aliases`. Aliases in functions are expanded when functions are
# defined, so if we disable aliases here, we'll be sure to have no pesky
# aliases in any of our functions. This way we won't need prefix every
# command with `command` or to quote every word to defend against global
# aliases. Note that `aliases` is not the only option that's important to
# 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'
# 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
# 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_comprun() {
if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then
_fzf_comprun "$@"
elif [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; }; then
shift
if [ -n "${FZF_TMUX_OPTS-}" ]; then
fzf-tmux ${(Q)${(Z+n+)FZF_TMUX_OPTS}} -- "$@"
else
fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%} -- "$@"
fi
else
shift
fzf "$@"
fi
}
# Extract the name of the command. e.g. foo=1 bar baz**<tab>
__fzf_extract_command() {
local token tokens
tokens=(${(z)1})
for token in $tokens; do
token=${(Q)token}
if [[ "$token" =~ [[:alnum:]] && ! "$token" =~ "=" ]]; then
echo "$token"
return
fi
done
echo "${tokens[1]}"
}
__fzf_generic_path_completion() {
local base lbuf cmd compgen fzf_opts suffix tail dir leftover matches
base=$1
lbuf=$2
cmd=$(__fzf_extract_command "$lbuf")
compgen=$3
fzf_opts=$4
suffix=$5
tail=$6
setopt localoptions nonomatch
eval "base=$base"
[[ $base = *"/"* ]] && dir="$base"
while [ 1 ]; do
if [[ -z "$dir" || -d ${dir} ]]; then
leftover=${base/#"$dir"}
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
item="${item%$suffix}$suffix"
echo -n "${(q)item} "
done)
matches=${matches% }
if [ -n "$matches" ]; then
LBUFFER="$lbuf$matches$tail"
fi
zle reset-prompt
break
fi
dir=$(dirname "$dir")
dir=${dir%/}/
done
}
_fzf_path_completion() {
__fzf_generic_path_completion "$1" "$2" _fzf_compgen_path \
"-m" "" " "
}
_fzf_dir_completion() {
__fzf_generic_path_completion "$1" "$2" _fzf_compgen_dir \
"" "/" ""
}
_fzf_feed_fifo() (
command rm -f "$1"
mkfifo "$1"
cat <&0 > "$1" &
)
_fzf_complete() {
setopt localoptions ksh_arrays
# Split arguments around --
local args rest str_arg i sep
args=("$@")
sep=
for i in {0..${#args[@]}}; do
if [[ "${args[$i]-}" = -- ]]; then
sep=$i
break
fi
done
if [[ -n "$sep" ]]; then
str_arg=
rest=("${args[@]:$((sep + 1)):${#args[@]}}")
args=("${args[@]:0:$sep}")
else
str_arg=$1
args=()
shift
rest=("$@")
fi
local fifo lbuf cmd matches post
fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$"
lbuf=${rest[0]}
cmd=$(__fzf_extract_command "$lbuf")
post="${funcstack[1]}_post"
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' ' ')
if [ -n "$matches" ]; then
LBUFFER="$lbuf$matches"
fi
command rm -f "$fifo"
}
_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_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
)
}
_fzf_complete_export() {
_fzf_complete -m -- "$@" < <(
declare -xp | sed 's/=.*//' | sed 's/.* //'
)
}
_fzf_complete_unset() {
_fzf_complete -m -- "$@" < <(
declare -xp | sed 's/=.*//' | sed 's/.* //'
)
}
_fzf_complete_unalias() {
_fzf_complete +m -- "$@" < <(
alias | sed 's/=.*//'
)
}
_fzf_complete_kill() {
_fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
command ps -ef | sed 1d
)
}
_fzf_complete_kill_post() {
awk '{print $2}'
}
fzf-completion() {
local tokens cmd prefix trigger tail matches lbuf d_cmds
setopt localoptions noshwordsplit noksh_arrays noposixbuiltins
# http://zsh.sourceforge.net/FAQ/zshfaq03.html
# http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
tokens=(${(z)LBUFFER})
if [ ${#tokens} -lt 1 ]; then
zle ${fzf_default_completion:-expand-or-complete}
return
fi
cmd=$(__fzf_extract_command "$LBUFFER")
# Explicitly allow for empty trigger.
trigger=${FZF_COMPLETION_TRIGGER-'**'}
[ -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]}"
tokens=(${tokens[0,-2]})
fi
lbuf=$LBUFFER
tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))}
# Trigger sequence given
if [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir})
[ -z "$trigger" ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}}
[ -n "${tokens[-1]}" ] && lbuf=${lbuf:0:-${#tokens[-1]}}
if eval "type _fzf_complete_${cmd} > /dev/null"; then
prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf}
zle reset-prompt
elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then
_fzf_dir_completion "$prefix" "$lbuf"
else
_fzf_path_completion "$prefix" "$lbuf"
fi
# Fall back to default completion
else
zle ${fzf_default_completion:-expand-or-complete}
fi
}
[ -z "$fzf_default_completion" ] && {
binding=$(bindkey '^I')
[[ $binding =~ 'undefined-key' ]] || fzf_default_completion=$binding[(s: :w)2]
unset binding
}
zle -N fzf-completion
bindkey '^I' fzf-completion
} always {
# Restore the original options.
eval $__fzf_completion_options
'unset' '__fzf_completion_options'
}

120
lib/.fzf/key-bindings.zsh Normal file
View file

@ -0,0 +1,120 @@
# ____ ____
# / __/___ / __/
# / /_/_ / / /_
# / __/ / /_/ __/
# /_/ /___/_/ 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
'emulate' 'zsh' '-o' 'no_aliases'
{
[[ -o interactive ]] || return 0
# CTRL-T - Paste the selected file path(s) into the command line
__fsel() {
local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
-o -type f -print \
-o -type d -print \
-o -type l -print 2> /dev/null | cut -b3-"}"
setopt localoptions pipefail no_aliases 2> /dev/null
local item
eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-}" $(__fzfcmd) -m "$@" | 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}$(__fsel)"
local ret=$?
zle reset-prompt
return $ret
}
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
# ALT-C - cd into the selected directory
fzf-cd-widget() {
local cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
-o -type d -print 2> /dev/null | cut -b3-"}"
setopt localoptions pipefail no_aliases 2> /dev/null
local dir="$(eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-}" $(__fzfcmd) +m)"
if [[ -z "$dir" ]]; then
zle redisplay
return 0
fi
zle push-line # Clear buffer. Auto-restored on next prompt.
BUFFER="builtin cd -- ${(q)dir}"
zle accept-line
local ret=$?
unset dir # ensure this doesn't end up appearing in prompt expansion
zle reset-prompt
return $ret
}
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
# 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
selected=( $(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' |
FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
local ret=$?
if [ -n "$selected" ]; then
num=$selected[1]
if [ -n "$num" ]; then
zle vi-fetch-history -n $num
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
} always {
eval $__fzf_key_bindings_options
'unset' '__fzf_key_bindings_options'
}

View file

@ -64,3 +64,5 @@ alias g="git"
## TODO: make lock state aware function ## TODO: make lock state aware function
is-executable gum && alias plz="gum input --prompt='🔒' --password | sudo -nS" is-executable gum && alias plz="gum input --prompt='🔒' --password | sudo -nS"
alias dockdots='docker run --rm -it -u "$(id -u):$(id -g)" -v "$PWD:/home/$USER/data" dots'

View file

@ -52,9 +52,9 @@ if is-executable lf; then
fi fi
# ---------------- # ----------------
# #
# if is-executable fnm && is-itty; then if is-executable fnm && ! is-tty; then
# eval "$(fnm env)" eval "$(fnm env --shell zsh)"
# fi fi
# #
if is-executable bat; then if is-executable bat; then
export BAT_THEME=Catppuccin export BAT_THEME=Catppuccin

View file

@ -2,11 +2,11 @@
# Auto-completion # Auto-completion
# --------------- # ---------------
[[ $- == *i* ]] && source "$HOME/.fzf/shell/completion.zsh" 2>/dev/null [[ $- == *i* ]] && source "$DOTFILES_DIR/lib/.fzf/completion.zsh" 2>/dev/null
# Key bindings # Key bindings
# ------------ # ------------
source "$HOME/.fzf/shell/key-bindings.zsh" [[ $- == *i* ]] && source "$DOTFILES_DIR/lib/.fzf/key-bindings.zsh" 2>/dev/null
# dracula # dracula
# FZF_COLORS=" # FZF_COLORS="