This commit is contained in:
parent
624ab42f73
commit
2e90062ea8
3 changed files with 8 additions and 3 deletions
|
|
@ -3,6 +3,7 @@ local servers = {
|
||||||
bashls = {},
|
bashls = {},
|
||||||
clangd = {},
|
clangd = {},
|
||||||
cmake = {},
|
cmake = {},
|
||||||
|
csharp_ls = {},
|
||||||
eslint = {},
|
eslint = {},
|
||||||
gopls = {},
|
gopls = {},
|
||||||
hls = {},
|
hls = {},
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ alias lsd='/usr/bin/ls'
|
||||||
alias l="ls -lh"
|
alias l="ls -lh"
|
||||||
alias la="ls -lah"
|
alias la="ls -lah"
|
||||||
alias ll="ls -lh"
|
alias ll="ls -lh"
|
||||||
alias lt="ls --color=always --icon=always -lt"
|
alias lt="ls -ltr"
|
||||||
|
|
||||||
# set bat as help pager
|
# set bat as help pager
|
||||||
alias -g -- --help='--help 2>&1 | bat --language=help --style=plain --theme Monokai\ Extended'
|
alias -g -- --help='--help 2>&1 | bat --language=help --style=plain --theme Monokai\ Extended'
|
||||||
|
|
@ -124,6 +124,7 @@ alias ga="git add"
|
||||||
alias gb="git branch"
|
alias gb="git branch"
|
||||||
alias gc="git commit"
|
alias gc="git commit"
|
||||||
alias gca="git commit --allow-empty-message --amend --no-edit"
|
alias gca="git commit --allow-empty-message --amend --no-edit"
|
||||||
|
alias gcad='gca --no-gpg-sign'
|
||||||
alias gck="git checkout"
|
alias gck="git checkout"
|
||||||
alias gcl="git clone"
|
alias gcl="git clone"
|
||||||
alias gcls="git clone --depth=1"
|
alias gcls="git clone --depth=1"
|
||||||
|
|
@ -156,6 +157,8 @@ alias gsj="git stash"
|
||||||
alias gsp="git stash pop"
|
alias gsp="git stash pop"
|
||||||
alias gt="git tag"
|
alias gt="git tag"
|
||||||
alias gus="git fetch --unshallow"
|
alias gus="git fetch --unshallow"
|
||||||
|
alias gdj='DELTA_FEATURES="+side-by-side" gd'
|
||||||
|
alias gdsj='DELTA_FEATURES="+side-by-side" gds'
|
||||||
|
|
||||||
# docker aliases
|
# docker aliases
|
||||||
alias d='docker'
|
alias d='docker'
|
||||||
|
|
@ -175,10 +178,10 @@ alias dr='d run --rm -it'
|
||||||
tn() { tmux new-session -s "${1-"$(basename "$(pwd)")"}" }
|
tn() { tmux new-session -s "${1-"$(basename "$(pwd)")"}" }
|
||||||
alias ta="tmux a -t"
|
alias ta="tmux a -t"
|
||||||
|
|
||||||
# disable xon controll chars
|
# disable xon control chars
|
||||||
stty -ixon
|
stty -ixon
|
||||||
|
|
||||||
# print tasks on startup
|
# print tasks on startup
|
||||||
_ZSH_TODO_FILE="${HOME}/todo.md"
|
_ZSH_TODO_FILE="${HOME}/todo.md"
|
||||||
[ -f "$_ZSH_TODO_FILE" ] && { bat --color=always -p "$_ZSH_TODO_FILE" | grep -v '>.*'; }
|
[ -f "$_ZSH_TODO_FILE" ] && { cat "$_ZSH_TODO_FILE" | grep -v '>.*'; }
|
||||||
unset _ZSH_TODO_FILE
|
unset _ZSH_TODO_FILE
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
[delta]
|
[delta]
|
||||||
navigate = true
|
navigate = true
|
||||||
syntax-theme = OneHalfDark
|
syntax-theme = OneHalfDark
|
||||||
|
line-numbers = true
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
tool = nvimdiff
|
tool = nvimdiff
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue