This commit is contained in:
Price Hiller 2022-05-15 22:29:18 -05:00
parent bb605114ff
commit 583ad11568
8 changed files with 37 additions and 11 deletions

View File

@ -3,8 +3,11 @@ font_family Fira Code Regular
bold_font auto
italic_font auto
bold_italic_font auto
font_size 13.0
font_features FiraCode-Regular +cv01 +cv02 +cv04 +ss01 +zero +ss05 +ss04 +cv30
font_size 14.0
font_features FiraCodeRoman-Regular +cv01 +cv02 +cv04 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv06 +cv29
font_features FiraCodeRoman-Medium +cv01 +cv02 +cv04 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv06 +cv29
font_features FiraCodeRoman-SemiBold +cv01 +cv02 +cv04 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv06 +cv29
font_features FiraCode-Light +cv01 +cv02 +cv04 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv06 +cv29
# Scrollback Settings
scrollback_lines 4000

View File

@ -11,3 +11,5 @@ map('n', '<leader>fm', ':RustExpandMacro<CR>')
map('n', '<leader>fc', ':RustOpenCargo<CR>')
map('n', '<leader>fk', ':RustMoveItemUp<CR>')
map('n', '<leader>fj', ':RustMoveItemDown<CR>')
vim.opt.foldmethod = "syntax"

View File

@ -0,0 +1,7 @@
local map = require('utils.funcs').map
map('n', '<leader>fe', '<Plug>(sqls-execute-query)')
map('v', '<leader>fe', '<Plug>(sqls-execute-query)')
map('n', '<leader>fsd', ':SqlsSwitchDatabase<CR>')
map('n', '<leader>fsc', ':SqlsSwitchConnection<CR>')

View File

@ -0,0 +1,5 @@
local opt = vim.opt
opt.tabstop = 2
opt.shiftwidth = 2
opt.textwidth = 0

View File

@ -90,7 +90,7 @@ M.setup = function()
-- Set listcharacters
opt.list = true
opt.listchars:append('tab:⭾⭾')
opt.listchars:append('tab:-->')
opt.listchars:append('lead:·')
opt.listchars:append('trail:·')
opt.listchars:append('extends:◣')

View File

@ -20,6 +20,7 @@ local required_servers = {
'vimls',
'clangd',
'omnisharp',
'sqls',
}
for _, name in pairs(required_servers) do
@ -71,10 +72,6 @@ local rustopts = {
},
tools = {
hover_actions = { auto_focus = true },
inlay_hints = {
parameter_hints_prefix = '',
other_hints_prefix = '',
},
},
}
require('rust-tools').setup(rustopts)
@ -119,6 +116,12 @@ local luadev = require('lua-dev').setup({
lspconfig.sumneko_lua.setup(luadev)
lspconfig.sqls.setup({
on_attach = function(client, bufnr)
require('sqls').on_attach(client, bufnr)
end,
})
-- NOTE: GENERIC LSP SERVERS
for _, server in ipairs({
'tsserver',

View File

@ -59,11 +59,11 @@ return packer.startup({
})
use({
'rebelot/kanagawa.nvim',
config = function ()
config = function()
require('kanagawa').setup({
transparent = true
transparent = true,
})
end
end,
})
-- Icons for folders, files, etc.
@ -236,6 +236,11 @@ return packer.startup({
end,
})
-- Sql support
use({
'nanotee/sqls.nvim',
})
-- Lsp Vertical Lines
use({
'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
@ -268,7 +273,7 @@ return packer.startup({
-- Code Action Menu, prettier ui for LSP code actions
require('packer').use({
'weilbith/nvim-code-action-menu'
'weilbith/nvim-code-action-menu',
})
-- Lsp From Null LS

View File

@ -3,3 +3,4 @@
*.exclude
.DS_Store
.ccls-cache/
.envrc