From 04477c25bf6ec534adc8c3fd78833e5b8bc1f3d8 Mon Sep 17 00:00:00 2001 From: Jan Andrle Date: Fri, 25 Apr 2025 16:23:44 +0200 Subject: [PATCH] :zap: --- .bash/.bash_aliases | 5 +- .bash/.bash_completions | 8 +- .bashrc | 3 +- .config/git/config | 109 +- .config/github-releases/config.json | 24 +- .../User/Preferences.sublime-settings | 1 + .config/vifm/vifmrc | 11 +- .ssh/config | 2 + .vim/after/ftplugin/gitcommit/ai.vim | 6 - .vimrc | 124 +- bin/README.md | 1685 +++++++++++++---- bin/onedrive | 9 - bin/pocket-sh-add.sh | 10 - bin/§wallpaper_WCPOTD.mjs | 8 +- 14 files changed, 1470 insertions(+), 535 deletions(-) delete mode 100644 .vim/after/ftplugin/gitcommit/ai.vim delete mode 100755 bin/onedrive delete mode 100755 bin/pocket-sh-add.sh diff --git a/.bash/.bash_aliases b/.bash/.bash_aliases index 056a147..999fe39 100644 --- a/.bash/.bash_aliases +++ b/.bash/.bash_aliases @@ -152,13 +152,14 @@ alias §ck-grep='cat /usr/share/X11/locale/en_US.UTF-8/Compose ~/.XCompose | gre §cmdfu(){ curl "https://www.commandlinefu.com/commands/matching/$@/$(echo -n $@ | openssl base64)/plaintext"; } aai(){ [[ "$1" == '--help' ]] && ai ask --help && return 0; - echo "ai ask \"$*, thanks for your help\""; ai ask "\"$*, thanks for your help\""; + #echo "ai ask \"$*, thanks for your help\""; ai ask "\"$*, thanks for your help\""; + aipick -m "hi, would like to ask for help: $*\n…please response only with plain text to be used in terminal command without any explanation, thanks for your help"; } alias npx-wca='npx -y web-component-analyzer' alias npx-qnm='npx -y qnm' alias npx-hint='npx -y hint' -alias npx-markdown='nohup npx markserv' +alias npx-markdown='npx -y markserv' alias fzf=fzf-carroarmato0.fzf alias smerge='/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=sublime_merge --file-forwarding com.sublimemerge.App @@u %u @@' diff --git a/.bash/.bash_completions b/.bash/.bash_completions index 5793770..c6c23b5 100644 --- a/.bash/.bash_completions +++ b/.bash/.bash_completions @@ -11,11 +11,11 @@ alias C--asana='eval "$($HOME/bin/asana.mjs completion_bash)"' alias C--himalaya='\. "$BASH_DOTFILES/himalaya.completion"' alias C--uu='eval "$($HOME/bin/uu --completion-bash)"' alias C--jc='eval "$(jc -B)" … newer version needed' -eval "$(bs .completion bash)" +\. <(bs .completion bash) \. "$BASH_DOTFILES/cordova.completion" -eval "$(node --completion-bash)" -eval "$(npm completion)" -eval "$(nodejsscript --completion bash)" +\. <(node --completion-bash) +\. <(npm completion) +\. <(nodejsscript --completion bash) \. "$BASH_DOTFILES/pnpm.completion" _npx() { diff --git a/.bashrc b/.bashrc index 1876444..a2e10cd 100644 --- a/.bashrc +++ b/.bashrc @@ -12,7 +12,8 @@ shopt -s expand_aliases [ -f $BASH_DOTFILES/.bash_sdkman ] && . $BASH_DOTFILES/.bash_sdkman [ -f $BASH_DOTFILES/.bash_nvm ] && . $BASH_DOTFILES/.bash_nvm export NODE_COMPILE_CACHE=~/.cache/nodejs-compile-cache # https://nolanlawson.com/2024/10/20/why-im-skeptical-of-rewriting-javascript-tools-in-faster-languages/ -export PATH="$HOME/.local/bin:$PATH:/home/linuxbrew/.linuxbrew/bin" +export PATH="$HOME/.local/bin:$PATH" +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" [ -f $BASH_DOTFILES/.bash_completions ] && . $BASH_DOTFILES/.bash_completions # for Vim [[ $- != *i* ]] && return # If not running interactively, don't do anything diff --git a/.config/git/config b/.config/git/config index 39e9ce5..cedede1 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,5 +1,41 @@ +# better? defaults +[help] + autocorrect = prompt [init] defaultBranch = main +[column] + ui = auto +[branch] + sort = -committerdate +[rebase] + updateRefs = true +[tag] + sort = version:refname +[status] + submoduleSummary = true +[log] + date = iso +[fetch] + prune = true + pruneTags = true + all = true +[push] + autoSetupRemote = true + followTags = true +[rerere] + enabled = true + autoupdate = true +[gc] + reflogExpire = 200 + reflogExpireUnreachable = 90 +[commit] + verbose = true + gpgsign = true +[rebase] + autoSquash = true + autoStash = true + updateRefs = true +# me [user] name = Jan Andrle email = andrle.jan@centrum.cz @@ -7,6 +43,20 @@ [credential] # see https://stackoverflow.com/questions/5343068/is-there-a-way-to-cache-https-credentials-for-pushing-commits/18362082#18362082 helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret +[credential "https://github.com"] + helper = + helper = !/usr/bin/gh auth git-credential +[credential "https://gist.github.com"] + helper = + helper = !/usr/bin/gh auth git-credential +[credential "https://git.dhl.com"] + helper = + helper = !/usr/bin/gh auth git-credential +# my setup +[core] + editor = vim + pager = delta + whitespace = -trailing-space,-space-before-tab [alias] # * replaced by git-extras aliases = !git config -l | grep ^alias | cut -c 7- | sort # List all aliases. Stolen from here: https://twitter.com/TrevorBramble/status/774292970681937920 @@ -28,52 +78,39 @@ submodule-update-merge = submodule update --remote --merge set-upstream-to-current = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD` push-new=!git push -u origin `git rev-parse --abbrev-ref HEAD` -[core] - editor = vim - pager = delta - whitespace = -trailing-space,-space-before-tab -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true -[status] - submoduleSummary = true [diff] tool = vimdiff - colorMoved = default submodule = log -[merge] - tool = vimdiff - conflictstyle = diff3 -[log] - date = iso + algorithm = histogram +# https://git-scm.com/docs/git-diff#Documentation/git-diff.txt-code--color-movedltmodegtcode + colorMoved = dimmed-zebra + mnemonicPrefix = true + renames = true [interactive] diffFilter = delta --color-only +[merge] + tool = vimdiff + conflictstyle = zdiff3 [delta] # [dandavison/delta: A syntax-highlighting pager for git, diff, and grep output](https://github.com/dandavison/delta) syntax-theme= Visual Studio Dark+ navigate = true side-by-side = true line-numbers = true -[gc] - reflogExpire = 200 - reflogExpireUnreachable = 90 -[push] - autoSetupRemote = true -[commit] - gpgsign = true -[rerere] - enabled = true -[credential "https://github.com"] - helper = - helper = !/usr/bin/gh auth git-credential -[credential "https://gist.github.com"] - helper = - helper = !/usr/bin/gh auth git-credential -[credential "https://git.dhl.com"] - helper = - helper = !/usr/bin/gh auth git-credential +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[diff "exif"] + textconv = exiftool +[difftool "kommitdiff"] + cmd = kommitdiff \"$LOCAL\" \"$REMOTE\" +[mergetool "kommitmerge"] + cmd = kommitmerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" + trustExitCode = true + [maintenance] repo = /home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport repo = /home/jaandrle/Vzdálené/GitHub/DHLC-Internet-Networking-old - repo = /home/jaandrle/Vzdálené/GitHub/DGF-Certified-Supervisory-Academy + repo = /home/jaandrle/Vzdálené/GitHub/DGF-Certified-Supervisory-Academy \ No newline at end of file diff --git a/.config/github-releases/config.json b/.config/github-releases/config.json index a6216a4..7fd4ded 100644 --- a/.config/github-releases/config.json +++ b/.config/github-releases/config.json @@ -21,8 +21,8 @@ "exec": "yes", "description": "AI Browser", "glare": "AppImage", - "last_update": "2025-02-01T14:42:48Z", - "version": "3.6.0", + "last_update": "2025-03-25T01:43:01Z", + "version": "3.7.1", "downloads": "/home/jaandrle/bin/pinokio" }, { @@ -136,9 +136,9 @@ "group": "nondev", "file_name": "fedistar.appimage", "exec": "yes", - "last_update": "2025-01-09T12:37:14Z", + "last_update": "2025-03-03T15:06:09Z", "downloads": "/home/jaandrle/bin/fedistar.appimage", - "version": "v1.11.0", + "version": "v1.11.1", "glare": ".*amd64.*.AppImage" }, { @@ -148,9 +148,9 @@ "group": "ai", "file_name": "ollama", "exec": "yes", - "last_update": "2025-02-14T08:25:18Z", + "last_update": "2025-03-22T02:56:08Z", "downloads": "/home/jaandrle/bin/ollama", - "version": "v0.5.11", + "version": "v0.6.3-rc0", "glare": "linux-amd64" }, { @@ -173,8 +173,8 @@ "file_name": "vim", "exec": "yes", "downloads": "/home/jaandrle/bin/vim", - "version": "v9.1.1106", - "last_update": "2025-02-12T01:15:34Z", + "version": "v9.1.1238", + "last_update": "2025-03-26T01:19:17Z", "glare": "GVim.*x86_64.*.AppImage" }, { @@ -208,9 +208,9 @@ "group": "ai", "file_name": "jan", "exec": "yes", - "last_update": "2025-02-11T07:09:50Z", + "last_update": "2025-03-24T02:02:04Z", "downloads": "/home/jaandrle/bin/jan", - "version": "v0.5.15-rc9-beta", + "version": "v0.5.16", "glare": ".*x86_64.*.AppImage" }, { @@ -234,8 +234,8 @@ "exec": "yes", "downloads": "/home/jaandrle/bin/r-quick-share", "glare": ".*main.*amd64.AppImage", - "last_update": "2025-01-14T08:36:53Z", - "version": "v0.11.4" + "last_update": "2025-02-23T18:15:49Z", + "version": "v0.11.5" } ] } \ No newline at end of file diff --git a/.config/sublime-merge/Packages/User/Preferences.sublime-settings b/.config/sublime-merge/Packages/User/Preferences.sublime-settings index e2c94d1..0193363 100644 --- a/.config/sublime-merge/Packages/User/Preferences.sublime-settings +++ b/.config/sublime-merge/Packages/User/Preferences.sublime-settings @@ -9,4 +9,5 @@ "signature_error_highlighting": "no_public_key", "theme": "Merge Dark.sublime-theme", "expand_merge_commits_by_default": true, + "ignore_diff_white_space": false, } diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 129a649..0d04049 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -27,19 +27,18 @@ "" #region G – General " set vicmd=elvis\ -G\ termcap | " set vicmd=vile set vicmd=vim - "set vimhelp command! README :!vim ~/Dokumenty/GitHub/dotfiles/vifm/README.md command! Help :!vim ~/.config/vifm/vifm-help.txt map :Help - cabbrev help Help + " cabbrev help Help + set vimhelp if !has('win') set fusehome=/tmp/vifm_FUSE set slowfs=curlftpfs endif set syscalls norunexec " Automatically resolve symbolic links on l or Enter. - set nofollowlinks - set trash + set notrash nmap dd :!trash %"f nmap d? :exe "!clear && echo 'Native system trash (`trash-cli`): use `trash`|`trash-empty`|`trash-list`|`trash-put`|`trash-restore`|`trash-rm`' && trash-list | sort -r" | shell set history=100 undolevels=100 @@ -291,8 +290,8 @@ fileviewer