updates

This commit is contained in:
Jan Andrle 2025-05-08 11:01:59 +02:00
parent 04477c25bf
commit 28f1604b78
Signed by: jaandrle
GPG Key ID: B3A25AED155AFFAB
6 changed files with 69 additions and 2575 deletions

View File

@ -8,7 +8,8 @@ source "$SCRIPT_DIR/complete-alias/complete_alias"
complete -F _complete_alias gitdotfiles
alias C--asana='eval "$($HOME/bin/asana.mjs completion_bash)"'
alias C--himalaya='\. "$BASH_DOTFILES/himalaya.completion"'
alias C--brew='\. "$BASH_DOTFILES/brew.completion"'
alias C--pnpm='\. "$BASH_DOTFILES/pnpm.completion"'
alias C--uu='eval "$($HOME/bin/uu --completion-bash)"'
alias C--jc='eval "$(jc -B)" … newer version needed'
\. <(bs .completion bash)
@ -16,7 +17,6 @@ alias C--jc='eval "$(jc -B)" … newer version needed'
\. <(node --completion-bash)
\. <(npm completion)
\. <(nodejsscript --completion bash)
\. "$BASH_DOTFILES/pnpm.completion"
_npx() {
local cur="${COMP_WORDS[COMP_CWORD]}"

File diff suppressed because it is too large Load Diff

View File

@ -61,6 +61,8 @@ if ! shopt -oq posix; then
fi
export GPG_TTY=$(tty)
shopt -s cdspell # autocorrects cd misspellings
# HSTR configuration - add this to ~/.bashrc
# if this is interactive shell, then bind hstr to Ctrl-space
# if [[ $- =~ .*i.* ]]; then bind '"\C-@": "\e^ihstr -- \C-j"'; fi

View File

@ -7,21 +7,25 @@
ui = auto
[branch]
sort = -committerdate
[rebase]
updateRefs = true
[tag]
sort = version:refname
[status]
branch = true
short = true
showStash = true
showUntrackedFiles = all
submoduleSummary = true
[log]
date = iso
[fetch]
prune = true
pruneTags = true
all = true
[push]
autoSetupRemote = true
followTags = true
recurseSubmodules = on-demand
[pull]
rebase = true
[rerere]
enabled = true
autoupdate = true
@ -31,6 +35,7 @@
[commit]
verbose = true
gpgsign = true
template = ~/.config/git/template
[rebase]
autoSquash = true
autoStash = true
@ -44,41 +49,35 @@
# 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
compression = 9 # trade cpu for network
[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
checkout-default= !git checkout `git branch-default`
# * (alias) aliases = !git config -l | grep ^alias | cut -c 7- | sort # List all aliases. Stolen from here: https://twitter.com/TrevorBramble/status/774292970681937920
branch-default = !git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'
branches = for-each-ref --sort=-committerdate refs --format=\"%(authordate:iso8601)\t%(color:blue)%(refname:short)%(HEAD)\t%(if:notequals="")%(upstream:short)%(then)→ %(upstream:short)%(color:reset)%(else)%(color:yellow)%(objectname:short)%(color:reset)\t%(contents:subject)%(end)\"
# * branches (↓) = for-each-ref --sort=-committerdate refs --format=\"%(authordate:iso8601)\t%(color:blue)%(refname:short)%(HEAD)\t%(if:notequals="")%(upstream:short)%(then)→ %(upstream:short)%(color:reset)%(else)%(color:yellow)%(objectname:short)%(color:reset)\t%(contents:subject)%(end)\"
h-branches = !echo 'brv (git-extras)'
tags = tag -l --sort=-creatordate --format='%(refname:short): [%(creatordate:short)] %(subject)'
# * authors: log-authors = shortlog -ns
log-list = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen[%ad] -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset'
log-list-nocolors = log --graph --pretty=format:'%h [%ad] -%d %s <%an>'
status--= !git fetch && git status && echo && echo Commits unpushed: && git log @{push}..HEAD && echo
commit--interactive-v= !clear && git status -sb | grep -v -e '^ M' & git commit --interactive -v
pu-shll-stash = !git stash && git pull && git push && git stash pop
unstage = reset HEAD --
undoall = reset --soft HEAD^
h-format-htma = !echo '%Cred%h%Creset %Cgreen[%ad] -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset'
commit--interactive= !clear && git status && git commit --interactive
h-unstage = !echo reset HEAD --
h-undoall = !echo reset --soft HEAD^
diff-dirs = diff --dirstat --find-copies --find-renames --histogram --color
submodule-foreach-status = !git submodule --quiet foreach 'git fetch' && git submodule foreach 'git status && echo'
# * delete-submodule: rm-submodule = !git submodule deinit -f $1 && rm -rf .git/modules/$1 && git rm -rf $1
h-submodule-delete = !echo 'delete-submodule (git-extras)' # * delete-submodule: rm-submodule = !git submodule deinit -f $1 && rm -rf .git/modules/$1 && git rm -rf $1
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`
[diff]
wsErrorHighlight = all
tool = vimdiff
submodule = log
algorithm = histogram
@ -101,7 +100,6 @@
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[diff "exif"]
textconv = exiftool
[difftool "kommitdiff"]
@ -114,3 +112,25 @@
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
[submodule]
recurse = true
[format]
coverLetter = auto
compactSummary = true
minimal = true
signOff = true
outputDirectory = .patches
thread = shallow
numbered = auto
[am]
# keepcr = true # to preserve line endings
threeWay = true
[sendemail]
anotate = true
smtpserver = smtp.centrum.cz
# chainReplyTo = false
suppresscc = self
smtpuser = andrle.jan@centrum.cz
smtpencryption = ssl
smtpserverport = 465

View File

@ -21,8 +21,8 @@
"exec": "yes",
"description": "AI Browser",
"glare": "AppImage",
"last_update": "2025-03-25T01:43:01Z",
"version": "3.7.1",
"last_update": "2025-04-01T05:57:12Z",
"version": "3.8.0",
"downloads": "/home/jaandrle/bin/pinokio"
},
{
@ -136,9 +136,9 @@
"group": "nondev",
"file_name": "fedistar.appimage",
"exec": "yes",
"last_update": "2025-03-03T15:06:09Z",
"last_update": "2025-04-08T11:56:38Z",
"downloads": "/home/jaandrle/bin/fedistar.appimage",
"version": "v1.11.1",
"version": "v1.11.3",
"glare": ".*amd64.*.AppImage"
},
{
@ -148,9 +148,9 @@
"group": "ai",
"file_name": "ollama",
"exec": "yes",
"last_update": "2025-03-22T02:56:08Z",
"last_update": "2025-04-26T09:16:02Z",
"downloads": "/home/jaandrle/bin/ollama",
"version": "v0.6.3-rc0",
"version": "v0.6.7-rc1",
"glare": "linux-amd64"
},
{
@ -173,8 +173,8 @@
"file_name": "vim",
"exec": "yes",
"downloads": "/home/jaandrle/bin/vim",
"version": "v9.1.1238",
"last_update": "2025-03-26T01:19:17Z",
"version": "v9.1.1355",
"last_update": "2025-04-30T01:25:38Z",
"glare": "GVim.*x86_64.*.AppImage"
},
{
@ -184,9 +184,9 @@
"group": "dev",
"file_name": "escrcpy.appimage",
"exec": "yes",
"last_update": "2025-02-17T13:16:44Z",
"last_update": "2025-04-27T07:04:58Z",
"downloads": "/home/jaandrle/bin/escrcpy.appimage",
"version": "v1.28.7",
"version": "v1.29.6",
"glare": ".*x86_64.*.AppImage"
},
{
@ -236,6 +236,18 @@
"glare": ".*main.*amd64.AppImage",
"last_update": "2025-02-23T18:15:49Z",
"version": "v0.11.5"
},
{
"repository": "konnektoren/konnektoren-mobile-app",
"group": "nondev",
"name": "Konnektoren",
"description": "Konnektoren Mobile App (learning german) — https://konnektoren.help/home/",
"file_name": "konnektoren",
"exec": "yes",
"downloads": "/home/jaandrle/bin/konnektoren",
"glare": "AppImage",
"last_update": "2025-04-27T07:33:51Z",
"version": "konnektoren-mobile-app-v0.1.4"
}
]
}

2
.vimrc
View File

@ -142,7 +142,7 @@
nmap <expr> š buffer_number("#")==-1 ? ":CocList --normal buffers\<cr>" : "\<c-^>"
nmap ě :CocList
nmap <leader>3 :buffers<cr>:b<space>
nmap <leader>š :CocList buffers<cr>
nmap <leader>š :CocList buffers<cr> | :syntax on<cr>
nmap č <leader>š
"" #endregion CN
"" #region FOS File(s) + Openning + Saving