diff options
| author | TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> | 2025-08-23 12:42:37 +0900 |
|---|---|---|
| committer | TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> | 2025-08-23 12:42:37 +0900 |
| commit | 07d294425a98ee5d1e22d03e2b24ae2c76e487c0 (patch) | |
| tree | a6818f0d64438c5fdb88b00a35d944f80c056213 /mac/.config/git | |
| parent | 6fc28cdb3529ca8ee864cb5c41674cb0a4af72a1 (diff) | |
updates
Diffstat (limited to 'mac/.config/git')
| -rw-r--r-- | mac/.config/git/attributes | 95 | ||||
| -rw-r--r-- | mac/.config/git/config | 84 | ||||
| -rw-r--r-- | mac/.config/git/gitk | 64 | ||||
| -rw-r--r-- | mac/.config/git/ignore | 116 |
4 files changed, 359 insertions, 0 deletions
diff --git a/mac/.config/git/attributes b/mac/.config/git/attributes new file mode 100644 index 0000000..2760f63 --- /dev/null +++ b/mac/.config/git/attributes @@ -0,0 +1,95 @@ +# Common settings that generally should always be used with your language specific settings + +# Auto detect text files and perform LF normalization +* text=auto eol=lf + +# +# The above will handle all files NOT found below +# + +# Documents +*.bibtex text diff=bibtex +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.md text diff=markdown +*.mdx text diff=markdown +*.tex text diff=tex +*.adoc text +*.textile text +*.mustache text +*.csv text eol=lf +*.tab text +*.tsv text +*.txt text +*.sql text eol=lf +*.epub diff=astextplain + +# Graphics +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +# SVG treated as text by default. +# *.svg text +# If you want to treat it as binary, +# use the following line instead. +*.svg binary +*.eps binary + +# Scripts +*.bash text eol=lf +*.fish text eol=lf +*.ksh text eol=lf +*.sh text eol=lf +*.zsh text eol=lf +# These are explicitly windows files and should use crlf +# *.bat text eol=crlf +# *.cmd text eol=crlf +# *.ps1 text eol=crlf + +# Serialisation +*.json text +*.toml text +*.xml text +*.yaml text +*.yml text + +# Archives +*.7z binary +*.bz binary +*.bz2 binary +*.bzip2 binary +*.gz binary +*.lz binary +*.lzma binary +*.rar binary +*.tar binary +*.taz binary +*.tbz binary +*.tbz2 binary +*.tgz binary +*.tlz binary +*.txz binary +*.xz binary +*.Z binary +*.zip binary +*.zst binary + +# Text files where line endings should be preserved +*.patch -text + +# Exclude files from exporting +.gitattributes export-ignore +.gitignore export-ignore +.gitkeep export-ignore diff --git a/mac/.config/git/config b/mac/.config/git/config new file mode 100644 index 0000000..578e556 --- /dev/null +++ b/mac/.config/git/config @@ -0,0 +1,84 @@ +[advice] + detachedHead = false +[core] + autocrlf = input + excludesFile = ~/.config/git/ignore + pager = delta +[color "status"] + added = green + branch = bold magenta + changed = yellow + untracked = blue +[credential] + helper = cache + helper = store + helper = !type pass-git-helper >/dev/null && pass-git-helper$@ +[delta] + blame-code-style = syntax + blame-palette = "#161617" "#1b1b1d" "#2a2a2d" "#3e3e43" + dark = true + features = mellow-barbet + file-style = brightwhite + file-decoration-style = none + file-added-label = [+] + file-copied-label = [==] + file-modified-label = [*] + file-removed-label = [-] + file-renamed-label = [->] + hunk-header-decoration-style = "#3e3e43" box ul + line-numbers = true + line-numbers-minus-style = brightred + line-numbers-plus-style = brightgreen + line-numbers-left-style = "#3e3e43" + line-numbers-right-style = "#3e3e43" + line-numbers-zero-style = "#57575f" + merge-conflict-begin-symbol = ~ + merge-conflict-end-symbol = ~ + merge-conflict-ours-diff-header-style = yellow bold + merge-conflict-ours-diff-header-decoration-style = "#3e3e43" box + merge-conflict-theirs-diff-header-style = yellow bold + merge-conflict-theirs-diff-header-decoration-style = "#3e3e43" box + minus-style = brightred black + minus-emph-style = black red + navigate = true # use n and N to move between diff sections + plus-style = brightgreen black + plus-emph-style = black green + syntax-theme = base16 + side-by-side = false + true-color = auto + whitespace-error-style = black bold + zero-style = syntax +[diff] + colorMoved = default + tool = vscode +[difftool "vscode"] + cmd = code --wait --diff $LOCAL $REMOTE +[include] + path = ~/.config/git/themes.gitconfig +[init] + defaultBranch = master +[interactive] + diffFilter = delta --color-only +[merge] + tool = vscode + conflictstyle = diff3 +[mergetool] + keepBackup = false +[mergetool "vscode"] + cmd = code --wait $MERGED +[pager] + branch = false + diff = delta + log = delta + reflog = delta + show = delta +[pull] + rebase = true + twohead = ort +[rerere] + enabled = true +[submodule] + recurse = true +[user] + name = TheSiahxyz + email = 164138827+TheSiahxyz@users.noreply.github.com diff --git a/mac/.config/git/gitk b/mac/.config/git/gitk new file mode 100644 index 0000000..7149c6b --- /dev/null +++ b/mac/.config/git/gitk @@ -0,0 +1,64 @@ +set mainfont {sans 9} +set textfont {monospace 9} +set uifont {sans 9 bold} +set tabstop 8 +set findmergefiles 0 +set maxgraphpct 50 +set maxwidth 16 +set cmitmode patch +set wrapcomment none +set autoselect 1 +set autosellen 40 +set showneartags 1 +set maxrefs 20 +set visiblerefs {"master"} +set hideremotes 0 +set showlocalchanges 1 +set datetimeformat {%Y-%m-%d %H:%M:%S} +set limitdiffs 1 +set uicolor grey85 +set want_ttk 1 +set bgcolor white +set fgcolor black +set uifgcolor black +set uifgdisabledcolor #999 +set colors {"#00ff00" red blue magenta darkgrey brown orange} +set diffcolors {"#c30000" "#009800" blue} +set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} +set markbgcolor #e0e0ff +set diffcontext 3 +set selectbgcolor gray85 +set foundbgcolor yellow +set currentsearchhitbgcolor orange +set extdifftool meld +set perfile_attrs 0 +set headbgcolor #00ff00 +set headfgcolor black +set headoutlinecolor black +set remotebgcolor #ffddaa +set tagbgcolor yellow +set tagfgcolor black +set tagoutlinecolor black +set reflinecolor black +set filesepbgcolor #aaaaaa +set filesepfgcolor black +set linehoverbgcolor #ffff80 +set linehoverfgcolor black +set linehoveroutlinecolor black +set mainheadcirclecolor yellow +set workingfilescirclecolor red +set indexcirclecolor #00ff00 +set circlecolors {white blue gray blue blue} +set linkfgcolor blue +set circleoutlinecolor black +set diffbgcolors {"#fff3f3" "#f0fff0"} +set web_browser xdg-open +set geometry(main) 755x1012+6+27 +set geometry(state) normal +set geometry(topwidth) 755 +set geometry(topheight) 210 +set geometry(pwsash0) "256 1" +set geometry(pwsash1) "385 1" +set geometry(botwidth) 323 +set geometry(botheight) 797 +set permviews {} diff --git a/mac/.config/git/ignore b/mac/.config/git/ignore new file mode 100644 index 0000000..ff7c3fb --- /dev/null +++ b/mac/.config/git/ignore @@ -0,0 +1,116 @@ +# Api/Keys +api.json +credentials + +# Backup files +*~ +*.swp + +# Bookmakrs +.vim-bookmarks + +# Compiled files +*.class +*.com +*.dll +*.exe +*.o +*.out +*.so + +# Compressed +*.7z +*.dmg +*.gz +*.iso +*.rar +*.tar +*.zip + +# Cookie +cookie + +# Database +*.db +*.sql +*.sqlite + +# Env +.direnv/ +.envrc +.env +.local.application.conf + +# Git +*.orig + +# GTK +gtkfilechooser.ini + +# History +.zcompdump + +# Hugo +public/* + +# IDE directories +.idea/ + +# Lock +*lock*.json + +# Log +*.log + +# Mac +**/.DS_Store +**/._.DS_Store +.DS_Store +._.DS_Store + +# Nvim +*vim/*.json + +# OS +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Private +*personal* + +# Shortcuts +shortcutrc +zshnameddirrc + +# Suckless +dmenu/dmenu +dmenu/stest +dwm/dwm +dwmblocks/dwmblocks +slock/slock +st/st +surf/surf + +# Tmux +*/tmux/plugins/ + +# Transmission +*/transmission-daemon/*/ +*/transmission-daemon/bandwidth-groups.json +*/transmission-daemon/stats.json +dht.dat + +# TheSiahxyz +thesiah.mom + +# Vim +*/vim/*/ + +# VS code +.vscode/ + +# thesiah.mom +*/thesiah/thesiah.mom |
