diff options
| -rw-r--r-- | .config/nixpkgs/config.nix | 6 | ||||
| -rw-r--r-- | .vim/plugins.vim | 1 | ||||
| -rw-r--r-- | .vimrc | 25 |
3 files changed, 21 insertions, 11 deletions
diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix index 6e4c6a6..389c9a2 100644 --- a/.config/nixpkgs/config.nix +++ b/.config/nixpkgs/config.nix @@ -4,8 +4,8 @@ let sha256 = "009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk"; }) {}; unstable = import (builtins.fetchTarball { - url= "https://github.com/NixOS/nixpkgs/archive/0e2444aacb02b8c12416b71febca5cea416405f0.tar.gz"; - sha256 = "18lki60qb77h8akbzpzyang08i5iqppqz65msm7gmdhrky7f3i07"; }) {}; + url= "https://github.com/NixOS/nixpkgs/archive/c308da1c4b14b0ffdfe9c2e2a948320124938220.tar.gz"; + sha256 = "0ab9jhnlscxl1fl9rc7l978n26al1n77w32sr8gdbb11pfnhsizp"; }) {}; in { allowUnfree = true; @@ -251,6 +251,7 @@ in name = "javascript"; paths = [ nodejs-13_x + unstable.deno nodePackages.prettier nodePackages.eslint nodePackages.node2nix @@ -272,6 +273,7 @@ in name = "golang"; paths = [ go + unstable.gore ]; }; diff --git a/.vim/plugins.vim b/.vim/plugins.vim index 7f3f872..a3513c7 100644 --- a/.vim/plugins.vim +++ b/.vim/plugins.vim @@ -9,6 +9,7 @@ Plug 'junegunn/fzf.vim', { 'tag': 'f86ef1bce602713fe0b5b68f4bdca8c6 Plug 'mcchrish/nnn.vim', { 'tag': 'bfc91b503769920a366b12851b871795c0eb6825' } Plug 'tpope/vim-fugitive', { 'tag': '85e2c73830b6bb01ce7fc3a926d2b25836a253eb' } Plug 'pangloss/vim-javascript', { 'tag': 'c3966153e81bc3766b1627e6ab0cd53333b61c1e' } +Plug 'elixir-editors/vim-elixir', { 'tag': '53c530f79cfcd12498e31fcf8ecc466eba34c75c' } " Enable fzf.vim on Debian. silent! source /usr/share/doc/fzf/examples/fzf.vim @@ -177,12 +177,6 @@ nmap <Leader>re gg=G<C-o><C-o> " Reset all settings and source configuration. nmap <Leader>ra :set all& \| :source ~/.vimrc \| :e<cr> -" PHP REPL -nmap <Leader>rps :.w !psysh<cr> -nmap <Leader>rpf :term psysh %<cr> -nmap <Leader>rpt :term php artisan tinker<cr> -nmap <Leader>rpl :term psysh-tinker-live %<cr> - " Toggle color column nmap <leader>cv :execute "set colorcolumn=" . (&colorcolumn == "" ? "80" : "")<cr> @@ -272,9 +266,6 @@ endfunction command! -nargs=? -range Repl call s:repl(<line1>, <line2>, <f-args>) -nnoremap <leader>cc :Repl<cr> -vnoremap <leader>cc :Repl<cr> - "----------------Autorun----------------" @@ -295,6 +286,22 @@ augroup AutoCommands autocmd BufWritePost *.yml :call AnsibleCheck() autocmd FileType bash,sh autocmd! BufWritePost <buffer> :call ShellCheck() + " REPL commands + autocmd FileType go nnoremap <buffer> <leader>cc :Repl gore<cr> + autocmd FileType go vnoremap <buffer> <leader>cc :Repl gore<cr> + autocmd FileType lua nnoremap <buffer> <leader>cc :Repl lua<cr> + autocmd FileType lua vnoremap <buffer> <leader>cc :Repl lua<cr> + autocmd FileType php nnoremap <buffer> <leader>cc :Repl psysh<cr> + autocmd FileType php vnoremap <buffer> <leader>cc :Repl psysh<cr> + autocmd FileType elixir nnoremap <buffer> <leader>cc :Repl iex<cr> + autocmd FileType elixir vnoremap <buffer> <leader>cc :Repl iex<cr> + autocmd FileType python nnoremap <buffer> <leader>cc :Repl python<cr> + autocmd FileType python vnoremap <buffer> <leader>cc :Repl python<cr> + autocmd FileType sh,bash nnoremap <buffer> <leader>cc :Repl sh -x<cr> + autocmd FileType sh,bash vnoremap <buffer> <leader>cc :Repl sh -x<cr> + autocmd FileType javascript nnoremap <buffer> <leader>cc :Repl node<cr> + autocmd FileType javascript vnoremap <buffer> <leader>cc :Repl node<cr> + " General auto commands. autocmd BufWritePost quotes silent !notify-send "$(strfile %)" autocmd BufWritePost *.fortune silent !notify-send "$(strfile %)" |