summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git/.gitconfig2
-rw-r--r--i3/.config/i3blocks/config6
-rw-r--r--qutebrowser/.config/qutebrowser/config.py1
-rw-r--r--vim/.vimrc26
4 files changed, 20 insertions, 15 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 79e64f8..369dcef 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -21,3 +21,5 @@
ff = true
[pull]
rebase = false
+[credential]
+ helper = store
diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config
index 0f0c207..74b48c6 100644
--- a/i3/.config/i3blocks/config
+++ b/i3/.config/i3blocks/config
@@ -31,12 +31,14 @@ signal=1
[primary]
label=<span color='gray'></span>
-command=echo "$(xclip -o | grep -o '^.\{0,9\}' | sed -e 's/[^a-zA-Z0-9\-]/_/g')"
+# command=echo "$(xclip -o | grep -o '^.\{0,9\}' | sed -e 's/[^a-zA-Z0-9\-]/_/g')"
+command=echo ""
interval=5
[clipboard]
label=<span color='gray'></span>
-command=echo "$(xclip -o -selection "clipboard" | grep -o '^.\{0,9\}' | sed -e 's/[^a-zA-Z0-9\-]/_/g')"
+# command=echo "$(xclip -o -selection "clipboard" | grep -o '^.\{0,9\}' | sed -e 's/[^a-zA-Z0-9\-]/_/g')"
+command=echo ""
interval=5
[volume]
diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py
index 0f09412..9ab12f4 100644
--- a/qutebrowser/.config/qutebrowser/config.py
+++ b/qutebrowser/.config/qutebrowser/config.py
@@ -60,6 +60,7 @@ config.bind("gl", 'tab-move +')
config.bind("<Ctrl-L>", 'tab-next')
config.bind("<Ctrl-H>", 'tab-prev')
config.bind("<Ctrl-D>", 'tab-close')
+config.bind("<Ctrl-W>", 'do-nothing')
# Bindings for insert mode
# config.unbind("<Ctrl-A>", mode='insert')
diff --git a/vim/.vimrc b/vim/.vimrc
index 19bc647..94ba320 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -227,7 +227,7 @@ set undodir^=~/.vim/undo//
" // : store absolute path
" set complete+=k
-set conceallevel=2
+set conceallevel=0
set cursorline
set diffopt=filler,vertical,hiddenoff
set expandtab
@@ -488,15 +488,15 @@ if has("nvim")
endif
"" Experimental {{{1
-if has("nvim") && hostname() != "peuplier"
- lua require'nvim_lsp'.pyls.setup{}
- autocmd Filetype python setlocal omnifunc=v:lua.vim.lsp.omnifunc
- nnoremap <expr> <c-g> Remembrall('<c-g>')
- nnoremap <silent> <c-g>h <cmd>lua vim.lsp.buf.hover()<cr>
- nnoremap <silent> <c-g>a <cmd>lua vim.lsp.buf.declaration()<cr>
- nnoremap <silent> <c-g>d <cmd>lua vim.lsp.buf.definition()<cr>
- nnoremap <silent> <c-g>i <cmd>lua vim.lsp.buf.implementation()<cr>
- nnoremap <silent> <c-g>s <cmd>lua vim.lsp.buf.signature_help()<cr>
- nnoremap <silent> <c-g>t <cmd>lua vim.lsp.buf.type_definition()<cr>
- nnoremap <silent> <c-g><c-g> <cmd>lua vim.lsp.stop_client(vim.lsp.get_active_clients())<cr>
-endif
+" if has("nvim") && hostname() != "peuplier"
+" lua require'nvim_lsp'.pyls.setup{}
+" autocmd Filetype python setlocal omnifunc=v:lua.vim.lsp.omnifunc
+" nnoremap <expr> <c-g> Remembrall('<c-g>')
+" nnoremap <silent> <c-g>h <cmd>lua vim.lsp.buf.hover()<cr>
+" nnoremap <silent> <c-g>a <cmd>lua vim.lsp.buf.declaration()<cr>
+" nnoremap <silent> <c-g>d <cmd>lua vim.lsp.buf.definition()<cr>
+" nnoremap <silent> <c-g>i <cmd>lua vim.lsp.buf.implementation()<cr>
+" nnoremap <silent> <c-g>s <cmd>lua vim.lsp.buf.signature_help()<cr>
+" nnoremap <silent> <c-g>t <cmd>lua vim.lsp.buf.type_definition()<cr>
+" nnoremap <silent> <c-g><c-g> <cmd>lua vim.lsp.stop_client(vim.lsp.get_active_clients())<cr>
+" endif