this repo has no description
Update ftplugins
+77
-66
+12
-6
bin/Makefile
+12
-6
bin/Makefile
···
1
-
install: lein git-imerge pip
1
+
FILES = lein git-imerge docker-compose
2
+
3
+
install: $(FILES) pip
2
4
$(LN) . ${HOME}/.local/bin
3
5
4
6
lein:
5
-
$(WGET) -O./lein https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
6
-
chmod +x ./lein
7
+
$(WGET) -O$@ https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
8
+
chmod +x $@
7
9
8
10
git-imerge:
9
-
$(WGET) -O./git-imerge https://raw.githubusercontent.com/mhagger/git-imerge/master/git-imerge
10
-
chmod +x ./git-imerge
11
+
$(WGET) -O$@ https://raw.githubusercontent.com/mhagger/git-imerge/master/git-imerge
12
+
chmod +x $@
11
13
12
14
pip:
13
15
pip install --user --upgrade httpie patool
14
16
15
-
.PHONY: lein git-imerge
17
+
docker-compose:
18
+
$(WGET) -O$@ https://github.com/docker/compose/releases/download/1.5.1/docker-compose-$(shell uname -s)-$(shell uname -m)
19
+
chmod +x $@
20
+
21
+
.PHONY: pip $(FILES)
+31
-35
conky/config
+31
-35
conky/config
···
1
-
# Conky Metro Clock - http://fav.me/d424h9d
1
+
-- vi: ft=lua
2
+
conky.config = {
3
+
-- Conky settings
4
+
update_interval = 1,
2
5
3
-
# Conky settings
4
-
background yes
5
-
update_interval 1
6
+
override_utf8_locale = true,
6
7
7
-
override_utf8_locale yes
8
+
double_buffer = true,
9
+
no_buffers = true,
8
10
9
-
double_buffer yes
10
-
no_buffers yes
11
+
-- Window specifications
12
+
own_window = true,
13
+
own_window_type = 'dock',
14
+
own_window_transparent = true,
15
+
own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
11
16
12
-
text_buffer_size 2048
13
-
14
-
# Window specifications
15
-
own_window yes
16
-
own_window_type dock
17
-
own_window_transparent yes
18
-
own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
19
-
20
-
border_inner_margin 0
21
-
border_outer_margin 0
22
-
23
-
alignment bl
24
-
gap_x 100
25
-
gap_y 100
17
+
border_inner_margin = 0,
18
+
border_outer_margin = 0,
26
19
27
-
# Graphics settings
28
-
draw_shades no
29
-
draw_outline no
30
-
draw_borders no
31
-
draw_graph_borders no
20
+
alignment = 'bottom_left',
21
+
gap_x = 100,
22
+
gap_y = 100,
32
23
33
-
# Text settings
34
-
use_xft yes
35
-
xftalpha 0.1
36
-
text_buffer_size 2048
24
+
-- Graphics settings
25
+
draw_shades = false,
26
+
draw_outline = false,
27
+
draw_borders = false,
28
+
draw_graph_borders = false,
37
29
38
-
uppercase no
30
+
-- Text settings
31
+
use_xft = true,
32
+
font = 'Squarish Sans CT:size=30',
39
33
40
-
default_color b569c0
34
+
default_color = '#16A6EE',
35
+
};
41
36
42
-
TEXT
43
-
${voffset 10}${font Squarish Sans CT:size=30}${time %A}${font}${voffset -10}
44
-
${voffset 10}${font Squarish Sans CT:size=30}${time %d} ${time %B}${font}${voffset -10}
37
+
conky.text = [[
38
+
${voffset 10}${time %A}${font}${voffset -10}
39
+
${voffset 10}${time %d} ${time %B}${font}${voffset -10}
45
40
${voffset 10}${font Squarish Sans CT:size=100}${time %H:%M}${font}${voffset -10}
41
+
]];
+1
-1
fish/functions/compose.fish
+1
-1
fish/functions/compose.fish
+4
fish/functions/fish_user_key_bindings.fish
+4
fish/functions/fish_user_key_bindings.fish
+4
git/ignore
+4
git/ignore
+1
nvim/autoload/.gitignore
+1
nvim/autoload/.gitignore
···
1
+
/*.old
+9
-3
nvim/autoload/plug.vim
+9
-3
nvim/autoload/plug.vim
···
24
24
" " Using git URL
25
25
" Plug 'https://github.com/junegunn/vim-github-dashboard.git'
26
26
"
27
+
" " Using a non-master branch
28
+
" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
29
+
27
30
" " Plugin options
28
31
" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
29
32
"
30
33
" " Plugin outside ~/.vim/plugged with post-update hook
31
-
" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
34
+
" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
32
35
"
33
36
" " Unmanaged plugin (manually installed and updated)
34
37
" Plug '~/my-prototype-plugin'
···
172
175
call s:assoc(lod.map, cmd, name)
173
176
endif
174
177
call add(s:triggers[name].map, cmd)
175
-
elseif cmd =~ '^[A-Z]'
178
+
elseif cmd =~# '^[A-Z]'
176
179
if exists(':'.cmd) != 2
177
180
call s:assoc(lod.cmd, cmd, name)
178
181
endif
179
182
call add(s:triggers[name].cmd, cmd)
183
+
else
184
+
call s:err('Invalid `on` option: '.cmd.
185
+
\ '. Should start with an uppercase letter or `<Plug>`.')
180
186
endif
181
187
endfor
182
188
endif
···
294
300
295
301
function! s:err(msg)
296
302
echohl ErrorMsg
297
-
echom a:msg
303
+
echom '[vim-plug] '.a:msg
298
304
echohl None
299
305
return 0
300
306
endfunction
+1
nvim/ftdetect/javascript.vim
+1
nvim/ftdetect/javascript.vim
···
1
+
au BufRead,BufNewFile *.js.es6 set ft=javascript
+1
nvim/ftplugin/makefile.vim
+1
nvim/ftplugin/makefile.vim
···
1
+
set noexpandtab
+1
nvim/ftplugin/robots.vim
+1
nvim/ftplugin/robots.vim
···
1
+
set commentstring=#\ %s
+2
-2
nvim/ftplugin/rust.vim
+2
-2
nvim/ftplugin/rust.vim
···
5
5
noremap <leader>rb :wa \| call VimuxRunCommand("clear; cargo build")<CR>
6
6
noremap <leader>rt :wa \| call VimuxRunCommand("clear; cargo test")<CR>
7
7
8
-
au BufWritePre *.rs silent Autoformat
9
-
au BufWritePost *.rs silent !ctags -R .
8
+
au! BufWritePre *.rs silent Autoformat
9
+
au! BufWritePost *.rs silent !ctags -R .
+5
-16
nvim/init.vim
+5
-16
nvim/init.vim
···
19
19
Plug 'dag/vim-fish'
20
20
Plug 'ekalinin/Dockerfile.vim'
21
21
Plug 'elixir-lang/vim-elixir'
22
+
Plug 'pangloss/vim-javascript'
22
23
Plug 'rust-lang/rust.vim'
23
24
Plug 'tmux-plugins/vim-tmux'
24
25
···
62
63
Plug 'terryma/vim-multiple-cursors'
63
64
Plug 'tpope/vim-repeat'
64
65
Plug 'tpope/vim-unimpaired'
66
+
Plug 'dahu/EditorConfig'
65
67
66
68
call plug#end()
67
69
" }}}
···
77
79
" }}}
78
80
" Per directory .nvimrc {{{
79
81
set exrc
80
-
" Disable unsafe commands in local .vimrc
82
+
" Disable unsafe commands in local .nvimrc
81
83
set secure
82
84
" }}}
83
85
" User interface {{{
···
109
111
" Key mappings {{{
110
112
let mapleader = ','
111
113
112
-
" Swap 'go to marger' mappings
114
+
" Swap 'go to marker' mappings
113
115
nnoremap ' `
114
116
nnoremap ` '
115
117
116
118
" Buffers
117
-
noremap <F5> :bprev<CR>
118
-
noremap <F6> :bnext<CR>
119
119
noremap <leader>b :Unite -buffer-name=buffers -immediately -no-split buffer<CR>
120
120
121
121
nnoremap gV `[v`]
···
133
133
nnoremap ; :
134
134
vnoremap ; :
135
135
nnoremap : ;
136
-
137
-
" Choose window
138
-
nmap wc <Plug>(choosewin)
139
136
140
137
" Yanks
141
138
noremap <Leader>p "+p
···
143
140
noremap <silent> <Leader>y :Unite -buffer-name=yanks register history/yank<CR>
144
141
145
142
" Fast paste from system clipboard
146
-
inoremap <C-R><C-R> <C-R>*
143
+
inoremap <C-R><C-R> <C-R>+
147
144
148
145
" Some useful toggles for plugins
149
146
noremap <F2> :UndotreeToggle<CR>
···
165
162
166
163
" Clear search highlights
167
164
noremap <leader>l :nohlsearch<CR>
168
-
169
165
" }}}
170
166
" Files, backups and undo {{{
171
167
" Turn backup off, since most stuff is in SVN, git et.c anyway...
···
189
185
set softtabstop=2
190
186
set tabstop=2
191
187
set expandtab
192
-
au FileType Makefile set noexpandtab
193
-
au FileType snippet set noexpandtab
194
188
195
189
set textwidth=80
196
190
set nowrap " Don't wrap lines
···
208
202
209
203
" Text folding
210
204
nnoremap <space> za
211
-
" }}}
212
-
" Extras {{{
213
-
let g:markdown_extensions=["md", "markdown"]
214
-
let g:gist_clip_command = 'xsel -bi'
215
-
let g:AutoCloseProtectedRegions = ["Comment", "String", "Character"]
216
205
" }}}
217
206
" Extra commands {{{
218
207
" Remove all trailing whitespaces
+4
-3
nvim/plugin/unite.vim
+4
-3
nvim/plugin/unite.vim
···
6
6
let g:unite_force_overwrite_statusline = 0
7
7
8
8
" FuzzySearch
9
-
nnoremap <silent> <C-p> :<C-u>Unite -start-insert -buffer-name=Files file_rec/neovim file/new<CR>
9
+
nnoremap <silent> <C-p> :<C-u>Unite -start-insert -buffer-name=Files file_rec/async:! file/new<CR>
10
10
11
11
" Outline
12
12
nnoremap <silent> <C-o> :<C-u>Unite -buffer-name=Outline -immediately -auto-highlight -vertical outline<CR>
···
15
15
nnoremap <silent> <leader>/ :Search<CR>
16
16
command! Search Unite -auto-preview -no-split -immediately -buffer-name=Search grep:.
17
17
18
+
18
19
" Use ag for search
19
20
if executable('ag')
20
21
let g:unite_source_rec_async_command =
21
-
\ ['ag', '--follow', '--nocolor', '--nogroup', '--hidden', '-g', '']
22
+
\ ['ag', '--nocolor', '--nogroup', '--hidden', '-g', '']
22
23
23
24
let g:unite_source_grep_command = 'ag'
24
-
let g:unite_source_grep_default_opts = '--nogroup --nocolor --column'
25
+
let g:unite_source_grep_default_opts = '-i --vimgrep --hidden --ignore .git'
25
26
let g:unite_source_grep_recursive_opt = ''
26
27
endif
+1
utils/curlrc
+1
utils/curlrc
···
1
+
silent=true