kenobi/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:mightypanders/dotfiles

Browse Source
This commit is contained in:
mightypanders
2022-08-23 17:37:28 +02:00
parent 89e833f65e 4d8f72b127
commit 580d92b4f2
17 changed files with 285 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nvim/lua/dap_config.lua
View 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
View 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
View 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
View 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>")

77
nvim/lua/lsp_conf.lua
View File

@@ -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
View 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
View 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,
},
})

15
nvim/lua/nvimtree.lua
View File

@@ -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
View 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
View 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
View File

@@ -0,0 +1,11 @@
require"toggleterm".setup{
open_mapping = [[<c-y>]],
hide_numbers = true,
direction = 'float',
float_opts = {
border = 'curved'
},
winbar = {
enabled = false
}
}

13
nvim/lua/treesitter_config.lua
View File

@@ -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
View 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" }
);