summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorchristianchiarulli <[email protected]>2021-04-07 00:29:10 -0400
committerchristianchiarulli <[email protected]>2021-04-07 00:29:10 -0400
commitf6e7eb755cb79719c809fac3879c5badcce562a7 (patch)
tree53a7ec110bf4f5c172a8c28e1eebc057876d917a /lua
parent246867804ebf3534a72acbb357b6161bc45b0002 (diff)
updates
Diffstat (limited to 'lua')
-rw-r--r--lua/lsp/bash-ls.lua3
-rw-r--r--lua/nv-autocommands/init.lua2
-rw-r--r--lua/nv-indentline/init.lua2
-rw-r--r--lua/nv-numb/init.lua4
-rw-r--r--lua/settings.lua7
5 files changed, 14 insertions, 4 deletions
diff --git a/lua/lsp/bash-ls.lua b/lua/lsp/bash-ls.lua
index 9131e9c9..7b430a6e 100644
--- a/lua/lsp/bash-ls.lua
+++ b/lua/lsp/bash-ls.lua
@@ -1,5 +1,6 @@
-- npm i -g bash-language-server
require'lspconfig'.bashls.setup {
cmd = {DATA_PATH .. "/lspinstall/bash/node_modules/.bin/bash-language-server", "start"},
- on_attach = require'lsp'.common_on_attach
+ on_attach = require'lsp'.common_on_attach,
+ filetypes = { "sh", "zsh" }
}
diff --git a/lua/nv-autocommands/init.lua b/lua/nv-autocommands/init.lua
index 4663140c..c618bbf1 100644
--- a/lua/nv-autocommands/init.lua
+++ b/lua/nv-autocommands/init.lua
@@ -47,7 +47,7 @@ utils.define_augroups({
_buffer_bindings = {
{'FileType', 'dashboard', 'nnoremap <silent> <buffer> q :q<CR>'},
{'FileType', 'lspinfo', 'nnoremap <silent> <buffer> q :q<CR>'},
- {'FileType', 'floaterm', 'nnoremap <silent> <buffer> q :q<CR>'}
+ {'FileType', 'floaterm', 'nnoremap <silent> <buffer> q :q<CR>'},
},
_auto_formatters = auto_formatters
})
diff --git a/lua/nv-indentline/init.lua b/lua/nv-indentline/init.lua
index dbff008a..dd373929 100644
--- a/lua/nv-indentline/init.lua
+++ b/lua/nv-indentline/init.lua
@@ -1,5 +1,5 @@
vim.g.indent_blankline_buftype_exclude = {'terminal'}
-vim.g.indent_blankline_filetype_exclude = {'help', 'startify', 'dashboard', 'packer', 'neogitstatus'}
+vim.g.indent_blankline_filetype_exclude = {'man', 'help', 'startify', 'dashboard', 'packer', 'neogitstatus'}
vim.g.indent_blankline_char = '▏'
-- vim.g.indent_blankline_use_treesitter = true
vim.g.indent_blankline_show_trailing_blankline_indent = false
diff --git a/lua/nv-numb/init.lua b/lua/nv-numb/init.lua
new file mode 100644
index 00000000..415327f1
--- /dev/null
+++ b/lua/nv-numb/init.lua
@@ -0,0 +1,4 @@
+require('numb').setup{
+ show_numbers = true, -- Enable 'number' for the window while peeking
+ show_cursorline = true -- Enable 'cursorline' for the window while peeking
+}
diff --git a/lua/settings.lua b/lua/settings.lua
index 965a3ff5..29621435 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -33,4 +33,9 @@ vim.wo.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shif
vim.o.updatetime = 300 -- Faster completion
vim.o.timeoutlen = 100 -- By default timeoutlen is 1000 ms
vim.o.clipboard = "unnamedplus" -- Copy paste between vim and everything else
-vim.o.guifont = "JetBrainsMono\\ Nerd\\ Font\\ Mono:h18"
+-- vim.o.guifont = "JetBrainsMono\\ Nerd\\ Font\\ Mono:h18"
+-- vim.o.guifont = "Hack\\ Nerd\\ Font\\ Mono"
+-- vim.o.guifont = "SauceCodePro Nerd Font:h17"
+vim.o.guifont = "FiraCode Nerd Font:h17"
+
+-- vim.o.guifont = "JetBrains\\ Mono\\ Regular\\ Nerd\\ Font\\ Complete"