this repo has no description
Cleanups
+93
-202
+3
-7
bin/Makefile
+3
-7
bin/Makefile
···
1
-
FILES = lein git-imerge docker-compose docker-machine
1
+
FILES = docker-compose docker-machine
2
2
3
3
PWD = $(shell pwd)
4
4
5
-
install: $(FILES) pip
6
-
$(LN) ${PWD} ${HOME}/.local/bin
5
+
install: $(FILES)
7
6
8
7
lein:
9
8
$(WGET) -O$@ https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
10
9
chmod +x $@
11
10
12
-
pip:
13
-
pip install --user --upgrade httpie patool
14
-
15
11
docker-compose:
16
12
$(WGET) -O$@ https://github.com/docker/compose/releases/download/1.5.1/docker-compose-$(shell uname -s)-$(shell uname -m)
17
13
chmod +x $@
···
24
20
$(WGET) -O$@ https://raw.githubusercontent.com/mhinz/neovim-remote/master/nvr
25
21
chmod +x $@
26
22
27
-
.PHONY: pip $(FILES)
23
+
.PHONY: $(FILES)
+1
-1
bin/git-cleanup
+1
-1
bin/git-cleanup
-6
fish/config.fish
-6
fish/config.fish
-3
fish/functions/grep.fish
-3
fish/functions/grep.fish
-3
fish/functions/most-used.fish
-3
fish/functions/most-used.fish
-3
fish/functions/paste.fish
-3
fish/functions/paste.fish
-3
fish/functions/stop.fish
-3
fish/functions/stop.fish
-3
git/ignore
-3
git/ignore
+6
-21
nix/config.nix
+6
-21
nix/config.nix
···
1
1
{
2
2
packageOverrides = pkgs: rec {
3
-
runtime = pkgs.buildEnv {
4
-
name = "runtime";
5
-
paths = [
6
-
pkgs.python27Full
7
-
pkgs.python27Packages.pip
8
-
];
9
-
};
10
-
11
-
languages = pkgs.buildEnv {
12
-
name = "languages";
13
-
paths = [
14
-
pkgs.elixir
15
-
pkgs.ghc
16
-
pkgs.go
17
-
pkgs.julia
18
-
pkgs.ocaml
19
-
pkgs.sbt
20
-
pkgs.scala
21
-
];
22
-
};
23
-
24
3
editors = pkgs.buildEnv {
25
4
name = "editors";
26
5
paths = [
···
31
10
scm = pkgs.buildEnv {
32
11
name = "scm";
33
12
paths = [
13
+
pkgs.mercurial
14
+
34
15
pkgs.git
35
16
pkgs.gitAndTools.hub
36
17
pkgs.gitAndTools.git-imerge
···
43
24
pkgs.silver-searcher
44
25
pkgs.jq
45
26
pkgs.wrk
27
+
pkgs.tmux
28
+
pkgs.tldr
29
+
pkgs.direnv
30
+
universal-ctags
46
31
];
47
32
};
48
33
+1
-5
nvim/Makefile
+1
-5
nvim/Makefile
···
4
4
5
5
install: python
6
6
$(LN) ${PWD} $(XDG_CONFIG_HOME)/nvim
7
-
# nvim +PlugUpdate +qall # Currently doesn't work
8
-
@echo 'Run NeoVim and execute `:PlugInstall`'
7
+
nvim +PlugUpgrade +PlugInstall +qa # Currently doesn't work
9
8
10
9
clean:
11
10
rm $(XDG_CONFIG_HOME)/nvim
12
-
13
-
python:
14
-
pip install --user --upgrade neovim
15
11
16
12
.PHONY: install clean
+38
-24
nvim/autoload/plug.vim
+38
-24
nvim/autoload/plug.vim
···
115
115
function! s:define_commands()
116
116
command! -nargs=+ -bar Plug call s:add(<args>)
117
117
if !executable('git')
118
-
return s:err('`git` executable not found. vim-plug requires git.')
118
+
return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.')
119
119
endif
120
120
command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>])
121
121
command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(<bang>0, [<f-args>])
···
450
450
451
451
try
452
452
let repo = s:trim(a:repo)
453
-
let name = fnamemodify(repo, ':t:s?\.git$??')
454
-
let spec = extend(s:infer_properties(name, repo),
455
-
\ a:0 == 1 ? s:parse_options(a:1) : s:base_spec)
453
+
let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
454
+
let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??'))
455
+
let spec = extend(s:infer_properties(name, repo), opts)
456
456
if !has_key(g:plugs, name)
457
457
call add(g:plugs_order, name)
458
458
endif
···
620
620
endif
621
621
endfunction
622
622
623
-
function! s:prepare()
623
+
function! s:finish_bindings()
624
+
nnoremap <silent> <buffer> R :silent! call <SID>retry()<cr>
625
+
nnoremap <silent> <buffer> D :PlugDiff<cr>
626
+
nnoremap <silent> <buffer> S :PlugStatus<cr>
627
+
nnoremap <silent> <buffer> U :call <SID>status_update()<cr>
628
+
xnoremap <silent> <buffer> U :call <SID>status_update()<cr>
629
+
nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
630
+
nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
631
+
endfunction
632
+
633
+
function! s:prepare(...)
624
634
call s:job_abort()
625
635
if s:switch_in()
626
-
silent %d _
627
-
else
628
-
call s:new_window()
629
-
nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
630
-
nnoremap <silent> <buffer> R :silent! call <SID>retry()<cr>
631
-
nnoremap <silent> <buffer> D :PlugDiff<cr>
632
-
nnoremap <silent> <buffer> S :PlugStatus<cr>
633
-
nnoremap <silent> <buffer> U :call <SID>status_update()<cr>
634
-
xnoremap <silent> <buffer> U :call <SID>status_update()<cr>
635
-
nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
636
-
nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
637
-
let b:plug_preview = -1
638
-
let s:plug_tab = tabpagenr()
639
-
let s:plug_buf = winbufnr(0)
640
-
call s:assign_name()
636
+
normal q
637
+
endif
638
+
639
+
call s:new_window()
640
+
nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
641
+
if a:0 == 0
642
+
call s:finish_bindings()
641
643
endif
644
+
let b:plug_preview = -1
645
+
let s:plug_tab = tabpagenr()
646
+
let s:plug_buf = winbufnr(0)
647
+
call s:assign_name()
648
+
642
649
silent! unmap <buffer> <cr>
643
650
silent! unmap <buffer> L
644
651
silent! unmap <buffer> o
645
652
silent! unmap <buffer> X
646
653
setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
647
654
setf vim-plug
648
-
call s:syntax()
655
+
if exists('g:syntax_on')
656
+
call s:syntax()
657
+
endif
649
658
endfunction
650
659
651
660
function! s:assign_name()
···
755
764
call add(msgs, "Press 'D' to see the updated changes.")
756
765
endif
757
766
echo join(msgs, ' ')
767
+
call s:finish_bindings()
758
768
endfunction
759
769
760
770
function! s:retry()
···
829
839
\ 'fin': 0
830
840
\ }
831
841
832
-
call s:prepare()
842
+
call s:prepare(1)
833
843
call append(0, ['', ''])
834
844
normal! 2G
835
845
silent! redraw
···
840
850
" Python version requirement (>= 2.7)
841
851
if python && !has('python3') && !ruby && !s:nvim && s:update.threads > 1
842
852
redir => pyv
843
-
silent python import platform; print(platform.python_version())
853
+
silent python import platform; print platform.python_version()
844
854
redir END
845
855
let python = s:version_requirement(
846
856
\ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6])
···
2017
2027
let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)')
2018
2028
call s:progress_bar(2, bar, len(total))
2019
2029
for origin in [1, 0]
2030
+
let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))'))))
2031
+
if empty(plugs)
2032
+
continue
2033
+
endif
2020
2034
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
2021
-
for [k, v] in reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))'))))
2035
+
for [k, v] in plugs
2022
2036
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
2023
2037
let diff = s:system_chomp('git log --pretty=format:"%h%x01%d%x01%s%x01%cr" '.s:shellesc(range), v.dir)
2024
2038
if !empty(diff)
+2
-2
nvim/ftplugin/ruby.vim
+2
-2
nvim/ftplugin/ruby.vim
-2
nvim/ftplugin/rust.vim
-2
nvim/ftplugin/rust.vim
+8
-5
nvim/init.vim
+8
-5
nvim/init.vim
···
6
6
Plug 'tpope/vim-sensible'
7
7
8
8
" Visual
9
-
Plug 'chriskempson/base16-vim'
10
9
Plug 'bling/vim-bufferline'
10
+
Plug 'chriskempson/base16-vim'
11
11
Plug 'itchyny/lightline.vim'
12
12
Plug 'myusuf3/numbers.vim'
13
13
Plug 'nathanaelkane/vim-indent-guides'
14
14
Plug 'raymond-w-ko/vim-niji'
15
15
16
16
" Languages
17
+
Plug 'LnL7/vim-nix'
17
18
Plug 'cespare/vim-toml'
18
19
Plug 'dag/vim-fish'
19
20
Plug 'ekalinin/Dockerfile.vim'
20
21
Plug 'elixir-lang/vim-elixir'
22
+
Plug 'lambdatoast/elm.vim'
23
+
Plug 'lervag/vimtex'
21
24
Plug 'rust-lang/rust.vim'
22
-
Plug 'LnL7/vim-nix'
23
-
Plug 'lervag/vimtex'
24
-
Plug 'lambdatoast/elm.vim'
25
+
Plug 'slim-template/vim-slim'
25
26
Plug 'vim-ruby/vim-ruby'
26
27
27
28
" Git
···
33
34
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
34
35
Plug 'tpope/vim-vinegar'
35
36
Plug 'wakatime/vim-wakatime'
36
-
Plug 'majutsushi/tagbar'
37
+
Plug 'justinmk/vim-dirvish'
38
+
Plug 'tpope/vim-eunuch'
37
39
38
40
" TMux Integration
39
41
Plug 'benmills/vimux'
···
43
45
Plug 'Shougo/deoplete.nvim'
44
46
Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
45
47
Plug 'racer-rust/vim-racer'
48
+
Plug 'mattn/emmet-vim'
46
49
47
50
" Code manipulation
48
51
Plug 'Raimondi/delimitMate'
+1
nvim/plugin/files.vim
+1
nvim/plugin/files.vim
+2
-3
nvim/plugin/folding.vim
+2
-3
nvim/plugin/folding.vim
-5
nvim/plugin/netrw.vim
-5
nvim/plugin/netrw.vim
+1
-1
nvim/plugin/syntax-check.vim
+1
-1
nvim/plugin/syntax-check.vim
+1
-2
nvim/plugin/undo.vim
+1
-2
nvim/plugin/undo.vim
+24
-90
utils/dir_colors
+24
-90
utils/dir_colors
···
1
1
# vi: ft=dircolors
2
-
# Configuration file for dircolors, a utility to help you set the
3
-
# LS_COLORS environment variable used by GNU ls with the --color option.
4
-
# Copyright (C) 1996, 1999-2010 Free Software Foundation, Inc.
5
-
# Copying and distribution of this file, with or without modification,
6
-
# are permitted provided the copyright notice and this notice are preserved.
7
-
# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
8
-
# slackware version of dircolors) are recognized but ignored.
9
-
# Below, there should be one TERM entry for each termtype that is colorizable
10
-
TERM Eterm
11
-
TERM ansi
12
-
TERM color-xterm
13
-
TERM con132x25
14
-
TERM con132x30
15
-
TERM con132x43
16
-
TERM con132x60
17
-
TERM con80x25
18
-
TERM con80x28
19
-
TERM con80x30
20
-
TERM con80x43
21
-
TERM con80x50
22
-
TERM con80x60
23
-
TERM cons25
24
-
TERM console
25
-
TERM cygwin
26
-
TERM dtterm
27
-
TERM eterm-color
28
-
TERM gnome
29
-
TERM gnome-256color
30
-
TERM jfbterm
31
-
TERM konsole
32
-
TERM kterm
33
-
TERM linux
34
-
TERM linux-c
35
-
TERM mach-color
36
-
TERM mlterm
37
-
TERM putty
38
-
TERM rxvt
39
-
TERM rxvt-256color
40
-
TERM rxvt-cygwin
41
-
TERM rxvt-cygwin-native
42
-
TERM rxvt-unicode
43
-
TERM rxvt-unicode256
44
-
TERM screen
45
-
TERM screen-256color
46
-
TERM screen-256color-bce
47
-
TERM screen-bce
48
-
TERM screen-w
49
-
TERM screen.linux
50
-
TERM vt100
51
-
TERM xterm
52
-
TERM xterm-16color
53
-
TERM xterm-256color
54
-
TERM xterm-88color
55
-
TERM xterm-color
56
-
TERM xterm-debian
57
2
# Below are the color init strings for the basic file types. A color init
58
3
# string consists of one or more of the following numeric codes:
59
4
# Attribute codes:
···
90
35
STICKY 48;5;33;38;5;230 # dir with the sticky bit set (+t) and not other-writable
91
36
# This is for files with execute permission:
92
37
EXEC 01;38;5;180
93
-
# List any file extensions like '.gz' or '.tar' that you would like ls
94
-
# to colorize below. Put the extension, a space, and the color init string.
95
-
# (and any comments you want to add after a '#')
96
-
# If you use DOS-style suffixes, you may want to uncomment the following:
97
-
#.cmd 01;32 # executables (bright green)
98
-
#.exe 01;32
99
-
#.com 01;32
100
-
#.btm 01;32
101
-
#.bat 01;32
102
-
# Or if you want to colorize scripts even if they do not have the
103
-
# executable bit actually set.
104
-
#.sh 01;32
105
-
#.csh 01;32
106
38
107
-
# archives or compressed (violet + bold for compression)
39
+
# archives or compressed (violet + bold for compression) {{{
108
40
.tar 00;38;5;05
109
41
.tgz 01;38;5;05
110
42
.arj 01;38;5;05
···
135
67
.7z 01;38;5;05
136
68
.rz 01;38;5;05
137
69
.apk 01;38;5;05
138
-
139
-
# image formats (yellow)
70
+
# }}}
71
+
# image formats (yellow) {{{
140
72
.jpg 00;38;5;03
141
73
.JPG 00;38;5;03 #stupid but needed
142
74
.jpeg 00;38;5;03
···
162
94
.cgm 00;38;5;03
163
95
.emf 00;38;5;03
164
96
.eps 00;38;5;03
165
-
166
-
# files of interest (base1 + bold)
97
+
# }}}
98
+
# files of interest (base1 + bold) {{{
167
99
.pdf 01;38;5;01
168
100
.tex 01;38;5;01
169
-
170
-
# "unimportant" files as logs and backups (base01)
101
+
# }}}
102
+
# "unimportant" files as logs and backups (base01) {{{
171
103
.log 00;38;5;18
172
104
.bak 00;38;5;18
173
105
.aux 00;38;5;18
174
106
.bbl 00;38;5;18
175
107
.blg 00;38;5;18
176
-
177
-
# audio formats (orange)
108
+
# }}}
109
+
# audio formats (orange) {{{
178
110
.aac 00;38;5;06
179
111
.au 00;38;5;06
180
112
.flac 00;38;5;06
···
186
118
.ogg 00;38;5;06
187
119
.wav 00;38;5;06
188
120
.oga 00;38;5;06
189
-
190
-
# video formats (as audio + bold)
121
+
# }}}
122
+
# video formats (as audio + bold) {{{
191
123
.mov 01;38;5;06
192
124
.mpg 01;38;5;06
193
125
.mpeg 01;38;5;06
···
207
139
.flv 01;38;5;06
208
140
.ogv 01;38;5;06
209
141
.ogx 01;38;5;06
210
-
211
-
# Scripts
142
+
# }}}
143
+
# Scripts {{{
212
144
.fish 01;38;5;02
213
145
.sh 01;38;5;02
214
-
215
-
# Source files
146
+
# }}}
147
+
# Source files {{{
216
148
.rb 01;38;5;01
217
149
.ru 00;38;5;01
218
-
.rs 00;38;5;07
150
+
.rs 00;38;5;16
219
151
.py 01;38;5;02
220
152
.pyc 00;38;5;02
221
153
.hs 01;38;5;05
···
223
155
.js 01;38;5;11
224
156
.coffee 01;38;5;11
225
157
.ts 01;38;5;11
226
-
227
-
# Documentation
158
+
.nix 01;38;5;13
159
+
# }}}
160
+
# Documentation {{{
228
161
.md 01;38;5;07
229
162
.markdown 01;38;5;07
230
-
231
-
# Web
163
+
# }}}
164
+
# Web {{{
232
165
.html 00;38;5;6
233
166
.xml 00;38;5;6
234
167
.yml 00;38;5;6
235
168
.json 00;38;5;6
236
169
.css 00;38;5;6
237
170
.scss 00;38;5;6
238
-
239
-
# Templates
171
+
# }}}
172
+
# Templates {{{
240
173
.erb 01;38;5;6
241
174
.curly 01;38;5;6
242
175
.haml 01;38;5;6
243
176
.builder 01;38;5;6
177
+
# }}}