Lots of updates
3c2161a46735c911a05b0cf67a163081b7673cd9
1 parent
9948fb12
.profile
+4 -1
| 1 | 1 | #!/bin/sh |
|
| 2 | 2 | ||
| 3 | - | eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_rsa) |
|
| 3 | + | if command -v keychain >/dev/null; then |
|
| 4 | + | eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_rsa) |
|
| 5 | + | fi |
|
| 6 | + | ||
| 4 | 7 | export PATH=~/bin:~/.local/bin:~/.cabal/bin:~/.cargo/bin:~/.gem/ruby/2.6.0/bin:~/.npm-packages/bin:$PATH |
|
| 5 | 8 | export EDITOR=nvim |
|
| 6 | 9 | export VISUAL=nvim |
|
| 7 | 10 | export MOZ_USE_XINPUT2=1 # Pixel scrolling in Firefox |
|
| 8 | 11 |
.vim/syntax/todo.vim
+0 -6
| 6 | 6 | syntax match todoOther '^.*' |
|
| 7 | 7 | syntax match todoDone '^\s*\[[Xx]\].*' |
|
| 8 | 8 | syntax match todoNormal '^\s*\[ \]\s*.*' |
|
| 9 | 9 | syntax match todoComment '^\s*;.*' |
|
| 10 | 10 | syntax match todoCheckbox '^\s*\[\s\]' |
|
| 11 | - | ||
| 12 | - | highlight link todoOther Keyword |
|
| 13 | - | highlight link todoCheckbox Comment |
|
| 14 | - | highlight link todoComment Comment |
|
| 15 | - | highlight link todoDone Comment |
|
| 16 | - | highlight link todoNormal Normal |
.vimrc
+2 -2
| 110 | 110 | au FileType javascript setlocal number sts=4 sw=4 expandtab |
|
| 111 | 111 | au FileType css setlocal number ts=4 sw=4 noexpandtab |
|
| 112 | 112 | au FileType go setlocal number ts=4 sw=4 noexpandtab |
|
| 113 | 113 | au FileType c,cpp,glsl setlocal number ts=8 sw=8 noexpandtab |
|
| 114 | 114 | au FileType lua setlocal number sw=2 expandtab |
|
| 115 | - | au FileType sh,zsh setlocal number ts=2 sw=2 noexpandtab |
|
| 115 | + | au FileType sh,zsh setlocal number sts=2 sw=2 expandtab |
|
| 116 | 116 | au FileType vim,ruby setlocal number sts=2 sw=2 expandtab |
|
| 117 | 117 | au FileType help setlocal number ts=4 sw=4 noexpandtab |
|
| 118 | 118 | au FileType rust setlocal number signcolumn=yes nowrap |
|
| 119 | 119 | au FileType plain setlocal nonumber noai nocin nosi inde= wrap linebreak textwidth=80 |
|
| 120 | 120 | au FileType pandoc setlocal nonumber |
| 353 | 353 | ||
| 354 | 354 | endtry |
|
| 355 | 355 | endfor |
|
| 356 | 356 | endfunction |
|
| 357 | 357 | ||
| 358 | - | command! Write setlocal spell | Goyo 80 |
|
| 358 | + | command! Write setlocal spell | Goyo 100x98% |
|
| 359 | 359 | command! Code setlocal nospell | Goyo! |
|
| 360 | 360 | ||
| 361 | 361 | if has("nvim") |
|
| 362 | 362 | " Make sure we dont' load the rust cargo plugin from rust.vim! |
|
| 363 | 363 | let g:loaded_rust_vim_plugin_cargo = 1 |
.zshrc
+4 -0
| 9 | 9 | xset s off # |
|
| 10 | 10 | xset m 7/5 0 # Pointer settings |
|
| 11 | 11 | setxkbmap us -variant altgr-intl |
|
| 12 | 12 | fi |
|
| 13 | 13 | ||
| 14 | + | if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then |
|
| 15 | + | export TERM=xterm |
|
| 16 | + | fi |
|
| 17 | + | ||
| 14 | 18 | export GPG_TTY=$(tty) |
|
| 15 | 19 | ||
| 16 | 20 | # `ls` colors |
|
| 17 | 21 | if [ -f ~/.dircolors ]; then |
|
| 18 | 22 | eval $(dircolors -b ~/.dircolors) |
bin/toggle-displays
+1 -1
| 8 | 8 | if echo "$output" | grep -P "\b$external1 connected\b"; then |
|
| 9 | 9 | xrandr --output "$internal" --off --output "$external1" --auto --primary |
|
| 10 | 10 | elif echo "$output" | grep -P "\b$external2 connected\b"; then |
|
| 11 | 11 | xrandr --output "$internal" --off --output "$external2" --auto --primary |
|
| 12 | 12 | else |
|
| 13 | - | xrandr --output "$external" --off --output "$internal" --auto --primary |
|
| 13 | + | xrandr --output "$external1" --off --output "$internal" --auto --primary |
|
| 14 | 14 | fi |