summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xherbstluftwm/files/autostart4
-rw-r--r--vim/files/vimrc19
-rw-r--r--zsh/.zprofile2
-rw-r--r--zsh/.zshrc4
-rw-r--r--zsh/package.toml7
5 files changed, 33 insertions, 3 deletions
diff --git a/herbstluftwm/files/autostart b/herbstluftwm/files/autostart
index fb26a3d..e4c106c 100755
--- a/herbstluftwm/files/autostart
+++ b/herbstluftwm/files/autostart
@@ -61,6 +61,10 @@ hc keybind $Mod-Control-Down resize down +$resizestep
hc keybind $Mod-Control-Up resize up +$resizestep
hc keybind $Mod-Control-Right resize right +$resizestep
+# mediakeys
+
+hc keybind XF86AudioPlay spawn playerctl play-pause
+
# tags
tag_names=( eins zwei drei vier )
tag_keys=( {1..9} 0 )
diff --git a/vim/files/vimrc b/vim/files/vimrc
index 07dd19a..888fd17 100644
--- a/vim/files/vimrc
+++ b/vim/files/vimrc
@@ -53,7 +53,7 @@ if dein#tap('denite.nvim')
nnoremap [Denite] <Nop>
nmap <leader>d [Denite]
- nnoremap [Denite]g :<C-u>Denite grep -auto-preview -split=no -no-empty<CR>
+ nnoremap [Denite]g :<C-u>Denite grep -auto-action=preview -split=no -no-empty<CR>
nnoremap [Denite]f :<C-u>Denite file/rec -start-filter -split=no<CR>
nnoremap [Denite]l :<C-u>Denite buffer file/old -split=no<CR>
nnoremap [Denite]r :<C-u>Denite -resume -refresh<CR>
@@ -61,6 +61,15 @@ if dein#tap('denite.nvim')
nnoremap [Denite]gf :DeniteCursorWord file/rec<CR>
nnoremap [Denite]gg :DeniteCursorWord grep<Cr>
nnoremap [Denite]g/ :DeniteCursorWord line<Cr>
+
+ function! s:denite_my_settings() abort
+ nnoremap <silent><buffer><expr> <CR> denite#do_map('do_action')
+ nnoremap <silent><buffer><expr> p denite#do_map('do_action', 'preview')
+ nnoremap <silent><buffer><expr> q denite#do_map('quit')
+ nnoremap <silent><buffer><expr> i denite#do_map('open_filter_buffer')
+ nnoremap <silent><buffer><expr> <Space> denite#do_map('toggle_select').'j'
+ endfunction
+ autocmd FileType denite call s:denite_my_settings()
endif
if dein#tap('vimfiler.vim')
call s:hook_source()
@@ -127,6 +136,14 @@ if dein#tap('vim-lsp')
\ 'whitelist': ['haskell'],
\ })
endif
+ if executable('texlab')
+ au User lsp_setup call lsp#register_server({
+ \ 'name': 'texlab',
+ \ 'cmd': {server_info->['texlab']},
+ \ 'whitelist': ['tex', 'plaintex'],
+ \ })
+
+ endif
function! s:on_lsp_buffer_enabled() abort
setl omnifunc=lsp#complete
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 0d2a4e3..b239aed 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -6,6 +6,6 @@ TEXMFCONFIG=~/.config/texlive
TEXMFVAR=~/.cache/texlive
export EDITOR VIMINIT TASKRC TEXMFHOME TEXMFCONFIG TEXMFVAR
-eval "$(perl -I$HOME/.local/perl5/lib/perl5/ -Mlocal::lib=--deactivate-all,$HOME/.local/perl5)"
+eval "$(api_ver=$(perl -MConfig -e'print $Config{api_version}') && perl -I$HOME/.local/perl5.${api_ver}/lib/perl5/ -Mlocal::lib=--deactivate-all,$HOME/.local/perl5.${api_ver})"
[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ee48183..f74810d 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -34,13 +34,15 @@ zstyle ':completion:*' use-perl on
zstyle ':completion:*' use-cache on
zstyle ':completion:*' cache-path $HOME/.cache/zsh/complcache
zstyle ':completion:*:*:kill:*' command 'ps --forest -u$USER -o pid,%cpu,tty,cputime,cmd'
-zstyle :compinstall filename "$HOME/.config/zsh/.zshrc"
+zstyle :compinstall filename "$HOME/.zshrc"
autoload -Uz compinit
compinit -d $HOME/.cache/zsh/zcompdump
# Misc
typeset -U path
path+=(~/.local/bin)
+path+=(~/.ghcup/bin, ~/.cabal/bin)
+
REPORTTIME=2
PROMPT=": "
RPROMPT="%1~"
diff --git a/zsh/package.toml b/zsh/package.toml
new file mode 100644
index 0000000..090d08e
--- /dev/null
+++ b/zsh/package.toml
@@ -0,0 +1,7 @@
+[[files]]
+source = './.zshrc'
+dest = '~/.zshrc'
+
+[[files]]
+source = './.zprofile'
+dest = '~/.zprofile'