This commit is contained in:
2025-04-25 16:23:44 +02:00
parent 46e9b50a13
commit 04477c25bf
14 changed files with 1470 additions and 535 deletions

View File

@@ -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

View File

@@ -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"
}
]
}

View File

@@ -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,
}

View File

@@ -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 <f1> :Help<cr>
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<cr>
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<cr>
set history=100 undolevels=100
@@ -291,8 +290,8 @@
fileviewer <video/*>,<audio/*> mediainfo %c
endif
" #endregion FmediaBin
fileviewer .*/,*/ tree %c -L 3 &
fileviewer ../ tree %c -L 1 &
fileviewer .*/,*/ tree %c -L 3 -C &
fileviewer ../ tree %c -L 1 -C &
fileviewer *.js,*.mjs,*.ts,*.sh,
\*.css,*.scss,
\*.php,