commit ccd7a8f7014ca473bba30e7e94b02258e3ec5d40
parent 8e4765ebb00ffa5c58fa44783a6eb10cc778d711
Author: Oscar Benedito <oscar@oscarbenedito.com>
Date: Sat, 5 Sep 2020 18:19:07 +0200
Minor changes
Diffstat:
5 files changed, 25 insertions(+), 329 deletions(-)
diff --git a/.config/nvim/colors/wombat257.vim b/.config/nvim/colors/wombat257.vim
@@ -1,302 +0,0 @@
-" Wombat257 is a vim color file based on wombat256
-" This file is licensed under the CC0 1.0 Universal license and therefore is
-" part of the public domain. To the extent possible under law, Oscar Benedito,
-" who associated CC0 with this work, has waived all copyright and related or
-" neighboring rights to this work. You can find a copy of the CC0 license
-" at https://gitlab.com/oscarbenedito/dotfiles/blob/master/CC0-1.0.
-
-set background=dark
-
-if version > 580
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-
-let g:colors_name = "wombat256i"
-
-if !has("gui_running") && &t_Co != 88 && &t_Co != 256
- finish
-endif
-
-" functions {{{
-" returns an approximate grey index for the given grey level
-fun <SID>grey_number(x)
- if &t_Co == 88
- if a:x < 23
- return 0
- elseif a:x < 69
- return 1
- elseif a:x < 103
- return 2
- elseif a:x < 127
- return 3
- elseif a:x < 150
- return 4
- elseif a:x < 173
- return 5
- elseif a:x < 196
- return 6
- elseif a:x < 219
- return 7
- elseif a:x < 243
- return 8
- else
- return 9
- endif
- else
- if a:x < 14
- return 0
- else
- let l:n = (a:x - 8) / 10
- let l:m = (a:x - 8) % 10
- if l:m < 5
- return l:n
- else
- return l:n + 1
- endif
- endif
- endif
-endfun
-
-" returns the actual grey level represented by the grey index
-fun <SID>grey_level(n)
- if &t_Co == 88
- if a:n == 0
- return 0
- elseif a:n == 1
- return 46
- elseif a:n == 2
- return 92
- elseif a:n == 3
- return 115
- elseif a:n == 4
- return 139
- elseif a:n == 5
- return 162
- elseif a:n == 6
- return 185
- elseif a:n == 7
- return 208
- elseif a:n == 8
- return 231
- else
- return 255
- endif
- else
- if a:n == 0
- return 0
- else
- return 8 + (a:n * 10)
- endif
- endif
-endfun
-
-" returns the palette index for the given grey index
-fun <SID>grey_color(n)
- if &t_Co == 88
- if a:n == 0
- return 16
- elseif a:n == 9
- return 79
- else
- return 79 + a:n
- endif
- else
- if a:n == 0
- return 16
- elseif a:n == 25
- return 231
- else
- return 231 + a:n
- endif
- endif
-endfun
-
-" returns an approximate color index for the given color level
-fun <SID>rgb_number(x)
- if &t_Co == 88
- if a:x < 69
- return 0
- elseif a:x < 172
- return 1
- elseif a:x < 230
- return 2
- else
- return 3
- endif
- else
- if a:x < 75
- return 0
- else
- let l:n = (a:x - 55) / 40
- let l:m = (a:x - 55) % 40
- if l:m < 20
- return l:n
- else
- return l:n + 1
- endif
- endif
- endif
-endfun
-
-" returns the actual color level for the given color index
-fun <SID>rgb_level(n)
- if &t_Co == 88
- if a:n == 0
- return 0
- elseif a:n == 1
- return 139
- elseif a:n == 2
- return 205
- else
- return 255
- endif
- else
- if a:n == 0
- return 0
- else
- return 55 + (a:n * 40)
- endif
- endif
-endfun
-
-" returns the palette index for the given R/G/B color indices
-fun <SID>rgb_color(x, y, z)
- if &t_Co == 88
- return 16 + (a:x * 16) + (a:y * 4) + a:z
- else
- return 16 + (a:x * 36) + (a:y * 6) + a:z
- endif
-endfun
-
-" returns the palette index to approximate the given R/G/B color levels
-fun <SID>color(r, g, b)
- " get the closest grey
- let l:gx = <SID>grey_number(a:r)
- let l:gy = <SID>grey_number(a:g)
- let l:gz = <SID>grey_number(a:b)
-
- " get the closest color
- let l:x = <SID>rgb_number(a:r)
- let l:y = <SID>rgb_number(a:g)
- let l:z = <SID>rgb_number(a:b)
-
- if l:gx == l:gy && l:gy == l:gz
- " there are two possibilities
- let l:dgr = <SID>grey_level(l:gx) - a:r
- let l:dgg = <SID>grey_level(l:gy) - a:g
- let l:dgb = <SID>grey_level(l:gz) - a:b
- let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
- let l:dr = <SID>rgb_level(l:gx) - a:r
- let l:dg = <SID>rgb_level(l:gy) - a:g
- let l:db = <SID>rgb_level(l:gz) - a:b
- let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
- if l:dgrey < l:drgb
- " use the grey
- return <SID>grey_color(l:gx)
- else
- " use the color
- return <SID>rgb_color(l:x, l:y, l:z)
- endif
- else
- " only one possibility
- return <SID>rgb_color(l:x, l:y, l:z)
- endif
-endfun
-
-" returns the palette index to approximate the 'rrggbb' hex string
-fun <SID>rgb(rgb)
- let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
- let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
- let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
- return <SID>color(l:r, l:g, l:b)
-endfun
-
-" sets the highlighting for the given group
-fun <SID>X(group, fg, bg, attr)
- if a:fg != ""
- exec "hi ".a:group." guifg=#".a:fg." ctermfg=".<SID>rgb(a:fg)
- endif
- if a:bg != ""
- exec "hi ".a:group." guibg=#".a:bg." ctermbg=".<SID>rgb(a:bg)
- endif
- if a:attr != ""
- if a:attr == 'italic'
- exec "hi ".a:group." gui=".a:attr." cterm=none"
- else
- exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
- endif
- endif
-endfun
-" }}}
-
-call <SID>X("Normal", "cccccc", "", "none")
-call <SID>X("Cursor", "222222", "ecee90", "none")
-call <SID>X("CursorLine", "", "32322e", "none")
-call <SID>X("CursorColumn", "", "2d2d2d", "")
- "CursorIM
- "Question
- "IncSearch
-call <SID>X("Search", "444444", "af87d7", "")
-call <SID>X("MatchParen", "ecee90", "857b6f", "bold")
-call <SID>X("SpecialKey", "6c6c6c", "", "none")
-call <SID>X("Visual", "ecee90", "597418", "none")
-call <SID>X("LineNr", "95e454", "242424", "none")
-call <SID>X("CursorLineNr", "ffffff", "242424", "none")
-call <SID>X("Folded", "a0a8b0", "404048", "none")
-call <SID>X("Title", "f6f3e8", "", "bold")
-call <SID>X("VertSplit", "444444", "444444", "none")
-call <SID>X("StatusLine", "f6f3e8", "444444", "italic")
-call <SID>X("StatusLineNC", "857b6f", "444444", "none")
- "Scrollbar
- "Tooltip
- "Menu
- "WildMenu
-call <SID>X("Pmenu", "f6f3e8", "444444", "")
-call <SID>X("PmenuSel", "000000", "95e454", "bold")
-call <SID>X("WarningMsg", "ff0000", "", "")
- "ErrorMsg
- "ModeMsg
- "MoreMsg
- "Directory
- "DiffAdd
- "DiffChange
- "DiffDelete
- "DiffText
-
-" syntax highlighting
-call <SID>X("Number", "e5786d", "", "none")
-call <SID>X("Constant", "e5786d", "", "none")
-call <SID>X("String", "95e454", "", "italic")
-call <SID>X("Comment", "c0bc6c", "", "italic")
-call <SID>X("Identifier", "caeb82", "", "none")
-call <SID>X("Keyword", "87afff", "", "none")
-call <SID>X("Statement", "87afff", "", "none")
-call <SID>X("Function", "caeb82", "", "none")
-call <SID>X("PreProc", "e5786d", "", "none")
-call <SID>X("Type", "caeb82", "", "none")
-call <SID>X("Special", "ffdead", "", "none")
-call <SID>X("Todo", "857b6f", "", "italic")
- "Underlined
- "Error
- "Ignore
-call <SID>X("ColorColumn", "", "2d2d2d", "none")
-
-hi! link VisualNOS Visual
-hi! link FoldColumn Folded
-
-" delete functions {{{
-delf <SID>X
-delf <SID>rgb
-delf <SID>color
-delf <SID>rgb_color
-delf <SID>rgb_level
-delf <SID>rgb_number
-delf <SID>grey_color
-delf <SID>grey_level
-delf <SID>grey_number
-" }}}
-
-" vim:set ts=4 sw=4 noet fdm=marker:
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -21,6 +21,8 @@ call plug#end()
" netrw
let g:netrw_liststyle=3 " tree structure
let g:netrw_banner=0 " get rid of banner
+let g:netrw_winsize=20 " when on side, only use 20% of space
+let g:netrw_browse_split=4 " open files in previous window
" adds 'number' and 'relativenumber', other options are the default ones
let g:netrw_bufsettings="nomodifiable nomodified number nobuflisted nowrap readonly relativenumber"
@@ -78,10 +80,14 @@ set foldmethod=marker " using {{{ and }}} to delimit folding areas
set modeline " enable per-file settings with modeline
set colorcolumn=81 " color column 81 differently
set textwidth=80 " break lines longer than 80 characters, this is done to change behaviour of gq, see next line
-set formatoptions-=t " don't break lines at column 80
+set formatoptions-=t " don't break lines when longer than textwidth
set nojoinspaces " joining lines: no double space after period
set scrolloff=3 " minimum #lines between cursor and edge when scrolling
+" undo
+set undofile " save undos after file closes
+set undodir=$HOME/.config/nvim/undo " where to save undo histories
+
" show blank characters when invisible
set list
set listchars=tab:>-,trail:·,extends:#,nbsp:.
@@ -100,9 +106,10 @@ nnoremap Ñ ;
autocmd BufRead,BufNewFile *.zone set filetype=bindzone
" filetype specific
-autocmd FileType markdown,vimwiki set formatoptions+=t " break lines at column 80
+autocmd FileType markdown,vimwiki,mail set formatoptions+=t " break lines when longer than textwidth
autocmd FileType markdown,vimwiki set tabstop=2 " number of spaces when tab is pressed
autocmd FileType markdown,vimwiki set shiftwidth=2 " number of spaces for indentation
+autocmd FileType mail set textwidth=72
" /change default behaviours }}}
@@ -123,16 +130,15 @@ noremap <silent> <C-Right> :vertical resize -3<CR>
" undo
nnoremap U <C-r>
-" Search and replace all
+" search and replace all
nnoremap S :%s//g<Left><Left>
" edit/reload config file
-nnoremap <silent> <Leader>ev :e $MYVIMRC<CR>
-nnoremap <silent> <Leader>sv :so $MYVIMRC<CR>
+nnoremap <silent> <Leader>v :e $MYVIMRC<CR>
+nnoremap <silent> <Leader>r :so $MYVIMRC<CR>
" edit file
-nnoremap <Leader>ee :Explore<CR>
-nnoremap <Leader>ev :Vexplore<CR>
+nnoremap <Leader>e :Lexplore<CR>
" clean search highlights
nnoremap <silent> <Leader>/ :nohlsearch<CR>
@@ -143,6 +149,7 @@ nnoremap <Space> za
" /shortcuts }}}
" colorscheme {{{
+
colorscheme onedark
set t_ut="" " deactivates vim BCE option (messes up colors)
set termguicolors
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
@@ -11,10 +11,6 @@ HISTFILE=~/.cache/zsh/history
setopt HIST_IGNORE_DUPS
setopt HIST_FIND_NO_DUPS
-# antlr4
-[ -z "$CLASSPATH" ] && export CLASSPATH=".:/home/oscar/Desktop/antlr/antlr-4.7.2-complete.jar" || export CLASSPATH=".:/home/oscar/Desktop/antlr/antlr-4.7.2-complete.jar:$CLASSPATH"
-alias grun='java org.antlr.v4.gui.TestRig'
-
# Set up navigation menu when pressing tab multiple times
autoload -U compinit
zstyle ':completion:*' menu select
@@ -28,7 +24,6 @@ zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*'
# Set up vi style keys
bindkey -v
export KEYTIMEOUT=1
-bindkey "^?" backward-delete-char
# Also set vi keys to navigate the menus when double pressing tab
bindkey -M menuselect 'h' vi-backward-char
diff --git a/.config/zsh/aliases b/.config/zsh/aliases
@@ -1,21 +1,22 @@
# vim: filetype=zsh
+
alias clear="printf '\033c'"
-# Colors
+# colors
alias ls="ls -hv --color=auto --group-directories-first"
alias grep="grep --color=auto"
alias fgrep="fgrep --color=auto"
alias egrep="egrep --color=auto"
alias diff="diff --color=auto"
-# Options aliases
+# options aliases
alias cp="cp --interactive"
alias mv="mv --interactive"
alias mkdir="mkdir --parents"
alias rm="rm -I"
alias tmux="TERM=screen-256color tmux"
-# Shortcuts
+# shortcuts
alias v="nvim"
alias vim="nvim"
alias g="git"
@@ -28,6 +29,8 @@ alias vw="cd $HOME/Documents/wiki && vim index.md"
alias bvw="firefox $HOME/Documents/wiki/build/html/index.html"
alias c="git --git-dir=$HOME/.local/share/dotfiles --work-tree=$HOME"
alias cv="GIT_DIR=$HOME/.local/share/dotfiles GIT_WORK_TREE=$HOME nvim -c Git -c only"
+alias up="sudo apt-get update && sudo apt-get -y upgrade"
+# alias up="sudo pacman -Syyu --noconfirm"
# frequent files and directories
alias cfa="$EDITOR $XDG_CONFIG_HOME/zsh/aliases"
@@ -43,6 +46,7 @@ alias ds="cd $HOME/.local/src && ls"
alias dvw="cd $HOME/Documents/wiki && ls"
alias dw="cd $HOME/Downloads && ls"
+# dotfiles' repository metafiles
c-clean() {
rm README.md COPYING
c update-index --skip-worktree README.md COPYING
@@ -53,14 +57,6 @@ c-populate() {
c checkout README.md COPYING
}
-# Zsh aliases
-alias -g L="|less"
-alias -g NULL="> /dev/null 2>&1"
-
-# Updates
-alias upgrade="sudo apt-get update && sudo apt-get -y upgrade"
-# alias upgrade="sudo pacman -Syyu --noconfirm"
-
# Backup to external HD
alias backup_all='rsync -loptruzvP --delete --exclude "/.*" "$HOME/" "/media/$USER/OSCAR/.backup_$(hostname)/"'
diff --git a/.ssh/config b/.ssh/config
@@ -1,15 +1,15 @@
Host blue
- HostName oscarbenedito.com
+ HostName 159.69.212.16
User root
Host cims
- HostName cims-cellex.cat
+ HostName 147.83.52.120
User cims
Host cangur
- HostName inscripcions.cangur.org
+ HostName 147.83.52.79
User cangur
Host cims-antic
- HostName antic.cims-cellex.cat
+ HostName 147.83.52.5
User cims
