neovim/init.lua

@@ -13,17 +13,17 @@
 local data_dir = vim.fn.stdpath('data')
 vim.cmd([[
 let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
-let plug_path = data_dir . '/autoload/plug.vim'
+if empty(glob(data_dir . '/autoload/plug.vim'))
-if empty(glob(plug_path))
+    silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-    execute '!curl -fLo '.plug_path.' --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-    execute 'so '.plug_path
 endif
+autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 ]])
-
+--
 -- vim-plug
 local Plug = vim.fn['plug#']
 
-vim.call('plug#begin')
+-- TODO: Change this to relative datadir
+vim.call('plug#begin', '~/.config/nvim/plugged')
 
 -- libs and dependencies
 Plug('nvim-lua/plenary.nvim')
@@ -76,6 +76,7 @@ Plug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines
 Plug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes
 Plug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog
 Plug('folke/todo-comments.nvim') -- Highlights TODO
+Plug('TaDaa/vimade') -- shade alternative
 
 -- other utilities
 Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
@@ -86,11 +87,7 @@ Plug('mickael-menu/zk-nvim') -- Zettelkasten
 ---------
 vim.call('plug#end')
 
-vim.cmd([[
+
-    if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
-        \| PlugInstall --sync | autocmd VimEnter * so $MYVIMRC
-    \| endif
-]])
 
 vim.cmd([[
 set number relativenumber
@@ -104,6 +101,7 @@ set scrolloff=30
 set signcolumn=yes
 set colorcolumn=80
 set background=light
+
 ]])
 vim.opt.lazyredraw = true
 vim.opt.termguicolors = true
@@ -376,12 +374,6 @@ remap('n', '<leader>gs', function() require('neogit').open({}) end);
 
 -- LSP settings
 -- This function gets run when an LSP connects to a particular buffer.
-require("inlay-hints").setup {
-    only_current_line = true,
-    eol = {
-        right_align = true,
-    }
-}
 local on_attach = function(client, bufnr)
     -- NOTE: Remember that lua is a real programming language, and as such it is possible
     -- to define small helper and utility functions so you don't have to repeat yourself
@@ -897,3 +889,4 @@ vim.cmd([[
 let g:conjure#mapping#doc_word = v:false
 ]])
 
+