remove alacritty, update configs

2 files changed, 16 insertions, 3 deletions

diff --git a/init.vim b/init.vim
index b8b44f3..e66c5ef 100644
--- a/init.vim
+++ b/init.vim
@@ -25,12 +25,25 @@ autocmd BufWritePre * %s/\s\+$//e
 
 augroup fmtphp
   autocmd!
-  autocmd BufWritePre *.php undojoin | Neoformat
+  autocmd BufWritePre *.php undojoin | lua vim.lsp.buf.formatting()
 augroup END
 
 filetype plugin indent on
 autocmd FileType yaml setl indentkeys-=<:>
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 
+nnoremap Y y$
+
+nnoremap n nzzzv
+nnoremap N Nzzzv
+nnoremap J mzJ`z
+
+inoremap , ,<c-g>u
+inoremap . .<c-g>u
+inoremap ! !<c-g>u
+inoremap ? ?<c-g>u
+inoremap $ $<c-g>u
+inoremap > ><c-g>u
+
 " Has to be the last line for the .nvimrc per project
 set secure
diff --git a/lua/plugins.lua b/lua/plugins.lua
index b3362bb..aa5835d 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -12,6 +12,8 @@ return require('packer').startup(function(use)
         }
     }
 
+    use { "beauwilliams/focus.nvim", config = function() require("focus").setup() end }
+
     use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
     use { 'nvim-treesitter/playground' }
     use { 'nvim-treesitter/nvim-treesitter-refactor' }
@@ -52,8 +54,6 @@ return require('packer').startup(function(use)
 
     use { 'tpope/vim-dispatch', opt = true, cmd = {'Dispatch', 'Make', 'Focus', 'Start'}}
 
-    use 'sbdchd/neoformat'
-
     use {
         'neovim/nvim-lspconfig',
         requires = {