Chris 4 年 前
コミット
36e9fdf69e
6 ファイル変更12 行追加14 行削除
  1. 1 0
      init.lua
  2. 1 1
      lua/config.lua
  3. 6 0
      lua/nv-indentline/init.lua
  4. 1 3
      lua/nv-utils/init.lua
  5. 2 10
      lua/plugins.lua
  6. 1 0
      lua/settings.lua

+ 1 - 0
init.lua

@@ -33,6 +33,7 @@ require('nv-dashboard')
 require('nv-dial')
 require('nv-nvim-dap')
 require('nv-lightbulb')
+require('nv-indentline')
 -- require('nv-lspinstall')
 
 -- Which Key (Hope to replace with Lua plugin someday)

+ 1 - 1
lua/config.lua

@@ -1,3 +1,3 @@
-AUTO_COMPLETE=false
+AUTO_COMPLETE=true
 -- make list of languages
 AUTO_FORMAT=true

+ 6 - 0
lua/nv-indentline/init.lua

@@ -0,0 +1,6 @@
+vim.g.indent_blankline_buftype_exclude = {'terminal'}
+vim.g.indent_blankline_filetype_exclude = {'help', 'startify', 'dashboard', 'packer', }
+vim.g.indent_blankline_char = '▏'
+vim.g.indent_blankline_use_treesitter=true
+-- vim.g.indent_blankline_show_current_context = true
+-- vim.g.indent_blankline_context_patterns = {'class', 'function', 'method', '^if', '^while', 'div', '^for', '^object', '^table', 'block', 'arguments'}

+ 1 - 3
lua/nv-utils/init.lua

@@ -34,9 +34,8 @@ nv_utils.define_augroups({
         {'FileType', 'markdown', 'setlocal wrap'}, {'FileType', 'markdown', 'setlocal spell'},
         {'BufWinEnter', '.sol', 'setlocal filetype=solidity'},
 
-  -- "       \ nocursorline
         -- seems to be nobuflisted that makes my stuff disapear will do more testing
-        {'FileType', 'dashboard', 'setlocal noswapfile synmaxcol& signcolumn=no norelativenumber nocursorcolumn nospell  nolist  nonumber bufhidden=wipe colorcolumn= foldcolumn=0 matchpairs= '},
+        {'FileType', 'dashboard', 'setlocal nocursorline noswapfile synmaxcol& signcolumn=no norelativenumber nocursorcolumn nospell  nolist  nonumber bufhidden=wipe colorcolumn= foldcolumn=0 matchpairs= '},
         {'FileType', 'dashboard', 'set showtabline=0 | autocmd WinLeave <buffer> set showtabline=2'},
         {'BufRead', '*.sol', 'setlocal filetype=solidity'}, {'BufNewFile', '*.sol', 'setlocal filetype=solidity'},
 
@@ -57,7 +56,6 @@ nv_utils.define_augroups({
 
 function nv_utils.add_to_workspace_folder()
     vim.lsp.buf.add_workspace_folder()
-
 end
 
 function nv_utils.clear_references()

+ 2 - 10
lua/plugins.lua

@@ -116,15 +116,8 @@ return require('packer').startup(function(use)
     use 'blackcauldron7/surround.nvim'
 
     -- TODO put this back when stable for indent lines
-    -- 	use { 'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
-    -- 	vim.g.indent_blankline_space_char = ' '
-    -- 	vim.g.indent_blankline_buftype_exclude = {'terminal'}
-    -- 	vim.g.indent_blankline_filetype_exclude = {'help', 'startify'}
-    -- 	vim.g.indent_blankline_char = '▏'
-    -- 	vim.g.indent_blankline_use_treesitter=true
-    -- use 'AndrewRadev/tagalong.vim'
-    -- use 'alvan/vim-closetag'
-    -- use 'RRethy/vim-illuminate'
+    	use { 'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
+    	-- vim.g.indent_blankline_space_char = ''
     -- use 'b3nj5m1n/kommentary'
     -- use {
     --     'glacambre/firenvim',
@@ -132,7 +125,6 @@ return require('packer').startup(function(use)
     --         vim.fn['firenvim#install'](1)
     --     end
     -- }
-    -- use 'tpope/vim-sleuth'
     -- use 'glepnir/dashboard-nvim'
     -- use 'mhinz/vim-startify'
     -- use 'cstrap/python-snippets'

+ 1 - 0
lua/settings.lua

@@ -6,6 +6,7 @@ vim.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys
 vim.o.pumheight = 10 -- Makes popup menu smaller
 vim.o.fileencoding = "utf-8" -- The encoding written to file
 vim.o.cmdheight = 2 -- More space for displaying messages
+vim.cmd('set colorcolumn=99999') -- fix indentline for now
 vim.o.mouse = "a" -- Enable your mouse
 vim.o.splitbelow = true -- Horizontal splits will automatically be below
 vim.o.termguicolors = true -- set term giu colors most terminals support this