Skip to content

Commit

Permalink
feat: update configs
Browse files Browse the repository at this point in the history
Signed-off-by: Vladyslav Dukhin <[email protected]>
  • Loading branch information
primeare committed Jun 3, 2024
1 parent 26a3b99 commit 042a554
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 49 deletions.
30 changes: 25 additions & 5 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
followTags = true
[fetch]
prune = true
writeCommitGraph = true
[pull]
ff = only
rebase = true
[rebase]
updateRefs = true
[branch]
autosetupmerge = always
autosetuprebase = always
sort = -committerdate
[diff]
tool = vscode
renames = copies
Expand All @@ -30,25 +34,40 @@
[core]
editor = code --wait
pager = less --quit-if-one-screen
untrackedcache = true
fsmonitor = true
# whitespace = trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,cr-at-eol
[color]
ui = auto
[column]
ui = auto
[commit]
cleanup = strip
template = ~/.gitmessage
[rerere]
# Reuse Recorded Resolution
enabled = true
autoUpdate = true
[instaweb]
local = true
port = 4321
[alias]
# ex. (git s)
s = status --show-stash --ahead-behind --renames
# ex. (git c)
c = commit
c = commit --signoff
# ex. (git ca)
ca = commit --amend
ca = commit --signoff --amend
# ex. (git co main, git co -b feature, git co -)
co = checkout
# ex. (git b)
b = branch --all
# pull without rebase
pu = pull --no-rebase --ff --signoff
# pushes changes to the remote branch of the same name
# ex. (git p)
p = push origin HEAD
p = push origin HEAD # use --signed flag
fp = push --force-with-lease origin HEAD
# outputs the log graph of git history with statistics
# ex. (git l)
l = log --oneline --graph --decorate --stat --show-signature
Expand All @@ -62,4 +81,5 @@
file-log = log --follow --graph --decorate --patch --
# outputs a condensed summary of the working directory against the branch
# ex. (git summary, git summary main)
summary = diff --compact-summary
summary = diff --word-diff --compact-summary
# git maintenance start
2 changes: 1 addition & 1 deletion .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [macos-13, macos-14, macos-latest]
os: [macos-13, macos-14]
runs-on: ${{ matrix.os }}
steps:
- id: checkout
Expand Down
44 changes: 23 additions & 21 deletions .gitmessage
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
# <type>(<scope>): <subject>
# type: fix, feat, test, docs, refactor, perf, chore, build, ci, style, revert
# scope: common, core, client, server, router, service, changelog etc.
# subject: a succinct description of the change in imperative present tense
# ! after the type/scope, introduces a breaking change
# Ex. "feat(parser): add ability to parse arrays"
# Ex. "refactor(runtime)!: drop support for Node.js 10"
# Ex. "docs: correct spelling of CHANGELOG"
# |<---- Maximum Of 72 Characters | ---->|


# BODY (optional)
# Ex. "This reverts commit <commit-hash>."
# |<---- Maximum Of 72 Characters ---->|

# FOOTER (optional)
# Examples:
# BREAKING CHANGE: <description>
# Co-authored-by: name <[email protected]>
# Signed-off-by: name <[email protected]>
# Closes/Fixes/Resolves: #ISSUE-NUMBER or OWNER/REPOSITORY#ISSUE-NUMBER
# Refs #ISSUE-NUMBER (not a complete fix)
# ===========================
# Conventional commits Guide
# ===========================
# Summary:
# - <type>(<scope>): <subject>
# - max 72 chars, ideally fewer than 50
# - type: fix, feat, test, docs, refactor, perf, chore, build, ci, style, revert
# - scope: common, core, client, server, router, service, changelog etc.
# - subject: a succinct description of the change in imperative present tense
# - ! after the type/scope, introduces a breaking change
# Summary examples:
# - feat(parser): add ability to parse arrays
# - refactor(runtime)!: drop support for Node.js 10
# - docs: correct spelling of CHANGELOG
# Body (optional) examples:
# - This reverts commit <commit-hash>
# Trailer (optional) examples:
# - BREAKING CHANGE: <description>
# - Co-authored-by: name <[email protected]>
# - Signed-off-by: name <[email protected]>
# - Closes/Fixes/Resolves: #ISSUE-NUMBER or OWNER/REPOSITORY#ISSUE-NUMBER
# - Refs #ISSUE-NUMBER (not a complete fix)
# ===========================
91 changes: 70 additions & 21 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"editor.fontFamily": "Fira Code, monospace",
"editor.codeLensFontFamily": "Fira Code, monospace",
"editor.inlayHints.fontFamily": "Fira Code, monospace",
"editor.fontWeight": 400,
"editor.fontWeight": "400",
"editor.fontLigatures": true,
"editor.fontSize": 13,
"editor.inlayHints.fontSize": 10,
Expand All @@ -21,10 +21,11 @@
"editor.find.addExtraSpaceOnTop": false,
"editor.renderLineHighlight": "all",
"editor.occurrencesHighlight": "multiFile",
"editor.suggest.localityBonus": true,
"editor.suggest.preview": true,
"editor.suggestSelection": "first",
"editor.snippetSuggestions": "top",
"editor.suggest.localityBonus": true,
"editor.suggest.showStatusBar": true,
"editor.suggestSelection": "recentlyUsedByPrefix",
"editor.snippetSuggestions": "inline",
"editor.accessibilitySupport": "off",
"editor.unicodeHighlight.ambiguousCharacters": true,
"editor.unicodeHighlight.invisibleCharacters": true,
Expand Down Expand Up @@ -52,25 +53,31 @@
"source.fixAll": "never",
"source.fixAll.eslint": "explicit",
"source.sortImports": "explicit",
"source.addMissingImports": "explicit"
"source.addMissingImports": "explicit",
"source.organizeImports": "never"
},

// Window
"window.zoomLevel": 0,
"window.zoomPerWindow": true,
"window.nativeTabs": true,
"window.titleBarStyle": "native",
"window.titleBarStyle": "custom",
"window.title": "${rootName}",
"window.newWindowDimensions": "maximized",
"window.confirmBeforeClose": "keyboardOnly",
"window.restoreFullscreen": true,
"window.confirmBeforeClose": "always",
"window.autoDetectColorScheme": true,
"window.dialogStyle": "custom",
"window.customTitleBarVisibility": "auto",
"window.systemColorTheme": "auto",

// Workbench
"workbench.colorTheme": "Default Dark Modern",
"workbench.iconTheme": "vscode-icons",
"workbench.productIconTheme": "Default",
"workbench.startupEditor": "none",
"workbench.sideBar.location": "right",
// "workbench.fontAliasing": "antialiased",
"workbench.activityBar.location": "top",
"workbench.editor.empty.hint": "hidden",
"workbench.editor.highlightModifiedTabs": true,
"workbench.editor.closeOnFileDelete": true,
Expand All @@ -85,6 +92,8 @@
"workbench.editor.limit.perEditorGroup": true,
"workbench.editor.limit.value": 7,
"workbench.editor.dragToOpenWindow": false,
"workbench.editor.customLabels.enabled": true,
"workbench.editor.customLabels.patterns": {},
"workbench.tree.enableStickyScroll": true,
"workbench.tree.stickyScrollMaxItemCount": 7,
"workbench.tree.renderIndentGuides": "always",
Expand All @@ -101,6 +110,8 @@
"files.eol": "\n",
"files.defaultLanguage": "${activeEditorLanguage}",
"files.readonlyFromPermissions": true,
"files.autoSaveWhenNoErrors": true,
"files.restoreUndoStack": true,

// Explorer
"explorer.confirmDelete": true,
Expand All @@ -110,14 +121,18 @@
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
"*.js": "${capture}.js.map, $(capture).*.js, $(capture)_*.js, ${capture}.d.ts",
"*.js": "${capture}.js.map, $(capture).*.js, $(capture)_*.js, ${capture}.d.ts, ${capture}.d.ts.map",
"*.mjs": "$(capture).mjs.map, $(capture).*.mjs, $(capture)_*.mjs",
"*.cjs": "$(capture).cjs.map, $(capture).*.cjs, $(capture)_*.cjs",
"*.ts": "$(capture).d.ts, $(capture).d.ts.map, $(capture).*.ts, $(capture)_*.ts",
"*.tsx": "$(capture).*.tsx, $(capture)_*.tsx",
"*.css": "$(capture).css.map, $(capture).*.css",
"package.json": "package-lock.json, npm-shrinkwrap.json, .npm*",
".env": "*.env, .env.*",
"package.json": "package-lock.json, npm-shrinkwrap.json, .npm*, .pnp.*, .pnpm*, yarn*, .yarnrc*, lerna*",
".env": "*.env, .env.*, .envrc, env.d.ts",
".gitignore": ".gitattributes, .gitmodules, .gitmessage, .mailmap, .git-blame*",
"Dockerfile": "*.dockerfile, .devcontainer.*, .dockerignore, docker-compose.*, compose.*, dockerfile*",
"go.mod": "go.sum",
"go.work": "go.work.sum"
},

// Search
Expand All @@ -140,6 +155,15 @@
// Accessibility
"accessibility.dimUnfocused.enabled": true,
"accessibility.dimUnfocused.opacity": 0.75,
"accessibility.signals.onDebugBreak": {
"sound": "on"
},
"accessibility.signals.terminalCommandFailed": {
"sound": "on"
},
"accessibility.signals.terminalBell": {
"sound": "on"
},

// Terminal
"terminal.explorerKind": "external",
Expand All @@ -148,6 +172,7 @@
"terminal.integrated.shellIntegration.decorationsEnabled": "both",
"terminal.integrated.shellIntegration.suggestEnabled": true,
"terminal.integrated.fontFamily": "Fira Code, monospace",
"terminal.integrated.fontWeight": "400",
"terminal.integrated.cursorStyle": "line",
"terminal.integrated.cursorStyleInactive": "none",
"terminal.integrated.enablePersistentSessions": false,
Expand All @@ -159,21 +184,16 @@
"terminal.integrated.cursorBlinking": true,
"terminal.integrated.gpuAcceleration": "on",
"terminal.integrated.customGlyphs": true,
"terminal.integrated.enableBell": true,
"terminal.integrated.hideOnStartup": "whenEmpty",
"terminal.integrated.stickyScroll.enabled": true,
"terminal.integrated.enableVisualBell": true,
"terminal.integrated.autoReplies": {
"Terminate batch job (Y/N)": "Y\r"
},

// Keyboard
"keyboard.touchbar.enabled": false,

// Audio Cues
"audioCues.onDebugBreak": "on",
"audioCues.terminalCommandFailed": "on",
"audioCues.terminalQuickFix": "on",

// Debug
"debug.inlineValues": "on",
"debug.toolBarLocation": "floating",
Expand All @@ -193,6 +213,7 @@
"mdb.sendTelemetry": false,

// Extensions
"extensions.autoCheckUpdates": true,
"extensions.closeExtensionDetailsOnViewChange": true,
"extensions.ignoreRecommendations": true,

Expand Down Expand Up @@ -229,18 +250,27 @@
"git.enableStatusBarSync": false,
"git.mergeEditor": false,
"git.untrackedChanges": "separate",
"git.autofetch": true,
"git.decorations.enabled": true,
"git.allowNoVerifyCommit": false,
"git.allowForcePush": false,
"git.inputValidation": true,
"git.inputValidationLength": 72,
"git.inputValidationSubjectLength": 72,
"git.useEditorAsCommitInput": true,
"git.terminalGitEditor": true,
"scm.diffDecorationsIgnoreTrimWhitespace": "false",
"scm.workingSets.enabled": true,
"scm.workingSets.default": "current",
"[git-commit]": {
// git commit message subject max length is 72 characters on GitHub
// but even better to keep a subject shorter (less than 50)
"editor.rulers": [50, 72],
"workbench.editor.restoreViewState": false
},
"[scminput]": {
"editor.rulers": [50, 72],
},

// GitHub
"github.gitProtocol": "ssh",
Expand Down Expand Up @@ -300,7 +330,8 @@
// Emmet
"emmet.showSuggestionsAsSnippets": true,
"emmet.triggerExpansionOnTab": true,
"emmet.showExpandedAbbreviation": "inMarkupAndStylesheetFilesOnly",
"emmet.showExpandedAbbreviation": "always",
"emmet.useInlineCompletions": true,
"emmet.preferences": {
"bem.elementSeparator": "__",
"bem.modifierSeparator": "--",
Expand Down Expand Up @@ -396,7 +427,10 @@
"jsonc",
"prisma",
"properties",
"shellscript"
"shellscript",
"git-commit",
"git-rebase",
"commit-msg"
],
"cSpell.userWords": [
"screencast",
Expand Down Expand Up @@ -440,7 +474,7 @@
"path-intellisense.showHiddenFiles": true,

// Markdown All in One (Extension)
"markdown.extension.preview.autoShowPreviewToSide": true,
"markdown.extension.preview.autoShowPreviewToSide": false,
"markdown.extension.orderedList.autoRenumber": true,
"markdown.extension.toc.levels": "2..6",
"markdown.extension.toc.slugifyMode": "github",
Expand All @@ -453,5 +487,20 @@

// Figma (Extension)
"figma.autocompleteProperties": true,
"figma.autocompleteBlocks": true
"figma.autocompleteBlocks": true,

// Turbo Console Log (extension)
"turboConsoleLog.addSemicolonInTheEnd": true,
"turboConsoleLog.delimiterInsideMessage": "~",
"turboConsoleLog.includeFileNameAndLineNum": true,
"turboConsoleLog.insertEmptyLineAfterLogMessage": false,
"turboConsoleLog.insertEmptyLineBeforeLogMessage": false,
"turboConsoleLog.insertEnclosingClass": true,
"turboConsoleLog.insertEnclosingFunction": true,
"turboConsoleLog.logFunction": "log",
"turboConsoleLog.logMessagePrefix": "",
"turboConsoleLog.logMessageSuffix": "",
"turboConsoleLog.logType": "log",
"turboConsoleLog.quote": "'",
"turboConsoleLog.wrapLogMessage": false
}
3 changes: 2 additions & 1 deletion setup
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ LINKING_MAP=(
"$SCRIPT_DIR/.config/fish/functions:$HOME/.config/fish"
"$SCRIPT_DIR/.config/starship.toml:$HOME/.config/starship.toml"
"$SCRIPT_DIR/.vscode/settings.json:$HOME/Library/Application Support/Code/User/settings.json"
"$SCRIPT_DIR/.vscode/global.code-snippets:$HOME/Library/Application Support/Code/User/snippets/global.code-snippets"
)

# print macOS version information
Expand Down Expand Up @@ -60,7 +61,7 @@ fi

# create directories if they don't exist
mkdir -p -v "$HOME/.config/fish"
mkdir -p -v "$HOME/Library/Application Support/Code/User"
mkdir -p -v "$HOME/Library/Application Support/Code/User/snippets"

# create symbolic links to file and directories in the .dotfiles
for LINK in "${LINKING_MAP[@]}"; do
Expand Down

0 comments on commit 042a554

Please sign in to comment.