1
0
Fork 0
This commit is contained in:
Arthur K. 2025-06-18 05:14:04 +03:00
parent 624ab42f73
commit 2e90062ea8
Signed by: wzray
GPG key ID: B97F30FDC4636357
3 changed files with 8 additions and 3 deletions

View file

@ -3,6 +3,7 @@ local servers = {
bashls = {},
clangd = {},
cmake = {},
csharp_ls = {},
eslint = {},
gopls = {},
hls = {},

View file

@ -58,7 +58,7 @@ alias lsd='/usr/bin/ls'
alias l="ls -lh"
alias la="ls -lah"
alias ll="ls -lh"
alias lt="ls --color=always --icon=always -lt"
alias lt="ls -ltr"
# set bat as help pager
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 gc="git commit"
alias gca="git commit --allow-empty-message --amend --no-edit"
alias gcad='gca --no-gpg-sign'
alias gck="git checkout"
alias gcl="git clone"
alias gcls="git clone --depth=1"
@ -156,6 +157,8 @@ alias gsj="git stash"
alias gsp="git stash pop"
alias gt="git tag"
alias gus="git fetch --unshallow"
alias gdj='DELTA_FEATURES="+side-by-side" gd'
alias gdsj='DELTA_FEATURES="+side-by-side" gds'
# docker aliases
alias d='docker'
@ -175,10 +178,10 @@ alias dr='d run --rm -it'
tn() { tmux new-session -s "${1-"$(basename "$(pwd)")"}" }
alias ta="tmux a -t"
# disable xon controll chars
# disable xon control chars
stty -ixon
# print tasks on startup
_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

View file

@ -12,6 +12,7 @@
[delta]
navigate = true
syntax-theme = OneHalfDark
line-numbers = true
[merge]
conflictstyle = diff3
tool = nvimdiff