From e1893b1b31503adaa2c2484b57a5d7a4a5d0516c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 14 Aug 2023 21:37:08 +0200 Subject: [googoo] fixed destination argument not working --- config/essentials/zsh/functions.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 3c5f11f..e0eeb45 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -49,7 +49,7 @@ _googoo_fzf_opt () o () { _googoo_fzf_opt "$1" - f="$(goo f "dest" | fzf $opt)" + f="$(goo f "$dest" | fzf $opt)" test "$1" && shift test -f "$f" && $EDITOR $@ "$f" } -- cgit v1.2.3 From 85dbd4176e214696b0ed0892f7fe6c0bce2bc828 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:04:14 +0200 Subject: [luasnip.lua] renamed die to log and logn log and logn seem like better names, also because now we use printf we make an apart logn function that adds a newline on the end. --- config/essentials/nvim/after/plugin/luasnip.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 7ee274f..5b45d11 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -155,18 +155,20 @@ ls.add_snippets("sh", { stty \$old_stty_cfg } ]], {}), - parse("fdie", + parse("flogn", [[ - die () + logn () { - echo "\$@" >&2 + >&2 printf '%s\n' "\$@" } ]], {}), - s("die", fmt( + parse("flog", [[ - die "{}: {}"{} - ]], - { c(1, {t "I", t "E", t "W"}), i(2), i(0) })), + log () + { + >&2 printf '%s' "\$@" + } + ]], {}), s("inp", fmt( [[ test -z "${{{}:=$1}}" && -- cgit v1.2.3 From edf8bc8432bb17854b5ef5667864ed58550956d1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:06:44 +0200 Subject: [functions.zsh] changed function name format --- config/essentials/zsh/functions.zsh | 60 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index e0eeb45..dee883f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -1,6 +1,6 @@ #!/bin/zsh -die () +die() { echo "$@" >&2 } @@ -39,34 +39,34 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit } ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit } # googoo aliases -_googoo_fzf_opt () +_googoo_fzf_opt() { if [ "$1" ] then [ -d "$1" ] && dest="$1" || opt="-q $1" fi } -o () +o() { _googoo_fzf_opt "$1" f="$(goo f "$dest" | fzf $opt)" test "$1" && shift test -f "$f" && $EDITOR $@ "$f" } -go () +go() { _googoo_fzf_opt "$1" d="$(goo d "$dest" | fzf $opt)" test -d "$d" && cd "$d" } -ogo () +ogo() { _googoo_fzf_opt "$1" d="$(dirname "$(goo f "$dest")" | fzf $opt)" test -d "$d" && cd "$d" } -ipc () +ipc() { if [[ "$(ip link show eno1 | awk -F, 'NR=1 {print $3}')" == "UP" ]] then @@ -76,22 +76,20 @@ ipc () fi } -calc () { echo "$@" | bc -l | numfmt --grouping; } - -psgrep () +psgrep() { [ $# -eq 0 ] && return 1 pgrep "$@" | xargs ps } -unique () { +unique() { local f f="$(mktemp)" awk '!x[$0]++' "$1" > "$f" mv "$f" "$1" } -clip () { +clip() { if [ "$WAYLAND_DISPLAY" ] then echo -n "$@" | wl-copy @@ -100,7 +98,7 @@ clip () { fi } -unzipp () { +unzipp() { file=$1 shift unzip $file $@ || exit 1 @@ -108,18 +106,18 @@ unzipp () { } # fix long waiting time -__git_files () { +__git_files() { _wanted files expl 'local files' _files } -esc () { +esc() { $EDITOR "$(which $1)" } -delfile () { +delfile() { curl "${2:-https://upfast.cronyakatsuki.xyz/delete/$1}" } -upfile () { +upfile() { curl -F "file=@\"$1\"" ${2:-https://upfast.cronyakatsuki.xyz} } @@ -177,7 +175,7 @@ function git_develop_branch() { } # gpg backup -gpg_backup () +gpg_backup() { gpg --export-secret-keys --armor > private.asc gpg --export --armor > public.asc @@ -186,7 +184,7 @@ gpg_backup () shred -uz {public,private,trust}.asc } -gpg_import () +gpg_import() { tar xf $1 shred -uz $1 @@ -196,29 +194,29 @@ gpg_import () shred -uz {public,private,trust}.asc } -ngenable () +ngenable() { ln -sf /etc/nginx/sites-available/$1 /etc/nginx/sites-enabled/ } -vbsr () +vbsr() { vboxmanage snapshot "$1" restore "$2" && vboxmanage startvm "$1" || vboxmanage controlvm "$1" poweroff } -vbsrr () +vbsrr() { vbsr "$1" "$2" sleep 3 vbsr "$1" "$2" } -vbst () +vbst() { vboxmanage snapshot "$1" take "$2" } -pacsize () +pacsize() { if test -n "$1"; then packages="$@" @@ -232,7 +230,7 @@ pacsize () expac '%m %n' - | numfmt --to=iec-i --suffix=B --format="%.2f" } -pkbs () +pkbs() { pkgfile -b "$1" | tee /dev/stderr | doas pacman -S - } @@ -247,7 +245,7 @@ mime-default () die "Done." } -addedkeys () { +addedkeys() { find ~/.ssh -iname "*.pub" | while read key do local fingerprint="$(ssh-keygen -lf "$key" 2>/dev/null)" @@ -258,7 +256,7 @@ addedkeys () { done | sed "s,$HOME/.ssh/,," } -fpass () { +fpass() { find $HOME/.password-store -type f -not -path ".git" | grep "\.gpg$" | sed "s,$HOME/.password-store/,,;s,\.gpg$,," | @@ -266,22 +264,22 @@ fpass () { xargs pass show -c } -oclip () +oclip() { printf "\033]52;c;$(echo -n "$@" | base64)\a" } -sms () +sms() { ssh phone sendmsg "$1" "'$2'" } -trcp () +trcp() { scp "$1" db:/media/basilisk/downloads/transmission/torrents/ } -muttmail () +muttmail() { die -n "email set: " ls $HOME/.config/mutt/configs | @@ -292,7 +290,7 @@ muttmail () read && mutt } -resize () +resize() { test $# -lt 2 && printf "usage: %s [out]\n" "$0" >&2 && -- cgit v1.2.3 From dd75534e1878d7934d0a402a70e20d24226fcd8e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:07:02 +0200 Subject: [functions.zsh] renamed die to log --- config/essentials/zsh/functions.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index dee883f..0d4b8a5 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -1,9 +1,7 @@ #!/bin/zsh -die() -{ - echo "$@" >&2 -} +log() { >&2 printf '%s' "$@"; } +logn() { >&2 printf '%s\n' "$@"; } awnk() { awk "{print \$$1}" -- cgit v1.2.3 From 2321b913f89f2bc678c8931db05e0eb5898d7191 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:09:07 +0200 Subject: [functions.zsh] added ginit function to init a dir on db remote --- config/essentials/zsh/functions.zsh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 0d4b8a5..6c2437f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -138,16 +138,24 @@ sgd () { unset d } -# Git functions +ginit() +{ + [ "$1" ] || return 1 + ssh db /var/git/initdir.sh "$1" + git remote add origin git@db:"$1.git" + git push --set-upstream origin $(git_current_branch) +} + # Returns current branch -function git_current_branch() +git_current_branch() { command git rev-parse --git-dir &>/dev/null || return git branch --show-current } # Check if main exists and use instead of master -function git_main_branch() { +git_main_branch() +{ command git rev-parse --git-dir &>/dev/null || return local ref for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do -- cgit v1.2.3 From 15d604ed1c9e0b74663ab4271a9ce17ded2889e2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:07:48 +0200 Subject: [aliases.zsh] added calc alias --- config/essentials/zsh/aliases.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 9849b93..4185999 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -15,6 +15,8 @@ then alias ogo/='ogo /' alias ogo/s='ogo /srv' + alias calc='bc <<<' + if [ "$WAYLAND_DISPLAY" ] then alias -g clipp='wl-copy -n' @@ -145,7 +147,6 @@ alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb' # ssh alias sha='ssh-add' alias sshs='eval "$(ssh-agent)" && ssh-add' - alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i' alias whatsmyip='curl -s "ifconfig.co"' alias icognito='unset HISTFILE' -- cgit v1.2.3 From 0ea5e7a97b7ccba919d5c495e3e328b30cec9e03 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:08:46 +0200 Subject: [functions.zsh] removed unecessary tests --- config/essentials/zsh/functions.zsh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 6c2437f..eb776f0 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -54,14 +54,20 @@ o() go() { _googoo_fzf_opt "$1" - d="$(goo d "$dest" | fzf $opt)" - test -d "$d" && cd "$d" + cd "$(goo d "$dest" | fzf $opt)" } ogo() { _googoo_fzf_opt "$1" - d="$(dirname "$(goo f "$dest")" | fzf $opt)" - test -d "$d" && cd "$d" + cd "$(dirname "$(goo f "$dest")" | fzf $opt)" +} +dgo() +{ + cd "$(goo d | fzf --filter "$@" | head -n 1)" +} +open() +{ + $EDITOR "$(goo f | fzf --filter "$@" | head -n 1)" } ipc() -- cgit v1.2.3 From 63c16da0da3e9b0cdc3fb6f9cd3031dc2297a09c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:26:23 +0200 Subject: [.zshrc] refactored git_parse_remote use cut instead of sed to get the state of the remote, now you could use this command: git branch -v 2> /dev/null | sed '/^*/!d;s/^[^[]*\[\([^ ]*\).*$/\1/' but at this point, it feels more like intellectual masturbation. --- config/essentials/zsh/.zshrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 0665533..769c805 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -121,13 +121,13 @@ RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(par setopt prompt_subst parse_git_remote() { - b="$(git branch -v 2> /dev/null | grep "^*" | sed 's/.\+\[\([^ ]\+\).*$/\1/')" + b="$(git branch -v 2>/dev/null | grep "^*" | cut -f2 -d'[' | cut -f1 -d' ')" if [ "$b" = "behind" ] then - echo -n "↓ " + printf "↓ " elif [ "$b" = "ahead" ] then - echo -n "↑ " + printf "↑ " fi } parse_git_branch() { -- cgit v1.2.3 From c2b8ef4441a00d2cead2b529487718caa5bd8a8c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:04:15 +0200 Subject: [nvim] changed die to log and logn snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 5b45d11..5657560 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -157,17 +157,11 @@ ls.add_snippets("sh", { ]], {}), parse("flogn", [[ - logn () - { - >&2 printf '%s\n' "\$@" - } + logn () { >&2 printf '%s\n' "\$@"; } ]], {}), parse("flog", [[ - log () - { - >&2 printf '%s' "\$@" - } + log () { >&2 printf '%s' "\$@"; } ]], {}), s("inp", fmt( [[ -- cgit v1.2.3 From fce05e8d2257fc7a562afc1089c6290902aa4aa9 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:04:51 +0200 Subject: [nvim] use printf instead of echo for sh remaps --- config/essentials/nvim/ftplugin/sh.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 01b20d6..169059c 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,6 +1,6 @@ -vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"") -vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"") -vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"A") -vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"A") +vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"") +vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"") +vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"A") +vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"A") vim.keymap.set({"i", "n"}, "v", "A)\"I\"$(I") vim.opt.formatoptions = "cqrnj" -- cgit v1.2.3 From 696accd7fca3788193d8871bc3759074ef98e524 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:05:16 +0200 Subject: [nvim] added NetworkEssentials vault --- config/essentials/nvim/lua/user/zk.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 613c8e5..8004238 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -50,6 +50,11 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, + NetworkEssentials = { + home = home .. "/" .. "NetworkEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, C = { home = home .. "/" .. "C", template_new_note = home .. "/" .. "templates/new_note.md", -- cgit v1.2.3 From c6a1ae689420321c37d66055d8c09d0d2a3f784e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:32:48 +0200 Subject: [nvim] use stderr on printf --- config/essentials/nvim/ftplugin/sh.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 169059c..e18170a 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,6 +1,6 @@ -vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"") -vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"") -vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"A") -vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"A") +vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2\"") +vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2: %s\\\\n\" \"$\\2\"") +vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2\"A") +vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2: %s\\\\n\" \"$\\2\"A") vim.keymap.set({"i", "n"}, "v", "A)\"I\"$(I") vim.opt.formatoptions = "cqrnj" -- cgit v1.2.3 From 9172676556847ff625cbf4b4eff19f441e0b9386 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:33:19 +0200 Subject: [aliases] edited aliases removed aliases that have been replaced such as floc and dloc, and added more aliases --- config/essentials/zsh/aliases.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 4185999..a1bbf50 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -5,9 +5,6 @@ if [ $SHELL = "/bin/zsh" ] then # googoo aliases - alias o.='o .' - alias go.='go .' - alias ogo.='ogo .' alias o/='o /' alias o/s='o /srv' alias go/='go /' @@ -133,10 +130,6 @@ alias df='df -h' alias diff='diff -u --color' alias shred='shred -uz' alias lsblk='lsblk -o name,type,fsused,fsavail,size,fstype,label,mountpoint' -alias floc='doas find / -type "f" 2> /dev/null | grep' -alias dloc='doas find / -type "d" 2> /dev/null | grep' -alias fif='find . -type "f" | grep' -alias fid='find . -type "d" | grep' alias sxt='sxiv -t' alias wgsh='wget --quiet --show-progress' alias wgc='wgsh "$(clipo)"' @@ -185,6 +178,7 @@ alias rmd='rm -f *.{orig,rej}' alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite' alias gdate='date +%y_%m_%d-%T' alias tpid='tail -f /dev/null --pid' +alias pwdcp='pwd | clipp' alias vbm='vboxmanage' alias vbls='vbm list vms' @@ -217,6 +211,7 @@ alias cdpa='cd ~/pics/ai-outputs/' alias cdpp='cd ~/proj/personal/' alias chom='cd ~/proj/personal/homepage' alias lov='cd ~/proj/personal/lola' +alias cdsh='~/proj/personal/scheduler' alias cdsw='cd ~/proj/personal/WheelAdvisor' alias cddm='cd ~/proj/suckless/dmenu' alias cdw='cd ~/proj/suckless/dwm' @@ -238,6 +233,8 @@ alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' # fzf aliases +alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n"| fzf)"' +alias cfg='find -L ~/src/dotfiles -type f | fzf | xargs -r $EDITOR' alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp' alias asf='alias | fzf' alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp" @@ -258,7 +255,6 @@ alias dbinf='ssh db dlinfo' alias sshdb='ssh -t db tmux a' alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' -alias cfg='git --git-dir=~/src/dotfiles/.git --work-tree=~/src/dotfiles' # oh-my-zsh git aliases alias g='git' alias ga='git add' -- cgit v1.2.3