Merge branch 'master' of github.com:mightypanders/dotfiles
This commit is contained in:
mightypanders
commit
580d92b4f2
14
nvim/init.lua
Normal file
14
nvim/init.lua
Normal file
@ -0,0 +1,14 @@
|
||||
require('plugins')
|
||||
require('globals_opts')
|
||||
require('native_commands')
|
||||
require('nvim-lightbulb_config')
|
||||
require('nvimtree')
|
||||
require('treesitter_config')
|
||||
require('dap_config')
|
||||
require('mason_config')
|
||||
require('new_lsp_conf')
|
||||
require('cmp_config')
|
||||
require('toggleterm_config')
|
||||
require('virtual_lines_config')
|
||||
require('keymap')
|
||||
require("null-ls_config")
|
||||
@ -10,6 +10,8 @@ set textwidth=120
|
||||
set cursorline
|
||||
hi CursorLine term=bold cterm=bold ctermbg=darkgrey
|
||||
set tabstop=2
|
||||
set softtabstop=2
|
||||
set expandtab
|
||||
set shiftwidth=2
|
||||
set matchpairs+=<:>
|
||||
set showmode
|
||||
@ -59,7 +61,11 @@ set termguicolors
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
Plug 'waycrate/swhkd-vim'
|
||||
Plug 'kmonad/kmonad-vim'
|
||||
Plug 'tpope/vim-surround'
|
||||
Plug 'nvim-lua/plenary.nvim'
|
||||
Plug 'akinsho/toggleterm.nvim', {'tag' : 'v2.*'}
|
||||
Plug 'https://git.sr.ht/~whynothugo/lsp_lines.nvim'
|
||||
Plug 'MunifTanjim/nui.nvim'
|
||||
Plug 'arnarg/todotxt.nvim'
|
||||
call plug#end()
|
||||
|
||||
autocmd vimenter * colorscheme gruvbox
|
||||
@ -68,13 +74,19 @@ set termguicolors
|
||||
|
||||
set completeopt=menuone,noselect
|
||||
|
||||
|
||||
highlight NvimTreeFolderIcon guibg=blue
|
||||
|
||||
lua require('cmp_config')
|
||||
lua require('nvimtree')
|
||||
lua require('lsp_conf')
|
||||
lua require('treesitter_config')
|
||||
lua require('dap_config')
|
||||
lua require('jester')
|
||||
lua require('mason_config')
|
||||
lua require'fzf_lsp'.setup()
|
||||
lua require('toggleterm_config')
|
||||
lua require('virtual_lines_config')
|
||||
lua require('todotxt_config')
|
||||
|
||||
"Leader
|
||||
nnoremap <SPACE> <Nop>
|
||||
@ -93,6 +105,7 @@ let mapleader=" "
|
||||
nnoremap <esc><esc> :noh<return><esc>
|
||||
map <leader>f :FZF<CR>
|
||||
map <leader>F :Rg<CR>
|
||||
|
||||
nnoremap <leader>ca <cmd>lua vim.lsp.buf.code_action()<cr>
|
||||
nnoremap <leader>gd <cmd>lua vim.lsp.buf.definition()<cr>
|
||||
nnoremap <leader>gD <cmd>lua vim.lsp.buf.declaration()<cr>
|
||||
@ -100,8 +113,13 @@ let mapleader=" "
|
||||
nnoremap <leader>rn <cmd>lua vim.lsp.buf.rename()<cr>
|
||||
nnoremap <leader>K <cmd>lua vim.lsp.buf.hover()<cr>
|
||||
|
||||
nnoremap <leader>b :Buffers<cr>
|
||||
|
||||
nnoremap <C-L> :bnext<CR>
|
||||
nnoremap <C-H> :bprevious<CR>
|
||||
|
||||
nnoremap <leader>J <cmd>lua vim.diagnostic.open_float()<cr>
|
||||
nnoremap <M-F> <cmd>lua vim.lsp.buf.formatting()<cr>
|
||||
nnoremap <M-F> <cmd>lua vim.lsp.buf.format({async = true})<cr>
|
||||
inoremap <c-s> <cmd>lua vim.lsp.buf.signature_help()<cr>
|
||||
|
||||
nnoremap <F9> <cmd>lua require'dap'.toggle_breakpoint()<cr>
|
||||
@ -109,11 +127,15 @@ let mapleader=" "
|
||||
nnoremap <F10> <cmd>lua require'dap'.step_over()<cr>
|
||||
nnoremap <F11> <cmd>lua require'dap'.step_into()<cr>
|
||||
|
||||
tnoremap <Esc><Esc> <C-\><C-n>
|
||||
|
||||
nnoremap <leader>td :ToDoTxtTasksToggle<cr>
|
||||
|
||||
autocmd BufWritePre *.ts lua vim.lsp.buf.formatting_sync(nil, 1000)
|
||||
|
||||
command JestRun :lua require'jester'.run({cmd = "yarn run test -t '$result' -- $file"})
|
||||
command JestRunFile :lua require'jester'.run_file({cmd = "yarn run test -t '$result' -- $file"})
|
||||
command JestRunLast :lua require'jester'.run_last({cmd = "yarn run test -t '$result' -- $file"})
|
||||
command JestDebug :lua require'jester'.debug({cmd = "yarn run test -t '$result' -- $file"})
|
||||
command JestDebugFile :lua require'jester'.debug_file({cmd = "yarn run test -t '$result' -- $file"})
|
||||
command JestDebugLast :lua require'jester'.debug_last({cmd = "yarn run test -t '$result' -- $file"})
|
||||
command JestRun :lua require'jester'.run({cmd = "npm run test -t '$result' -- $file"})
|
||||
command JestRunFile :lua require'jester'.run_file({cmd = "npm run test -t '$result' -- $file"})
|
||||
command JestRunLast :lua require'jester'.run_last({cmd = "npm run test -t '$result' -- $file"})
|
||||
command JestDebug :lua require'jester'.debug({cmd = "npm run test -t '$result' -- $file"})
|
||||
command JestDebugFile :lua require'jester'.debug_file({cmd = "npm run test -t '$result' -- $file"})
|
||||
command JestDebugLast :lua require'jester'.debug_last({cmd = "npm run test -t '$result' -- $file"})
|
||||
@ -0,0 +1,8 @@
|
||||
local dap = require('dap')
|
||||
dap.adapters.node2 = {
|
||||
type = 'executable',
|
||||
command = 'node',
|
||||
args = {os.getenv('HOME') .. '/dev/microsoft/vscode-node-debug2/out/src/nodeDebug.js'},
|
||||
}
|
||||
vim.fn.sign_define('DapBreakpoint', {text='🟥', texthl='', linehl='', numhl=''})
|
||||
vim.fn.sign_define('DapStopped', {text='⭐️', texthl='', linehl='', numhl=''})
|
||||
51
nvim/lua/debugHelper.lua
Normal file
51
nvim/lua/debugHelper.lua
Normal file
@ -0,0 +1,51 @@
|
||||
|
||||
local dap = require('dap')
|
||||
|
||||
local function debugJest(testName, filename)
|
||||
print("starting " .. testName .. " in " .. filename)
|
||||
dap.run({
|
||||
type = 'node2',
|
||||
request = 'launch',
|
||||
cwd = vim.fn.getcwd(),
|
||||
runtimeArgs = {'--inspect-brk', '/usr/local/bin/jest', '--no-coverage', '-t', testName, '--', filename},
|
||||
sourceMaps = true,
|
||||
protocol = 'inspector',
|
||||
skipFiles = {'<node_internals>/**/*.js'},
|
||||
console = 'integratedTerminal',
|
||||
port = 9229,
|
||||
})
|
||||
end
|
||||
|
||||
local function attach()
|
||||
print("attaching")
|
||||
dap.run({
|
||||
type = 'node2',
|
||||
request = 'attach',
|
||||
cwd = vim.fn.getcwd(),
|
||||
sourceMaps = true,
|
||||
protocol = 'inspector',
|
||||
skipFiles = {'<node_internals>/**/*.js'},
|
||||
})
|
||||
end
|
||||
|
||||
local function attachToRemote()
|
||||
print("attaching")
|
||||
dap.run({
|
||||
type = 'node2',
|
||||
request = 'attach',
|
||||
address = "127.0.0.1",
|
||||
port = 9229,
|
||||
localRoot = vim.fn.getcwd(),
|
||||
remoteRoot = "/home/vcap/app",
|
||||
sourceMaps = true,
|
||||
protocol = 'inspector',
|
||||
skipFiles = {'<node_internals>/**/*.js'},
|
||||
})
|
||||
end
|
||||
|
||||
return {
|
||||
debugJest = debugJest,
|
||||
attach = attach,
|
||||
attachToRemote = attachToRemote,
|
||||
}
|
||||
|
||||
25
nvim/lua/globals_opts.lua
Normal file
25
nvim/lua/globals_opts.lua
Normal file
@ -0,0 +1,25 @@
|
||||
|
||||
local set = vim.opt
|
||||
set.modelines=0
|
||||
set.hidden=true
|
||||
set.number=true
|
||||
set.ruler=true
|
||||
set.visualbell=true
|
||||
set.textwidth=120
|
||||
set.cursorline=true
|
||||
set.tabstop=2
|
||||
set.shiftwidth=2
|
||||
set.showmode=true
|
||||
set.showcmd=true
|
||||
set.showmatch=true
|
||||
set.hlsearch=true
|
||||
set.ignorecase=true
|
||||
set.smartcase=true
|
||||
set.incsearch=true
|
||||
set.wrapscan=true
|
||||
set.scrolloff=999
|
||||
set.backspace="indent,eol,start"
|
||||
set.mouse="nicr"
|
||||
set.termguicolors=true
|
||||
set.matchpairs:append("<:>")
|
||||
set.completeopt="menuone,noselect,preview"
|
||||
31
nvim/lua/keymap.lua
Normal file
31
nvim/lua/keymap.lua
Normal file
@ -0,0 +1,31 @@
|
||||
|
||||
function map(mode, shortcut, command)
|
||||
vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true })
|
||||
end
|
||||
|
||||
function nmap(shortcut, command)
|
||||
map('n', shortcut, command)
|
||||
end
|
||||
|
||||
function imap(shortcut, command)
|
||||
map('i', shortcut, command)
|
||||
end
|
||||
|
||||
function xmap(shortcut, command)
|
||||
map('x', shortcut, command)
|
||||
end
|
||||
|
||||
nmap("<SPACE>","<Nop>")
|
||||
|
||||
vim.g.mapleader = " "
|
||||
|
||||
xmap("p",'\"_dP')
|
||||
nmap("<leader>fg", "<cmd>lua require('telescope.builtin').live_grep()<cr>")
|
||||
nmap("<leader>fb", "<cmd>lua require('telescope.builtin').buffers()<cr>")
|
||||
nmap("<leader>fh", "<cmd>lua require('telescope.builtin').help_tags()<cr>")
|
||||
nmap("<leader>ff", "<cmd>lua require('telescope.builtin').find_files()<cr>")
|
||||
|
||||
nmap("<leader>b","<cmd>lua require('telescope.builtin').buffers()<cr>")
|
||||
nmap("<C-n>",":NvimTreeToggle<cr>")
|
||||
nmap("<leader>r",":NvimTreeRefresh<cr>")
|
||||
nmap("<leader>n",":NvimTreeToggle<cr>")
|
||||
@ -1,16 +1,19 @@
|
||||
|
||||
local cmp = require("cmp")
|
||||
local luasnip = require("luasnip")
|
||||
|
||||
local capabilites = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||
|
||||
require'lspconfig'.tsserver.setup{
|
||||
capabilites = capabilites
|
||||
}
|
||||
require'lspconfig'.jsonls.setup{
|
||||
capabilites = capabilites
|
||||
}
|
||||
require'lspconfig'.dockerls.setup{
|
||||
capabilites = capabilites
|
||||
}
|
||||
require'lspconfig'.eslint.setup{
|
||||
capabilites = capabilites
|
||||
capabilites = capabilites,
|
||||
settings= {
|
||||
run = "onSave"
|
||||
}
|
||||
}
|
||||
require'lspconfig'.gdscript.setup{
|
||||
capabilites = capabilites
|
||||
@ -28,67 +31,5 @@ require'lspconfig'.bashls.setup{
|
||||
capabilites = capabilites
|
||||
}
|
||||
|
||||
local has_words_before = function()
|
||||
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line -1, line, true)[1]:sub(col,col):match("%s") == nil
|
||||
end
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-p>'] = cmp.mapping.select_next_item(),
|
||||
['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
|
||||
['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
|
||||
['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
|
||||
['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
|
||||
['<C-e>'] = cmp.mapping({
|
||||
i = cmp.mapping.abort(),
|
||||
c = cmp.mapping.close(),
|
||||
}),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
elseif has_words_before() then
|
||||
cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end,{"i","s"}),
|
||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end,{"i","s"})
|
||||
},
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'luasnip' }, -- For luasnip users.
|
||||
}, {
|
||||
{ name = 'buffer' },
|
||||
})
|
||||
})
|
||||
|
||||
cmp.setup.cmdline('/',{
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.cmdline(':',{
|
||||
sources = cmp.config.sources({
|
||||
{name = 'path'}
|
||||
},{{name='cmdline'}})
|
||||
})
|
||||
|
||||
require'fzf_lsp'.setup()
|
||||
|
||||
|
||||
6
nvim/lua/native_commands.lua
Normal file
6
nvim/lua/native_commands.lua
Normal file
@ -0,0 +1,6 @@
|
||||
|
||||
vim.cmd('hi CursorLine term=bold cterm=bold ctermbg=darkgrey')
|
||||
vim.cmd[[colorscheme tokyonight]]
|
||||
vim.cmd([[
|
||||
runtime macros/sandwich/keymap/surround.vim
|
||||
]])
|
||||
8
nvim/lua/null-ls_config.lua
Normal file
8
nvim/lua/null-ls_config.lua
Normal file
@ -0,0 +1,8 @@
|
||||
|
||||
require("null-ls").setup({
|
||||
sources = {
|
||||
require("null-ls").builtins.formatting.stylua,
|
||||
require("null-ls").builtins.diagnostics.eslint,
|
||||
require("null-ls").builtins.completion.spell,
|
||||
},
|
||||
})
|
||||
@ -10,7 +10,7 @@ require'nvim-tree'.setup {
|
||||
folder_arrow= false
|
||||
},
|
||||
glyphs = {
|
||||
default= "",
|
||||
default= "",
|
||||
symlink= "",
|
||||
git= {
|
||||
unstaged= "✗",
|
||||
@ -45,8 +45,8 @@ require'nvim-tree'.setup {
|
||||
indent_markers = {
|
||||
enable = true,
|
||||
icons = {
|
||||
corner = "└ ",
|
||||
edge = "│ ",
|
||||
corner = "└",
|
||||
edge = "│ ",
|
||||
none = " ",
|
||||
}
|
||||
}
|
||||
@ -57,10 +57,11 @@ require'nvim-tree'.setup {
|
||||
open_on_setup = false,
|
||||
ignore_ft_on_setup = {},
|
||||
open_on_tab = false,
|
||||
hijack_cursor = false,
|
||||
hijack_cursor = true,
|
||||
auto_reload_on_write = true,
|
||||
update_cwd = false,
|
||||
diagnostics = {
|
||||
enable = false,
|
||||
enable = true,
|
||||
icons = {
|
||||
hint = "",
|
||||
info = "",
|
||||
@ -88,6 +89,7 @@ require'nvim-tree'.setup {
|
||||
},
|
||||
actions = {
|
||||
open_file = {
|
||||
resize_window = false,
|
||||
window_picker = {
|
||||
exclude = {
|
||||
filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
|
||||
@ -97,8 +99,7 @@ require'nvim-tree'.setup {
|
||||
}
|
||||
},
|
||||
view = {
|
||||
width = 25,
|
||||
height = 30,
|
||||
width = 35,
|
||||
hide_root_folder = false,
|
||||
side = 'left',
|
||||
mappings = {
|
||||
|
||||
48
nvim/lua/plugins.lua
Normal file
48
nvim/lua/plugins.lua
Normal file
@ -0,0 +1,48 @@
|
||||
require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
use {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"neovim/nvim-lspconfig",
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim"
|
||||
}
|
||||
use 'mfussenegger/nvim-dap'
|
||||
use 'jose-elias-alvarez/null-ls.nvim'
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
||||
requires = { {'nvim-lua/plenary.nvim'} }
|
||||
}
|
||||
use 'nvim-lua/lsp-status.nvim'
|
||||
use 'jiangmiao/auto-pairs'
|
||||
use 'machakann/vim-sandwich'
|
||||
use 'machakann/vim-highlightedyank'
|
||||
use 'bling/vim-airline'
|
||||
use 'airblade/vim-gitgutter'
|
||||
use 'easymotion/vim-easymotion'
|
||||
use {
|
||||
'antoinemadec/FixCursorHold.nvim',
|
||||
'kosayoda/nvim-lightbulb'
|
||||
}
|
||||
use 'hrsh7th/cmp-nvim-lsp'
|
||||
use 'hrsh7th/cmp-buffer'
|
||||
use 'hrsh7th/cmp-path'
|
||||
use 'hrsh7th/nvim-cmp'
|
||||
use 'hrsh7th/cmp-cmdline'
|
||||
use 'saadparwaiz1/cmp_luasnip'
|
||||
use 'L3MON4D3/LuaSnip'
|
||||
use 'kyazdani42/nvim-web-devicons'
|
||||
use 'kyazdani42/nvim-tree.lua'
|
||||
use 'tpope/vim-fugitive'
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
run = function() require('nvim-treesitter.install').update({ with_sync = true }) end,
|
||||
}
|
||||
use 'folke/tokyonight.nvim'
|
||||
use 'simrat39/rust-tools.nvim'
|
||||
use {"akinsho/toggleterm.nvim", tag = 'v2.*', config = function()
|
||||
require("toggleterm").setup()
|
||||
end}
|
||||
use 'https://git.sr.ht/~whynothugo/lsp_lines.nvim'
|
||||
--use 'morhetz/gruvbox'
|
||||
|
||||
end)
|
||||
9
nvim/lua/todotxt_config.lua
Normal file
9
nvim/lua/todotxt_config.lua
Normal file
@ -0,0 +1,9 @@
|
||||
todo = require('todotxt-nvim')
|
||||
todo.setup({
|
||||
todo_file = '~/todotxt/todo.txt',
|
||||
sidebar = {
|
||||
width = 40,
|
||||
position = 'right'
|
||||
}
|
||||
}
|
||||
)
|
||||
11
nvim/lua/toggleterm_config.lua
Normal file
11
nvim/lua/toggleterm_config.lua
Normal file
@ -0,0 +1,11 @@
|
||||
require"toggleterm".setup{
|
||||
open_mapping = [[<c-y>]],
|
||||
hide_numbers = true,
|
||||
direction = 'float',
|
||||
float_opts = {
|
||||
border = 'curved'
|
||||
},
|
||||
winbar = {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
@ -23,3 +23,16 @@ require'nvim-treesitter.configs'.setup {
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
}
|
||||
--- Treesitter
|
||||
---BEGINWORKAROUND
|
||||
--vim.api.nvim_create_autocmd({'BufEnter','BufAdd','BufNew','BufNewFile','BufWinEnter'}, {
|
||||
-- group = vim.api.nvim_create_augroup('TS_FOLD_WORKAROUND', {}),
|
||||
-- callback = function()
|
||||
-- vim.opt.foldmethod = 'expr'
|
||||
-- vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
|
||||
-- end
|
||||
--})
|
||||
---ENDWORKAROUND
|
||||
--- Treesitter
|
||||
--- Utility functions
|
||||
---
|
||||
|
||||
9
nvim/lua/virtual_lines_config.lua
Normal file
9
nvim/lua/virtual_lines_config.lua
Normal file
@ -0,0 +1,9 @@
|
||||
lines = require('lsp_lines')
|
||||
lines.setup()
|
||||
vim.diagnostic.config({ virtual_text = false });
|
||||
vim.keymap.set(
|
||||
"",
|
||||
"tl",
|
||||
lines.toggle,
|
||||
{ desc = "Toggle lsp_lines" }
|
||||
);
|
||||
133
nvim/start.lua
133
nvim/start.lua
@ -1,133 +0,0 @@
|
||||
local set = vim.opt
|
||||
set.modelines=0
|
||||
set.hidden=true
|
||||
set.number=true
|
||||
set.ruler=true
|
||||
set.visualbell=true
|
||||
set.textwidth=120
|
||||
set.cursorline=true
|
||||
set.tabstop=2
|
||||
set.shiftwidth=2
|
||||
set.showmode=true
|
||||
set.showcmd=true
|
||||
set.showmatch=true
|
||||
set.hlsearch=true
|
||||
set.ignorecase=true
|
||||
set.smartcase=true
|
||||
set.incsearch=true
|
||||
set.wrapscan=true
|
||||
set.scrolloff=999
|
||||
set.backspace="indent,eol,start"
|
||||
set.mouse="nicr"
|
||||
set.termguicolors=true
|
||||
set.matchpairs:append("<:>")
|
||||
set.completeopt="menuone,noselect,preview"
|
||||
|
||||
vim.cmd("hi CursorLine term=bold cterm=bold ctermbg=darkgrey")
|
||||
|
||||
require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
use {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"neovim/nvim-lspconfig",
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim"
|
||||
}
|
||||
use 'mfussenegger/nvim-dap'
|
||||
use 'jose-elias-alvarez/null-ls.nvim'
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
||||
requires = { {'nvim-lua/plenary.nvim'} }
|
||||
}
|
||||
use 'nvim-lua/lsp-status.nvim'
|
||||
use 'jiangmiao/auto-pairs'
|
||||
use 'machakann/vim-sandwich'
|
||||
use 'machakann/vim-highlightedyank'
|
||||
use 'bling/vim-airline'
|
||||
use 'airblade/vim-gitgutter'
|
||||
use 'easymotion/vim-easymotion'
|
||||
use {
|
||||
'antoinemadec/FixCursorHold.nvim',
|
||||
'kosayoda/nvim-lightbulb'
|
||||
}
|
||||
use 'hrsh7th/cmp-nvim-lsp'
|
||||
use 'hrsh7th/cmp-buffer'
|
||||
use 'hrsh7th/cmp-path'
|
||||
use 'hrsh7th/cmp-cmdline'
|
||||
use 'saadparwaiz1/cmp_luasnip'
|
||||
use 'L3MON4D3/LuaSnip'
|
||||
use 'kyazdani42/nvim-web-devicons'
|
||||
use 'kyazdani42/nvim-tree.lua'
|
||||
use 'tpope/vim-fugitive'
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
run = function() require('nvim-treesitter.install').update({ with_sync = true }) end,
|
||||
}
|
||||
use 'folke/tokyonight.nvim'
|
||||
use 'simrat39/rust-tools.nvim'
|
||||
--use 'morhetz/gruvbox'
|
||||
|
||||
end)
|
||||
|
||||
vim.cmd[[colorscheme tokyonight]]
|
||||
|
||||
--- Treesitter
|
||||
---BEGINWORKAROUND
|
||||
--vim.api.nvim_create_autocmd({'BufEnter','BufAdd','BufNew','BufNewFile','BufWinEnter'}, {
|
||||
-- group = vim.api.nvim_create_augroup('TS_FOLD_WORKAROUND', {}),
|
||||
-- callback = function()
|
||||
-- vim.opt.foldmethod = 'expr'
|
||||
-- vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
|
||||
-- end
|
||||
--})
|
||||
---ENDWORKAROUND
|
||||
--- Treesitter
|
||||
--- Utility functions
|
||||
function map(mode, shortcut, command)
|
||||
vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true })
|
||||
end
|
||||
|
||||
function nmap(shortcut, command)
|
||||
map('n', shortcut, command)
|
||||
end
|
||||
|
||||
function imap(shortcut, command)
|
||||
map('i', shortcut, command)
|
||||
end
|
||||
|
||||
function xmap(shortcut, command)
|
||||
map('x', shortcut, command)
|
||||
end
|
||||
---
|
||||
require('nvim-lightbulb_config')
|
||||
require('nvimtree')
|
||||
require('treesitter_config')
|
||||
require('dap_config')
|
||||
require('mason_config')
|
||||
require('new_lsp_conf')
|
||||
require('cmp_config')
|
||||
require("null-ls").setup({
|
||||
sources = {
|
||||
require("null-ls").builtins.formatting.stylua,
|
||||
require("null-ls").builtins.diagnostics.eslint,
|
||||
require("null-ls").builtins.completion.spell,
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd([[
|
||||
runtime macros/sandwich/keymap/surround.vim
|
||||
]])
|
||||
|
||||
nmap("<SPACE>","<Nop>")
|
||||
|
||||
vim.g.mapleader = " "
|
||||
|
||||
xmap("p",'\"_dP')
|
||||
nmap("<leader>fg", "<cmd>lua require('telescope.builtin').live_grep()<cr>")
|
||||
nmap("<leader>fb", "<cmd>lua require('telescope.builtin').buffers()<cr>")
|
||||
nmap("<leader>fh", "<cmd>lua require('telescope.builtin').help_tags()<cr>")
|
||||
nmap("<leader>ff", "<cmd>lua require('telescope.builtin').find_files()<cr>")
|
||||
|
||||
nmap("<C-n>",":NvimTreeToggle<cr>")
|
||||
nmap("<leader>r",":NvimTreeRefresh<cr>")
|
||||
nmap("<leader>n",":NvimTreeToggle<cr>")
|
||||
@ -1,2 +1,5 @@
|
||||
#!/bin/bash
|
||||
docker build -t dotfiles/local_startpage:latest .
|
||||
REPO="startpage"
|
||||
docker build -t $REPO:latest .
|
||||
docker tag $REPO:latest registry.brudi.xyz/$REPO:latest
|
||||
docker push registry.brudi.xyz/$REPO:latest
|
||||
|
||||
Loading…
Reference in New Issue
Block a user