diff --git a/install/3_vimux.sh b/install/3_vimux.sh index 9c606e58..89e55980 100755 --- a/install/3_vimux.sh +++ b/install/3_vimux.sh @@ -3,8 +3,6 @@ brew install neovim --HEAD brew install tmux -# vim dependencies - # link config files ln -s ~/dotfiles/nvim ~/.config/nvim ln -s ~/dotfiles/tmux.conf ~/.tmux.conf @@ -14,8 +12,11 @@ git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm sh -c 'curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' # additional language-servers for nvim-lspconfig -npm i -g vscode-langservers-extracted npm i -g stylelint-lsp +npm i -g typescript +npm i -g typescript-language-server +npm i -g vscode-langservers-extracted +npm i -g yaml-language-server vim +PlugInstall vim +CocInstall\ coc-calc\ coc-css\ coc-eslint\ coc-html\ coc-json\ coc-markdownlint\ coc-pairs\ coc-phpls\ coc-snippets\ coc-stylelintplus\ coc-tsserver\ coc-yaml\ coc-yank diff --git a/install/5_webdev.sh b/install/5_webdev.sh index 1c2ccffd..6276a71b 100755 --- a/install/5_webdev.sh +++ b/install/5_webdev.sh @@ -1,5 +1,6 @@ #!/usr/bin/env zsh +brew install composer brew install dnsmasq brew install httpd brew install imagemagick @@ -9,6 +10,11 @@ brew install nss brew install php@7.4 brew install php +# phpactor etc. +take ~/phpactor +git clone git@github.com:phpactor/phpactor . +composer install + # link etc-configs sudo rm -rf /opt/homebrew/etc/php sudo rm -rf /opt/homebrew/etc/httpd diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 86df9dca..863eb390 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -1,26 +1,9 @@ // Installed extensions are: //////////////////////////// // coc-calc -// coc-html -// coc-json -// coc-markdownlint -// coc-pairs -// coc-phpls // coc-snippets -// coc-tsserver -// coc-yaml { - "coc.preferences.formatOnSaveFiletypes": [ - "typescriptreact", - "javascriptreact", - "javascript", - "json", - "yaml" - ], // linters config - "javascript.format.enabled": false, - "javascript.validate.enable": false, - "typescript.format.enabled": false, "suggest.minTriggerInputLength": 3, "suggest.noselect": false, "suggest.enablePreselect": true, diff --git a/nvim/init.vim b/nvim/init.vim index 08074e0f..38d40ed0 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -29,6 +29,7 @@ Plug 'voldikss/vim-floaterm' Plug 'wellle/targets.vim' Plug 'wellle/tmux-complete.vim' Plug 'wincent/terminus' +Plug 'windwp/nvim-autopairs' call plug#end() diff --git a/nvim/plugins.vim b/nvim/plugins.vim index d5c1d72d..04640fb8 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -14,7 +14,9 @@ require('lualine').setup({ }, }) -require('hop').setup() +require('hop').setup({}) + +require('nvim-autopairs').setup({}) require('fzf-lua').setup({ winopts = { @@ -27,20 +29,18 @@ require('fzf-lua').setup({ -- LSP-config require('lspconfig').eslint.setup({}) +require('lspconfig').jsonls.setup({}) +require('lspconfig').html.setup({}) +require('lspconfig').yamlls.setup({}) +require('lspconfig').tsserver.setup({}) +require('lspconfig').phpactor.setup({}) require('lspconfig').stylelint_lsp.setup({ - settings = { - stylelintplus = { - -- TODO why this not working?! - autoFixOnFormat = true, - autoFixOnSave = true, - validateOnSave = true, - }, - }, + filetypes = { 'css', 'sass', 'scss' } }) require('lspconfig').cssls.setup({ - filetypes = { 'css', 'scss', 'sass' }, + filetypes = { 'css', 'sass', 'scss' }, settings = { css = { validate = false, @@ -73,6 +73,9 @@ nnoremap / lua require('fzf-lua').search_history() nnoremap c lua require('fzf-lua').git_commits() nnoremap b lua require('fzf-lua').git_branches() +" LSP +nnoremap f lua vim.lsp.buf.formatting() + " Hop nnoremap j lua require('hop').hint_words() diff --git a/zsh/exports b/zsh/exports index 99beabd4..5797d249 100644 --- a/zsh/exports +++ b/zsh/exports @@ -12,6 +12,7 @@ export PAGER="less" export PATH=/opt/homebrew/bin:$PATH export PATH=/opt/homebrew/opt/curl/bin:$PATH export PATH=/Users/webgefrickel/git/bin:$PATH +export PATH=/Users/webgefrickel/phpactor/bin:$PATH export SHELL=/opt/homebrew/bin/zsh export TERM=xterm-256color export VISUAL="/opt/homebrew/bin/nvim"