Chris 4 年之前
父节点
当前提交
2a0c547fcc
共有 8 个文件被更改,包括 30 次插入14 次删除
  1. 2 2
      README.md
  2. 2 2
      init.lua
  3. 3 0
      lua/config.lua
  4. 1 1
      lua/nv-compe/init.lua
  5. 1 1
      lua/nv-startify/init.lua
  6. 4 1
      lua/nv-utils/init.lua
  7. 8 7
      lua/plugins.lua
  8. 9 0
      vimscript/functions.vim

+ 2 - 2
README.md

@@ -150,6 +150,8 @@ To set up your particular debugger, look here:
 
 **HIGH PRIORITY**
 
+Move user config into `config.lua`
+
 From here I will update for bug fixes and implement low priority
 features when I have time
 
@@ -175,7 +177,5 @@ features when I have time
 **PLUGIN BUGS**
 
 - html snippets are broken with vsnip
-- finding files from dashboard sometimes number not set (using startify
-  for now)
 - keep and eye on indent guides plugin for thin lines
 - better auto-import (jsx)

+ 2 - 2
init.lua

@@ -1,5 +1,6 @@
 -- General mappings
 require('plugins')
+require('config')
 require('nv-utils')
 require('nv-globals')
 require('settings')
@@ -28,8 +29,7 @@ require('nv-lspkind')
 require('nv-hop')
 require('nv-gitblame')
 require('nv-nvim-peekup')
--- require('nv-dashboard')
-require('nv-startify')
+require('nv-dashboard')
 require('nv-dial')
 require('nv-nvim-dap')
 require('nv-lightbulb')

+ 3 - 0
lua/config.lua

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

+ 1 - 1
lua/nv-compe/init.lua

@@ -1,7 +1,7 @@
 vim.o.completeopt = "menuone,noselect"
 
 require'compe'.setup {
-    enabled = true,
+    enabled = AUTO_COMPLETE,
     autocomplete = true,
     debug = false,
     min_length = 1,

+ 1 - 1
lua/nv-startify/init.lua

@@ -22,7 +22,7 @@ vim.api.nvim_exec(
     true)
 
 vim.api.nvim_exec(
-    'let startify_bookmarks = [ { \'b\': \'~/Blog\' }, { \'i\': \'~/.config/nvim/init.lua\' }, { \'z\': \'~/.zshrc\' }, { \'r\': \'.config/nvim/README.md\' }]',
+    'let startify_bookmarks = [ { \'b\': \'~/Blog\' }, { \'c\': \'~/.config/nvim/lua/config.lua\' }, { \'z\': \'~/.zshrc\' }, { \'r\': \'~/.config/nvim/README.md\' }]',
     true)
 
 vim.cmd([[

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

@@ -34,13 +34,16 @@ 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', 'set showtabline=0 | autocmd WinLeave <buffer> set showtabline=2'},
         {'BufRead', '*.sol', 'setlocal filetype=solidity'}, {'BufNewFile', '*.sol', 'setlocal filetype=solidity'},
 
         {'BufWritePre', '*.jsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
         {'BufWritePre', '*.js', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
         {'BufWritePre', '*.py', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
-        {'BufWritePre', '*.lua', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
+        -- {'BufWritePre', '*.lua', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
         {'BufWritePre', '*.json', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'}
         -- {'User', 'GoyoLeave', 'lua require(\'galaxyline\').disable_galaxyline()'},
         -- {'User', 'GoyoEnter', 'lua require(\'galaxyline\').galaxyline_augroup()'},

+ 8 - 7
lua/plugins.lua

@@ -43,10 +43,6 @@ return require('packer').startup(function(use)
     use 'ChristianChiarulli/html-snippets'
     use 'ChristianChiarulli/java-snippets'
     use 'ChristianChiarulli/python-snippets'
-    -- use 'cstrap/python-snippets'
-    -- use 'ylcnfrht/vscode-python-snippet-pack'
-    -- use 'SirVer/ultisnips'
-    -- use 'norcalli/snippets.nvim'
 
     -- Treesitter
     use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
@@ -60,7 +56,6 @@ return require('packer').startup(function(use)
 
     -- Status Line and Bufferline
     use 'glepnir/galaxyline.nvim'
-    -- use {'akinsho/nvim-bufferline.lua', requires = 'kyazdani42/nvim-web-devicons'}
     use 'romgrk/barbar.nvim'
 
     -- Telescope
@@ -105,7 +100,7 @@ return require('packer').startup(function(use)
     use 'liuchengxu/vim-which-key'
     use 'kevinhwang91/nvim-bqf'
     use 'airblade/vim-rooter'
-    -- use 'glepnir/dashboard-nvim'
+    use 'ChristianChiarulli/dashboard-nvim'
     use 'metakirby5/codi.vim'
     use 'psliwka/vim-smoothie'
     use 'moll/vim-bbye'
@@ -138,5 +133,11 @@ return require('packer').startup(function(use)
     --     end
     -- }
     -- use 'tpope/vim-sleuth'
-    use 'mhinz/vim-startify'
+    -- use 'glepnir/dashboard-nvim'
+    -- use 'mhinz/vim-startify'
+    -- use 'cstrap/python-snippets'
+    -- use 'ylcnfrht/vscode-python-snippet-pack'
+    -- use 'SirVer/ultisnips'
+    -- use 'norcalli/snippets.nvim'
+    -- use {'akinsho/nvim-bufferline.lua', requires = 'kyazdani42/nvim-web-devicons'}
 end)

+ 9 - 0
vimscript/functions.vim

@@ -58,3 +58,12 @@ command! DebugGetSession lua require'dap'.session()
 " TODO find out why this thing follows me everywhere in java
 let blacklist = ['java']
 autocmd CursorHold,CursorHoldI * if index(blacklist, &ft) < 0 | lua require'nvim-lightbulb'.update_lightbulb()
+
+autocmd! User GoyoEnter lua require('gitsigns').toggle_signs()
+autocmd! User GoyoLeave lua require('gitsigns').toggle_signs()
+
+autocmd User GoyoEnter set laststatus=0 
+autocmd User GoyoLeave set laststatus=2
+
+" autocmd! User GoyoEnter lua require('galaxyline').disable_galaxyline()
+" autocmd! User GoyoLeave lua require('galaxyline').galaxyline_augroup()