Update Brewfile · hauleth.dev/dotfiles@47f3e29

+52 -15

Brewfile

··· 1 - # vi: ft=ruby 2 - 3 - cask_args appdir: '~/Applications' 4 - 5 1 tap 'caskroom/cask' 6 2 tap 'homebrew/bundle' 7 3 tap 'homebrew/core' 8 4 tap 'homebrew/services' 9 5 tap 'neovim/neovim' 10 6 tap 'universal-ctags/universal-ctags' 11 - 12 7 cask 'xquartz' 13 - 8 + brew 'xz' 9 + brew 'pkg-config' 10 + brew 'readline' 11 + brew 'sqlite' 12 + brew 'gdbm' 13 + brew 'makedepend' 14 + brew 'openssl' 15 + brew 'sphinx-doc' 16 + brew 'python3' 14 17 brew 'asciinema' 18 + brew 'autoconf' 19 + brew 'automake' 20 + brew 'cmake' 21 + brew 'node' 15 22 brew 'diff-so-fancy' 23 + brew 'pcre' 24 + brew 'gettext' 25 + brew 'git' 26 + brew 'go' 16 27 brew 'direnv' 17 - brew 'git' 28 + brew 'libpng' 29 + brew 'freetype' 30 + brew 'graphviz' 31 + brew 'doxygen' 32 + brew 'editorconfig' 33 + brew 'libtool' 34 + brew 'erlang', args: ['without-wxmac'] 35 + brew 'elixir' 36 + brew 'texi2html' 37 + brew 'x264' 38 + brew 'lame' 39 + brew 'xvid' 40 + brew 'fontconfig' 18 41 brew 'jpeg' 19 - brew 'elixir' 42 + brew 'libtiff' 43 + brew 'webp' 20 44 brew 'ffmpeg' 45 + brew 'pcre2' 21 46 brew 'fish' 22 - brew 'ghc' 47 + brew 'gd' 48 + brew 'gifsicle' 23 49 brew 'git-lfs' 24 - brew 'graphviz' 50 + brew 'lua' 51 + brew 'gnuplot' 25 52 brew 'htop' 26 53 brew 'httpie' 27 54 brew 'hub' 28 55 brew 'imagemagick' 29 56 brew 'jpegoptim' 57 + brew 'oniguruma' 30 58 brew 'jq' 59 + brew 'libevent' 31 60 brew 'lnav' 61 + brew 'protobuf' 32 62 brew 'mobile-shell' 33 63 brew 'ncdu' 34 - brew 'node' 35 64 brew 'optipng' 36 65 brew 'pandoc' 37 66 brew 'ruby-build' 38 67 brew 'rbenv' 39 68 brew 'rbenv-default-gems' 40 - brew 'reattach-to-user-namespace' 41 - brew 'redis' 69 + brew 'redis', service_restart: true 70 + brew 'rhash' 42 71 brew 'shellcheck' 72 + brew 'smartmontools' 43 73 brew 'the_silver_searcher' 44 - brew 'tmux' 45 74 brew 'tree' 46 75 brew 'watchman' 47 76 brew 'wget' ··· 49 78 brew 'youtube-dl' 50 79 brew 'neovim/neovim/neovim' 51 80 brew 'universal-ctags/universal-ctags/universal-ctags', args: ['HEAD'] 52 - 53 81 cask 'appcleaner' 82 + cask 'basictex' 54 83 cask 'battle-net' 55 84 cask 'caffeine' 56 85 cask 'dash' 57 86 cask 'flux' 87 + cask 'gimp' 88 + cask 'gitter' 58 89 cask 'gog-galaxy' 59 90 cask 'google-chrome' 60 91 cask 'gpgtools' 61 92 cask 'iterm2' 62 93 cask 'postgres' 63 94 cask 'qnapi' 95 + cask 'skype' 64 96 cask 'slack' 65 97 cask 'steam' 98 + cask 'telegram' 99 + cask 'the-unarchiver' 66 100 cask 'transmission' 101 + cask 'vagrant' 102 + cask 'vagrant-manager' 103 + cask 'virtualbox' 67 104 cask 'vlc' 68 105 cask 'zoomus'

+2 -6

fish/functions/e.fish

··· 1 - function e --wraps "nvim" 2 - if [ (count $argv) -eq 0 ] 3 - fzf-tmux --multi --prompt="edit: " | read argv 4 - end 5 - 6 - nvim $argv 1 + function e --wraps $EDITOR 2 + eval $EDITOR $argv 7 3 end

+1 -1

fish/functions/p.fish

··· 1 1 function p 2 - pretty $argv; 2 + pretty $argv 3 3 end

-11

fish/functions/work.fish

··· 1 - function work 2 - set NAME $argv[1] 3 - 4 - tmux has-session -t "$NAME" 5 - or tmux new-session -d -s "$NAME" -c "$WORKSPACE/$NAME" 6 - if [ -z "$TMUX" ] 7 - tmux -CC attach-session -t "$NAME" 8 - else 9 - tmux switch-client -t "$NAME" 10 - end 11 - end

+2

git/config

··· 41 41 autostash = true 42 42 [credential] 43 43 helper = cache --timeout=3600 44 + [fetch] 45 + prune = true 44 46 [help] 45 47 autocorrect = 1 46 48

+11 -8

nvim/autoload/plug.vim

··· 508 508 endif 509 509 let extra .= nr2char(c) 510 510 endwhile 511 - if v:count 512 - call feedkeys(v:count, 'n') 513 - endif 514 - call feedkeys('"'.v:register, 'n') 511 + 512 + let prefix = v:count ? v:count : '' 513 + let prefix .= '"'.v:register.a:prefix 515 514 if mode(1) == 'no' 516 - call feedkeys(v:operator) 515 + if v:operator == 'c' 516 + let prefix = "\<esc>" . prefix 517 + endif 518 + let prefix .= v:operator 517 519 endif 518 - call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra) 520 + call feedkeys(prefix, 'n') 521 + call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra) 519 522 endfunction 520 523 521 524 function! plug#(repo, ...) ··· 1044 1047 call s:log4(name, 'Updating submodules. This may take a while.') 1045 1048 let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir) 1046 1049 endif 1047 - let msg = printf('%s %s: %s', v:shell_error ? 'x': '-', name, s:lastline(out)) 1050 + let msg = s:format_message(v:shell_error ? 'x': '-', name, out) 1048 1051 if v:shell_error 1049 1052 call add(s:update.errors, name) 1050 1053 call s:regress_bar() 1051 1054 silent execute pos 'd _' 1052 1055 call append(4, msg) | 4 1053 1056 elseif !empty(out) 1054 - call setline(pos, msg) 1057 + call setline(pos, msg[0]) 1055 1058 endif 1056 1059 redraw 1057 1060 endfor

+1

nvim/ftdetect/javascript.vim

··· 1 + au BufRead,BufNewFile *.es6 set ft=javascript syn=javascript

+35 -33

nvim/init.vim

··· 1 1 " vim: foldmethod=marker foldlevel=0 foldenable 2 2 3 3 let $NVIM_TUI_ENABLE_CURSOR_SHAPE=1 4 + let $EDITOR="nvr" 4 5 5 6 " Plugins {{{ 6 7 call plug#begin('~/.local/nvim/plugins') ··· 8 9 " Visual 9 10 Plug 'ap/vim-buftabline' 10 11 Plug 'cocopon/iceberg.vim' 11 - Plug 'rakr/vim-two-firewatch' 12 12 13 13 " Languages 14 14 Plug 'sheerun/vim-polyglot' ··· 32 32 " Completion 33 33 Plug 'racer-rust/vim-racer' 34 34 Plug 'ludovicchabant/vim-gutentags' 35 - Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } 35 + Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } | Plug 'fishbullet/deoplete-ruby' 36 36 37 37 " Code manipulation 38 38 Plug 'tommcdo/vim-exchange' ··· 45 45 " Build & Configuration 46 46 Plug 'benekastah/neomake' 47 47 Plug 'tpope/vim-projectionist' 48 + Plug 'editorconfig/editorconfig-vim' 48 49 49 50 " Utils 50 51 Plug 'mbbill/undotree', { 'on': 'UndotreeToggle' } ··· 74 75 set noshowmode 75 76 set showcmd 76 77 77 - " Set utf8 as standard encoding 78 - set encoding=utf8 79 - 80 78 " Shorten interruptive command output 81 - set shortmess+=atI 79 + set shortmess=atI 82 80 83 81 " This makes vim act like all other editors, buffers can 84 82 " exist in the background without being in a window. 85 83 set hidden 86 84 87 85 " Wrap line on movements 88 - set whichwrap+=<,>,[,] 86 + set whichwrap+=[,] 89 87 90 88 " Use system clippboard as default 91 89 set clipboard=unnamed ··· 113 111 set textwidth=80 114 112 set nowrap " Don't wrap lines 115 113 set linebreak " Break lines at convenient points 116 - set formatoptions+=t 114 + set formatoptions+=l 117 115 " }}} 118 116 " Folding {{{ 119 117 set foldmethod=marker ··· 178 176 nnoremap gV `[v`] 179 177 " }}} 180 178 " File closing {{{ 181 - nnoremap ZS :xa<CR> 179 + nnoremap ZS :wa<CR> 182 180 nnoremap ZA :qa<CR> 183 181 nnoremap ZX :cq<CR> 184 - nnoremap ZB :bd<CR> 185 182 " }}} 186 183 " Simplify switching to Command mode {{{ 187 184 noremap ; : ··· 197 194 au CmdwinLeave * nnoremap <CR> za 198 195 " }}} 199 196 " FZF {{{ 200 - nnoremap <C-p> :<C-u>Files<CR> 201 - nnoremap <leader>f :<C-u>Files<CR> 202 197 nnoremap <leader><leader> :<C-u>Files<CR> 203 - nnoremap <leader>t :<C-u>Tags<CR> 204 198 nnoremap <leader>b :<C-u>Buffers<CR> 205 199 " }}} 206 200 " UndoTree {{{ 207 201 noremap <F2> :<C-u>UndotreeToggle<CR> 208 202 " }}} 209 - " EasyAlign {{{ 210 - vmap <leader>a <Plug>(EasyAlign) 211 - nmap <leader>a <Plug>(EasyAlign) 212 - " }}} 213 203 " Format {{{ 214 204 noremap g= gg=Gg`` 205 + noremap Q gq 215 206 " }}} 216 207 " Search {{{ 217 208 " Easier change and replace word ··· 239 230 " }}} 240 231 " Tabs {{{ 241 232 nnoremap <C-w>t :<C-u>tabnew <bar> Dirvish<CR> 233 + nnoremap ]w gt 234 + nnoremap [w gT 242 235 " }}} 243 236 " Yank to the end of line {{{ 244 237 nnoremap Y y$ 238 + " }}} 239 + " Terminal {{{ 240 + nnoremap <C-q>c :<C-u>term<CR> 241 + nnoremap <C-q>s :<C-u>split <bar> term<CR> 242 + nnoremap <C-q>v :<C-u>vsplit <bar> term<CR> 243 + 244 + tnoremap <C-q><C-q> <C-\><C-n> 245 245 " }}} 246 246 " }}} 247 247 " Configuration {{{ ··· 251 251 set grepprg=ag\ --vimgrep\ --hidden 252 252 endif 253 253 " }}} 254 - " BufferLine {{{ 255 - let g:bufferline_echo = 1 256 - let g:bufferline_rotate = 1 257 - let g:bufferline_active_buffer_left = '[' 258 - let g:bufferline_active_buffer_right = ']' 259 - let g:bufferline_fname_mod = ':~:.' 260 - " }}} 261 254 " Unload unneeded plugins {{{ 262 255 let g:loaded_netrw = 1 263 256 let g:loaded_netrwPlugin = 1 ··· 277 270 \ 'texthl': 'Warning', 278 271 \ } 279 272 " }}} 280 - " MPD {{{ 281 - command! -nargs=+ MPD call jobstart(['mpc', <f-args>]) 282 - command! MPDAdd call fzf#run({ 283 - \ 'source': 'mpc listall', 284 - \ 'sink': 'MPD add', 285 - \ }) 286 - " }}} 287 273 " Signify {{{ 288 274 let g:signify_sign_add = '▌' 289 275 let g:signify_sign_delete = '▖' ··· 297 283 let g:limelight_conceal_ctermfg = 'lightgray' 298 284 let g:limelight_conceal_guifg = '#666666' 299 285 " }}} 286 + " Terminal colors {{{ 287 + let g:terminal_color_0 = "#2a3158" 288 + let g:terminal_color_1 = "#e27878" 289 + let g:terminal_color_2 = "#89b8c2" 290 + let g:terminal_color_3 = "#e4aa80" 291 + let g:terminal_color_4 = "#84a0c6" 292 + let g:terminal_color_5 = "#d1a8ad" 293 + let g:terminal_color_6 = "#adc1cb" 294 + let g:terminal_color_7 = "#c6c8d1" 295 + let g:terminal_color_8 = "#444b71" 296 + let g:terminal_color_9 = "#e2a478" 297 + let g:terminal_color_10 = "#b4be82" 298 + let g:terminal_color_11 = "#d8e599" 299 + let g:terminal_color_12 = "#3e445e" 300 + let g:terminal_color_13 = "#673e43" 301 + let g:terminal_color_14 = "#686f9a" 302 + let g:terminal_color_15 = "#d4d5db" 300 303 " }}} 301 - 302 - noremap Q gq 304 + " }}} 303 305 let g:deoplete#enable_at_startup = 1

-5

nvim/plugin/files.vim

··· 1 - augroup pandoc 2 - au! 3 - au BufReadPost *.epub,*.odt,*.docx silent %!pandoc "%" -tmarkdown 4 - au BufWritePost *.epub,*.odt,*.docx silent write !pandoc -o "%" -fmarkdown 5 - augroup END

-5

nvim/plugin/macro.vim

··· 1 - nnoremap <silent> @R :set operatorfunc=macro#repeat<CR>g@ 2 - xnoremap <silent> @ :<C-u>call macro#repeat()<CR> 3 - function! macro#repeat(...) 4 - execute (a:0 ? "'[,']" : "'<,'>").'normal @'.nr2char(getchar()) 5 - endfunction

+12 -3

nvim/plugin/vsearch.vim

··· 1 1 " vsearch.vim - simplify visual search 2 - " Maintainer: Łukasz Niemier <lukasz@niemier.pl> 2 + " Maintainer: Łukasz Niemier <http://lukasz.niemier.pl> 3 + 4 + if exists("g:loaded_whirl") || v:version < 700 || &cp 5 + finish 6 + endif 7 + let g:loaded_whirl = 1 8 + let s:save_cpo = &cpo 9 + set cpo&vim 3 10 4 11 function! s:VSetSearch() 5 12 let temp = @@ ··· 18 25 xmap * <Plug>(vsearch-search-selected-forward) 19 26 xmap # <Plug>(vsearch-search-selected-backward) 20 27 21 - xmap gs <Plug>(vsearch-change-selected-forward) 22 - xmap gS <Plug>(vsearch-change-selected-backward) 28 + xmap s <Plug>(vsearch-change-selected-forward) 29 + xmap S <Plug>(vsearch-change-selected-backward) 30 + 31 + let &cpo = s:save_cpo

+6 -4

nvim/plugin/whirl.vim

··· 1 - " whirl.vim - vinegar for your dirvish 2 - " Maintainer: Łukasz Jan Niemier <http://lukasz.niemier.pl> 1 + " whirl.vim - vinegar for your dirvish Maintainer: Łukasz Jan Niemier 2 + " <http://lukasz.niemier.pl> 3 3 4 4 if exists("g:loaded_whirl") || v:version < 700 || &cp 5 5 finish ··· 10 10 11 11 augroup dirvish_sort 12 12 au! 13 - au FileType dirvish sort r /[^\/]$/ 13 + autocmd FileType dirvish let b:dirvish['pos']=getline('.') | 14 + \ sort! | sort! r /[/]$/ | 15 + \ keepjumps call search('\V\^'.escape(b:dirvish['pos'], '\').'\$', 'cw') 14 16 augroup END 15 17 16 18 if mapcheck('+', 'n') ==# '' 17 - nnoremap <silent> + :<C-U>Dirvish<CR> 19 + nnoremap + :<C-U>Dirvish<CR> 18 20 endif 19 21 20 22 let &cpo = s:save_cpo

-14

nvim/plugin/zoom.vim

··· 1 - " Zoom / Restore window. 2 - function! s:ZoomToggle() abort 3 - if exists('t:zoomed') && t:zoomed 4 - execute t:zoom_winrestcmd 5 - let t:zoomed = 0 6 - else 7 - let t:zoom_winrestcmd = winrestcmd() 8 - resize 9 - vertical resize 10 - let t:zoomed = 1 11 - endif 12 - endfunction 13 - command! ZoomToggle call s:ZoomToggle() 14 - nnoremap <silent> <C-w>z :ZoomToggle<CR>

Configure Feed

Configure Feed