diff --git a/.gitconfig b/.gitconfig index 99926e5..212bfb9 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [user] - email = tobias.manske@mailbox.org - name = Tobias Manske - signingkey = FF57750B830AA3A1 + email = tobias.manske@mailbox.org + name = Tobias Manske + signingkey = FF57750B830AA3A1 [alias] lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all fzf = "!git lg --color=always | fzf --multi --preview 'git show --color=always {+2}' --ansi" @@ -9,15 +9,15 @@ undo = reset HEAD~ ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ; } ; gi" [commit] - gpgsign = true + gpgsign = true template = ~/.gitmessage [core] - autocrlf = input + autocrlf = input pager = delta [github] - user = rad4day + user = rad4day [pull] - rebase = true + rebase = true [interactive] diffFilter = delta --color-only [delta] diff --git a/.zimrc b/.zimrc index b3c47fd..77eda48 100644 --- a/.zimrc +++ b/.zimrc @@ -36,3 +36,5 @@ zmodule zsh-users/zsh-syntax-highlighting # zsh-users/zsh-history-substring-search must be sourced after zsh-users/zsh-syntax-highlighting zmodule zsh-users/zsh-history-substring-search # }}} End configuration added by Zim install + +zmodule agkozak/zsh-z diff --git a/.zshrc b/.zshrc index 7712213..6128ae8 100644 --- a/.zshrc +++ b/.zshrc @@ -144,4 +144,5 @@ export EDITOR=vim export PATH="$HOME/.jenv/bin:$PATH" eval "$(jenv init -)" +export PATH="$PATH:$HOME/.local/bin" export TERM=xterm-256color diff --git a/i3/conf/client/x380yoga/assignments b/i3/conf/client/x380yoga/assignments index 28c3370..d1f9590 100644 --- a/i3/conf/client/x380yoga/assignments +++ b/i3/conf/client/x380yoga/assignments @@ -14,6 +14,8 @@ assign [instance="mail"] $ws5 # KeepassXC assign [class="keepassxc"] $ws10 + # Spotify + assign [class="Spotify"] $ws3 # {{{ SPECIAL KEYBINDINGS }}} diff --git a/redshift.conf b/redshift.conf index e62d609..46460e4 100644 --- a/redshift.conf +++ b/redshift.conf @@ -1,7 +1,7 @@ ; Global settings for redshift [redshift] ; Set the day and night screen temperatures -temp-day=6500 +temp-day=5000 temp-night=3500 ; Disable the smooth fade between temperatures when Redshift starts and stops. diff --git a/vim/config/filetypes.vim b/vim/config/filetypes.vim index f076425..cf5ef27 100644 --- a/vim/config/filetypes.vim +++ b/vim/config/filetypes.vim @@ -9,3 +9,9 @@ autocmd BufNewFile,BufReadPost *.Rmd call Markdown() autocmd BufNewFile,BufReadPost *.rmd call Markdown() autocmd BufNewFile,BufReadPost *.md call Markdown() + +" Groovy syntax highlighting +au BufNewFile,BufRead Jenkinsfile set filetype=groovy + + +au BufNewFile,BufRead .latexmkrc set filetype=perl