diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 74318a9..a202237 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -44,7 +44,7 @@ set termguicolors set visualbell set noerrorbells set whichwrap=<,>,[,],b, -set background=dark +"set background=dark set backspace=indent,eol,start set number set autoread @@ -67,6 +67,7 @@ autocmd FileType html set shiftwidth=4 softtabstop=4 tabstop=4 autocmd FileType javascript set shiftwidth=4 softtabstop=4 tabstop=4 autocmd FileType htmldjango set shiftwidth=4 softtabstop=4 tabstop=4 autocmd BufNewFile,BufRead *.tera set syntax=django +autocmd BufNewFile,BufRead justfile setf make "expandtab shiftwidth=8 softtabstop=0 " Center screen when scrolling search results nmap n nzz diff --git a/dot_gitconfig b/dot_gitconfig index fe96ae4..80a6649 100644 --- a/dot_gitconfig +++ b/dot_gitconfig @@ -18,14 +18,35 @@ defaultBranch = main [delta] - features = decorations + features = decorations hoopoe line-numbers = true - syntax-theme = zenburn + #syntax-theme = Solarized (light) + +[delta "hoopoe"] + # author: https://github.com/dandavison + commit-decoration-style = blue ol + commit-style = raw + file-style = omit + hunk-header-decoration-style = blue box + hunk-header-file-style = red + hunk-header-line-number-style = "#067a00" + hunk-header-style = file line-number syntax + light = true + minus-emph-style = normal "#ffc0c0" + minus-empty-line-marker-style = normal "#ffe0e0" + minus-non-emph-style = normal "#ffe0e0" + minus-style = normal "#ffe0e0" + plus-emph-style = syntax "#a0efa0" + plus-empty-line-marker-style = normal "#d0ffd0" + plus-non-emph-style = syntax "#d0ffd0" + plus-style = syntax "#d0ffd0" + syntax-theme = GitHub + zero-style = syntax [delta "decorations"] - commit-decoration-style = bold yellow box - file-style = bold yellow - file-decoration-style = yellow ul + #commit-decoration-style = bold yellow box + #file-style = bold blue + file-decoration-style = blue ol hunk-header-style = omit [rebase] diff --git a/dot_bashrc.d/aliases.sh b/private_dot_bashrc.d/aliases.sh similarity index 80% rename from dot_bashrc.d/aliases.sh rename to private_dot_bashrc.d/aliases.sh index 8d4149e..7b326ec 100644 --- a/dot_bashrc.d/aliases.sh +++ b/private_dot_bashrc.d/aliases.sh @@ -33,24 +33,4 @@ ex () fi } -# change the title of the current window or tab -title() -{ - echo -ne "\033]0;$*\007" -} - -ssh() -{ - echo -ne '\e[22t' - /usr/bin/ssh "$@" - echo -ne '\e[23t' -} - -su() -{ - echo -ne '\e[22t' - /bin/su "$@" - echo -ne '\e[23t' -} - alias m4b-tool='docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd)":/mnt m4b-tool' diff --git a/dot_bashrc.d/bash-completion.sh b/private_dot_bashrc.d/bash-completion.sh similarity index 100% rename from dot_bashrc.d/bash-completion.sh rename to private_dot_bashrc.d/bash-completion.sh diff --git a/dot_bashrc.d/cargo.sh b/private_dot_bashrc.d/cargo.sh similarity index 100% rename from dot_bashrc.d/cargo.sh rename to private_dot_bashrc.d/cargo.sh diff --git a/private_dot_bashrc.d/direnv.sh b/private_dot_bashrc.d/direnv.sh new file mode 100644 index 0000000..7781a99 --- /dev/null +++ b/private_dot_bashrc.d/direnv.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +eval "$(direnv hook bash)" diff --git a/dot_bashrc.d/git-prompt.sh b/private_dot_bashrc.d/git-prompt.sh similarity index 100% rename from dot_bashrc.d/git-prompt.sh rename to private_dot_bashrc.d/git-prompt.sh diff --git a/dot_bashrc.d/gitea.sh.tmpl b/private_dot_bashrc.d/gitea.sh.tmpl similarity index 100% rename from dot_bashrc.d/gitea.sh.tmpl rename to private_dot_bashrc.d/gitea.sh.tmpl diff --git a/dot_bashrc.d/go-setup.sh b/private_dot_bashrc.d/go-setup.sh similarity index 100% rename from dot_bashrc.d/go-setup.sh rename to private_dot_bashrc.d/go-setup.sh diff --git a/dot_bashrc.d/history.sh b/private_dot_bashrc.d/history.sh similarity index 100% rename from dot_bashrc.d/history.sh rename to private_dot_bashrc.d/history.sh diff --git a/dot_bashrc.d/kubernetes-wellsky.sh.tmpl b/private_dot_bashrc.d/kubernetes-wellsky.sh.tmpl similarity index 100% rename from dot_bashrc.d/kubernetes-wellsky.sh.tmpl rename to private_dot_bashrc.d/kubernetes-wellsky.sh.tmpl diff --git a/dot_bashrc.d/pager.sh b/private_dot_bashrc.d/pager.sh similarity index 100% rename from dot_bashrc.d/pager.sh rename to private_dot_bashrc.d/pager.sh diff --git a/dot_bashrc.d/shell-prompt.sh b/private_dot_bashrc.d/shell-prompt.sh similarity index 100% rename from dot_bashrc.d/shell-prompt.sh rename to private_dot_bashrc.d/shell-prompt.sh diff --git a/dot_bashrc.d/window.sh b/private_dot_bashrc.d/window.sh similarity index 100% rename from dot_bashrc.d/window.sh rename to private_dot_bashrc.d/window.sh diff --git a/dot_bashrc.d/wsl-ssh-agent.sh.tmpl b/private_dot_bashrc.d/wsl-ssh-agent.sh.tmpl similarity index 100% rename from dot_bashrc.d/wsl-ssh-agent.sh.tmpl rename to private_dot_bashrc.d/wsl-ssh-agent.sh.tmpl diff --git a/dot_bashrc.d/xhost.sh.tmpl b/private_dot_bashrc.d/xhost.sh.tmpl similarity index 100% rename from dot_bashrc.d/xhost.sh.tmpl rename to private_dot_bashrc.d/xhost.sh.tmpl