Skip to content

Commit

Permalink
style: add vim fold markers
Browse files Browse the repository at this point in the history
Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
  • Loading branch information
vladdoster committed Apr 13, 2022
1 parent 447cac3 commit 608ca15
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 208 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
.DEFAULT_GOAL := install
.ONESHELL:

# Variables [[[
CONFIGS:= hammerspoon neovim
GH_URL=https://github.com/vladdoster
hammerspoon: destination:=$$HOME/.hammerspoon
neovim: destination:=$$HOME/.config/nvim

#]]]
# Targets [[[
help: ## Display all Makfile targets
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
| sort \
Expand Down Expand Up @@ -109,3 +111,6 @@ build-container: ## Build container && install dotfiles
container: build-container ## Run containerized dockerfiles env
mkdir -p $$HOME/df-docker-volume || true
docker compose up --build
# ]]]

# vim:ft=zsh:sw=4:sts=4:et:foldmarker=[[[, ]]]:foldmethod=marker
8 changes: 4 additions & 4 deletions bin/.local/bin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PY_PROGS := \
isort \
mdformat mdformat-gfm mdformat-toc mdformat-config mdformat-black \
pynvim
# ]]]
#]]]
# Program tarball URLs [[[
aspell: URL:=$(GIT)/aspell/aspell/tarball
autoconf: URL:=$(GNU)/autoconf/autoconf-2.71.tar.gz
Expand Down Expand Up @@ -118,8 +118,8 @@ wget: URL:=$(GNU)/wget/wget-latest.tar.gz
yasm: URL:=$(GIT)/yasm/yasm/tarball

zsh: URL:=$(GIT)/zsh-users/zsh/tarball
# ]]]
# Make Targets [[[
#]]]
# Targets [[[
install : $(PROGS)
go-install : $(GO_PROGS)
py-install : $(PY_PROGS)
Expand Down Expand Up @@ -147,6 +147,6 @@ lua-format-deps:
brew install antlr \
antlr4-cpp-runtime \
yaml-cpp
# ]]]
#]]]

# vim:ft=zsh:sw=4:sts=4:et:foldmarker=[[[,]]]:foldmethod=marker
218 changes: 115 additions & 103 deletions git/.config/git/config
Original file line number Diff line number Diff line change
@@ -1,47 +1,44 @@
# options are alphabetically sorted except for aliases, which are last and
# user which is first because it is frequently modified.

# User [[[
[user]
email = "mvdoster@gmail.com"
name = "Vladislav Doster"
username = "vladdoster"
email = "mvdoster@gmail.com"
name = "Vladislav Doster"
username = "vladdoster"
[credential]
helper = cache --timeout=86400

[interactive]
diffFilter = delta --color-only

helper = cache --timeout=86400
#]]]
# Core [[[
[core]
autocrlf = false
editor = nvim
eol = lf
excludesfile = ~/.config/git/ignore
pager = delta
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
hooksPath = .husky

[commit]
template = ~/.config/git/commit-template
autocrlf = false
editor = nvim
eol = lf
excludesfile = ~/.config/git/ignore
pager = delta
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
#]]]

[color]
ui = auto
ui = auto
[diff]
colorMoved = default
tool = delta
colorMoved = default
tool = delta
[merge]
conflictstyle = diff3
conflictstyle = diff3

[commit]
template = ~/.config/git/commit-template
[pull]
rebase = true
rebase = true
[push]
default = current
followTags = true
default = current
followTags = true
[rerere]
enabled = 1
autoupdate = 1
enabled = 1
autoupdate = 1

[interactive]
diffFilter = delta --color-only --features=interactive
diffFilter = delta --color-only --features=interactive

# delta [[[
[delta]
features = line-numbers decorations
line-numbers = true
Expand All @@ -56,31 +53,35 @@
hunk-header-file-style = red
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax

#]]]
# homebrew [[[
[homebrew]
analyticsmessage = true
caskanalyticsmessage = true

analyticsmessage = true
caskanalyticsmessage = true
#]]]
# http(s) [[[
[http]
sslVerify = false
[https]
sslVerify = false
#]]]

[github]
user = vladdoster

[gitflow "prefix"]
versiontag = v
[gitflow "prefix"]# [[[
versiontag = v# ]]]


[alias]
aliases = !git config -l | grep alias | cut -c 7-
bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
merged = !sh -c 'git o master && git plom && git bd $1 && git rpo' -
# add [[[
a = add --all
ai = add -i
au = add -u
#############
ama = am --abort
amr = am --resolved
ams = am --skip
#############
au = add -u #]]]
# branch [[[
b = branch
ba = branch -a
bc = rev-parse --abbrev-ref HEAD
Expand All @@ -89,7 +90,26 @@
br = branch -r
bs = !git-branch-status
bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}"
#############
#]]]
# checkout [[[
o = checkout
om = checkout master
ob = checkout -b
opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1'
#]]]
# cherry-pick [[[
cp = cherry-pick
cpa = cherry-pick --abort
cpc = cherry-pick --continue
#]]]
# clone [[[
cl = clone
cld = clone --depth 1
clg = !sh -c 'git clone https://github.com/$1' -
clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' -
clgu = !sh -c 'git clone https://github.com/$(git config --get user.username)/$1 $1' -
#]]]
# commit [[[
c = commit --signoff
ca = commit -a
cm = commit -m
Expand All @@ -99,50 +119,48 @@
cdne = commit --amend --no-edit
cad = commit -a --amend
ced = commit --allow-empty --amend
#############
cl = clone
cld = clone --depth 1
clg = !sh -c 'git clone https://github.com/$1' -
clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' -
clgu = !sh -c 'git clone https://github.com/$(git config --get user.username)/$1 $1' -
#############
cp = cherry-pick
cpa = cherry-pick --abort
cpc = cherry-pick --continue
#############
co = checkout
cob = checkout -b
#############
#]]]]
# diff [[[
d = diff
ds = diff --staged
#############
#]]]
# fetch [[[
f = fetch
fo = fetch origin
fu = fetch upstream
#############
g = grep -p
#############
#]]]
# log [[[
l = log --oneline
lg = log --oneline --graph --decorate
#############
#]]]
# ls [[[
ls = ls-files
lsf = !git ls-files | grep -i
#############
o = checkout
om = checkout master
ob = checkout -b
opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1'
#############
#]]]
# pull [[[
pl = pull
pb = pull --rebase
plo = pull origin
pbo = pull --rebase origin
plom = pull origin master
ploc = !git pull origin $(git bc)
pbom = pull --rebase origin master
pboc = !git pull --rebase origin $(git bc)
plu = pull upstream
plum = pull upstream master
pluc = !git pull upstream $(git bc)
pbum = pull --rebase upstream master
pbuc = !git pull --rebase upstream $(git bc)
#]]]
# push [[[
ps = push
psf = push -f
psu = push -u
pst = push --tags
#############
psao = push --all origin
psfo = push -f origin
pso = push origin
psuo = push -u origin
#############
psom = push origin master
psaom = push --all origin master
psfom = push -f origin master
Expand All @@ -152,31 +170,15 @@
psfoc = !git push -f origin $(git bc)
psuoc = !git push -u origin $(git bc)
psdc = !git push origin :$(git bc)
#############
pl = pull
pb = pull --rebase
#############
plo = pull origin
pbo = pull --rebase origin
plom = pull origin master
ploc = !git pull origin $(git bc)
pbom = pull --rebase origin master
pboc = !git pull --rebase origin $(git bc)
#############
plu = pull upstream
plum = pull upstream master
pluc = !git pull upstream $(git bc)
pbum = pull --rebase upstream master
pbuc = !git pull --rebase upstream $(git bc)
#############
#]]]
# remote [[[
rv = remote --verbose
#############
#]]]
# restore [[[
ru = restore
rs = restore --staged
#############
s = status
sb = status -s -b
#############
#]]]
# stash [[[
sa = stash apply
sc = stash clear
sd = stash drop
Expand All @@ -186,19 +188,29 @@
ssk = stash save -k
sw = stash show
st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'
#############
t = tag
td = tag -d
#############
w = show
#############
#]]]
# status [[[
s = status
sb = status -s -b
#]]]
# submodule [[[
co = checkout
cob = checkout -b
#]]]
# submodule [[[
subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -
subpull = !git submodule foreach git pull --tags origin master
subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' -
subup = submodule update --init --recursive
#############
aliases = !git config -l | grep alias | cut -c 7-
bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
merged = !sh -c 'git o master && git plom && git bd $1 && git rpo' -
#]]]
# tag [[[
t = tag
td = tag -d
release = !sh -c 'git tag v$1 && git pst' -
unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' -
#]]]
# tag [[[
w = show
#]]]

# vim:ft=toml:sw=4:sts=4:et:foldmarker=[[[,]]]:foldmethod=marker
Loading

0 comments on commit 608ca15

Please sign in to comment.