Compare commits

..

3 Commits

Author SHA1 Message Date
Stefan Gaiselmann
006d5c05f3 Removed tldr++ handling (not installed any more). 2022-05-12 08:13:53 +02:00
Stefan Gaiselmann
2d5cb35ce8 Minor changes in gitconfig and vimrc. 2022-05-12 08:13:35 +02:00
Stefan Gaiselmann
802ea305cc Minor changes. 2022-05-11 08:22:34 +02:00
5 changed files with 32 additions and 15 deletions

View File

@ -4,6 +4,6 @@ vim-lightline.tar.gz
{{- if eq .chezmoi.hostname "docker-ce-ubuntu-2gb-nbg1-1" }} {{- if eq .chezmoi.hostname "docker-ce-ubuntu-2gb-nbg1-1" }}
.bashrc.d/11.motd .bashrc.d/11.motd
{{- end }} {{- end }}
{{- if ne .chezmoi.hostname "docker-ce-ubuntu-2gb-nbg1-1" }} {{- if (and (ne .chezmoi.hostname "docker-ce-ubuntu-2gb-nbg1-1") (ne .chezmoi.hostname "nb4113"))}}
.local/share/bash-completion/completions/rustup .local/share/bash-completion/completions/rustup
{{- end }} {{- end }}

View File

@ -65,15 +65,6 @@ alias ips='ip --brief -c address'
alias sol-light='set-scheme.sh solarized.light' alias sol-light='set-scheme.sh solarized.light'
alias sol-dark='set-scheme.sh solarized.dark' alias sol-dark='set-scheme.sh solarized.dark'
# if tldr++ is installed, use it the static way
if tldr --version &> /dev/null
then
tldrVersion="$(tldr --version 2>&1)"
if [[ $tldrVersion =~ tldr\+\+.* ]]; then
alias tldr='tldr --static'
fi
fi
{{ if eq .bash.prompt.category "Uberspace" -}} {{ if eq .bash.prompt.category "Uberspace" -}}
alias quota='quota -gls' alias quota='quota -gls'
{{ end -}} {{ end -}}

View File

@ -35,12 +35,18 @@ function lastExitCode {
if [ $exit != 0 ];then if [ $exit != 0 ];then
# printf '\e[38;5;160m%-5s' "✕ ❗ ($exit)" # printf '\e[38;5;160m%-5s' "✕ ❗ ($exit)"
echo "$(colf 1)($exit)" echo "$(colf 1)($exit)"
else else
echo '' echo ''
fi fi
} }
# TODO: switch to use themes
# So far the colors used:
# - green (2) for directory
# - blue (4) for git prompt
# - red (1) for 'star'
# Color sequences must be escaped with '\[ ... \] # Color sequences must be escaped with '\[ ... \]
# See https://unix.stackexchange.com/questions/105958/terminal-prompt-not-wrapping-correctly # See https://unix.stackexchange.com/questions/105958/terminal-prompt-not-wrapping-correctly
function hostPrompt() { function hostPrompt() {

View File

@ -48,6 +48,9 @@
ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
lstat = log --name-status lstat = log --name-status
# initial push
puu = push -u origin
# Short summary of commiters # Short summary of commiters
summary = shortlog --summary --numbered --email summary = shortlog --summary --numbered --email
@ -135,3 +138,8 @@
[init] [init]
# Talisman Test # Talisman Test
# templatedir = 'c:/cygwin64/home/sgaiselm/.git-template' # templatedir = 'c:/cygwin64/home/sgaiselm/.git-template'
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f

View File

@ -28,6 +28,10 @@ let &t_SI.="\e[5 q"
let &t_EI.="\e[1 q" let &t_EI.="\e[1 q"
let &t_te.="\e[0 q" let &t_te.="\e[0 q"
" See https://github.com/airblade/vim-gitgutter
" let g:gitgutter_git_executable = 'C:\cygwin64\bin\git.exe'
let g:gitgutter_git_executable = '/usr/bin/git'
" Inspiried by http://nvie.com/posts/how-i-boosted-my-vim/ " Inspiried by http://nvie.com/posts/how-i-boosted-my-vim/
" Editing behaviour {{{ " Editing behaviour {{{
set showmode " always show what mode we're currently editing in set showmode " always show what mode we're currently editing in
@ -111,6 +115,7 @@ set cursorline " underline the current line, for quick orientat
" colorscheme mustang " colorscheme mustang
" colorscheme solarized " colorscheme solarized
colorscheme solarized8
" https://superuser.com/questions/249779/how-to-setup-a-line-length-marker-in-vim-gvim " https://superuser.com/questions/249779/how-to-setup-a-line-length-marker-in-vim-gvim
" https://vi.stackexchange.com/questions/356/how-can-i-set-up-a-ruler-at-a-specific-column " https://vi.stackexchange.com/questions/356/how-can-i-set-up-a-ruler-at-a-specific-column
@ -231,8 +236,15 @@ function! LightLineFilesize()
return size . ' bytes' return size . ' bytes'
endfunction endfunction
function! AndMore() "function! AndMore()
" return "TODO: more cool stuff!" " return "TODO: more cool stuff!"
" return winwidth(0) > 70 ? (&fileformat . ' ' . WebDevIconsGetFileFormatSymbol()) : '' " return winwidth(0) > 70 ? (&fileformat . ' ' . WebDevIconsGetFileFormatSymbol()) : ''
return WebDevIconsGetFileTypeSymbol() "winwidth(0) > 70 ? (&fileformat . ' x ' . WebDevIconsGetFileTypeSymbol()) : 'no ft' "" return WebDevIconsGetFileTypeSymbol() "winwidth(0) > 70 ? (&fileformat . ' x ' . WebDevIconsGetFileTypeSymbol()) : 'no ft'
endfunction "endfunction
" Load all plugins now.
" Plugins need to be added to runtimepath before helptags can be generated.
packloadall
" Load all of the helptags now, after plugins have been loaded.
" All messages and errors will be ignored.
silent! helptags ALL