From 4cd887bfd3f60b54b1e2087c75b6b9476003f6bf Mon Sep 17 00:00:00 2001
From: "Juan J. Martinez" <jjm@usebox.net>
Date: Wed, 29 Jun 2022 22:40:17 +0100
Subject: Removed conditions

---
 README.md   |  2 ++
 metals.vim  | 10 +++-----
 plugins.vim | 82 ++++++++++++++++++++++++++++---------------------------------
 3 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 44e07ec..1a14392 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 This is a work in progress!
 
+Requires nvim >= 0.6.1.
+
 Managed by [vim-plug](https://github.com/junegunn/vim-plug).
 
 For further information on installed plugins:
diff --git a/metals.vim b/metals.vim
index 303ee7e..c3a9354 100644
--- a/metals.vim
+++ b/metals.vim
@@ -40,12 +40,10 @@ function! MetalsMapKeys() abort
     nnoremap <buffer> <leader>dp  <cmd>lua vim.diagnostic.goto_prev()<CR>
 endfunction
 
-if has('nvim-0.5')
-  augroup lsp
-    au!
-    au FileType scala,sbt lua require('metals').initialize_or_attach(metals_config)
-  augroup end
-endif
+augroup lsp
+au!
+au FileType scala,sbt lua require('metals').initialize_or_attach(metals_config)
+augroup end
 
 " Helpful general settings
 "
diff --git a/plugins.vim b/plugins.vim
index ed793cb..7a7c501 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -23,43 +23,41 @@ Plug 'plasticboy/vim-markdown'
 Plug 'samsaga2/vim-z80'
 Plug 'tomtom/tcomment_vim'
 
-if has('nvim-0.5')
-    " status line
-    Plug 'nvim-lualine/lualine.nvim'
-    " general lua
-    Plug 'nvim-lua/popup.nvim'
-    Plug 'nvim-lua/plenary.nvim'
-    " scala
-    Plug 'scalameta/nvim-metals'
-    if has('nvim-0.5.1')
-        Plug 'nvim-telescope/telescope.nvim'
-    end
-    " auto complete
-    Plug 'hrsh7th/nvim-cmp'
-    Plug 'hrsh7th/cmp-nvim-lsp'
-    Plug 'hrsh7th/cmp-vsnip'
-    Plug 'hrsh7th/vim-vsnip'
-
-    " for LSP
-    Plug 'kyazdani42/nvim-web-devicons'
-    Plug 'folke/trouble.nvim'
-
-    " life improvements
-    Plug 'ojroques/nvim-bufdel'
-
-    " learning
-    Plug 'folke/which-key.nvim'
-end
-
-if has('nvim-0.6.1')
-    " lsp
-    Plug 'neovim/nvim-lspconfig'
-    Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-end
+" status line
+Plug 'nvim-lualine/lualine.nvim'
+
+" general lua
+Plug 'nvim-lua/popup.nvim'
+Plug 'nvim-lua/plenary.nvim'
+
+" scala
+Plug 'scalameta/nvim-metals'
+
+" telescole
+Plug 'nvim-telescope/telescope.nvim'
+
+" auto complete
+Plug 'hrsh7th/nvim-cmp'
+Plug 'hrsh7th/cmp-nvim-lsp'
+Plug 'hrsh7th/cmp-vsnip'
+Plug 'hrsh7th/vim-vsnip'
+
+" LSP
+Plug 'neovim/nvim-lspconfig'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+
+" for LSP
+Plug 'kyazdani42/nvim-web-devicons'
+Plug 'folke/trouble.nvim'
+
+" life improvements
+Plug 'ojroques/nvim-bufdel'
+
+" learning
+Plug 'folke/which-key.nvim'
 
 call plug#end()
 
-if has('nvim-0.5')
 :lua << EOF
     --  BufKil
     require('bufdel').setup {
@@ -70,19 +68,15 @@ if has('nvim-0.5')
     require("which-key").setup { }
 EOF
 
-    source  ~/.config/nvim/lualine.lua
-end
+source  ~/.config/nvim/lualine.lua
 
-" for LSC support
+" for LSP config
 "
-if has('nvim-0.6.1')
-    source  ~/.config/nvim/lsp.lua
-    source  ~/.config/nvim/treesitter.lua
-
-    " scala and metals
-    source ~/.config/nvim/metals.vim
-end
+source  ~/.config/nvim/lsp.lua
+source  ~/.config/nvim/treesitter.lua
 
+" scala and metals
+source ~/.config/nvim/metals.vim
 
 " auto-complete
 source ~/.config/nvim/cmp.vim
-- 
cgit v1.2.3