an.tsouchlos/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: an.tsouchlos:98b5e08f7af96c5594471e35b5c091ec4f8163b4
Branches Tags
an.tsouchlos:main
an.tsouchlos:feature/nvim_config_from_scratch
an.tsouchlos:feature/new_lsp
an.tsouchlos:host/cel
an.tsouchlos:host/rpi
an.tsouchlos:host/manifold
..
compare: an.tsouchlos:6226776f8ec89502fb4e7cef0656bf004240e000
Branches Tags
an.tsouchlos:feature/nvim_config_from_scratch
an.tsouchlos:feature/new_lsp
an.tsouchlos:host/cel
an.tsouchlos:main
an.tsouchlos:host/rpi
an.tsouchlos:host/manifold

No commits in common. "98b5e08f7af96c5594471e35b5c091ec4f8163b4" and "6226776f8ec89502fb4e7cef0656bf004240e000" have entirely different histories.
98b5e08f7a ... 6226776f8e

22 changed files with 109 additions and 557 deletions
Show Stats Expand all files Collapse all files

15
.config/nvim/lua/disabled_plugins/whichkey.lua Normal file
View File

@ -0,0 +1,15 @@
return {
{
"folke/which-key.nvim",
event = "VeryLazy",
init = function()
vim.o.timeout = true
vim.o.timeoutlen = 300
end,
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
}
}
}

27
.config/nvim/lua/overseer/template/user/cmake_build.lua
View File

@ -1,27 +0,0 @@
return {
name = "CMake Build",
builder = function()
local file = vim.fn.expand("%:p")
return {
cmd = {
"cmake"
},
args = {
"--build",
"build"
},
components = {
{
"on_output_quickfix"
},
"default"
}
}
end,
condition = {
filetype = {
"cmake",
"cpp"
}
}
}

24
.config/nvim/lua/overseer/template/user/cmake_clean.lua
View File

@ -1,24 +0,0 @@
return {
name = "CMake Clean",
builder = function()
local file = vim.fn.expand("%:p")
return {
cmd = {
"rm"
},
args = {
"-r",
"build",
},
components = {
"default"
}
}
end,
condition = {
filetype = {
"cmake",
"cpp"
}
}
}

58
.config/nvim/lua/overseer/template/user/cmake_generate.lua
View File

@ -1,58 +0,0 @@
return {
name = "CMake Generate",
params = {
build_type = {
type = "enum",
choices = {
"Debug",
"Release",
"RelWithDebInfo",
"MinSizeRel"
},
default = "Debug"
},
generator = {
type = "enum",
choices = {
"Ninja",
"Unix Makefiles"
},
default = "Ninja"
},
compiler = {
type = "enum",
choices = {
"g++",
"clang++"
},
default = "g++"
}
},
builder = function(params)
return {
cmd = {
"cmake"
},
args = {
"-B",
"build",
"-S",
".",
"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
"-DCMAKE_BUILD_TYPE=" .. params.build_type,
"-DCMAKE_CXX_COMPILER=" .. params.compiler,
"-G",
params.generator
},
components = {
"default"
}
}
end,
condition = {
filetype = {
"cmake",
"cpp"
}
}
}

27
.config/nvim/lua/overseer/template/user/cmake_test.lua
View File

@ -1,27 +0,0 @@
return {
name = "CMake Test",
builder = function()
return {
cmd = {
"ctest"
},
args = {
"--test-dir",
"build",
"--output-on-failure",
},
components = {
{
"on_output_quickfix"
},
"default"
}
}
end,
condition = {
filetype = {
"cmake",
"cpp"
}
}
}

22
.config/nvim/lua/overseer/template/user/python_run.lua
View File

@ -1,22 +0,0 @@
return {
name = "Python Run",
builder = function()
local file = vim.fn.expand("%:p")
return {
cmd = {
"python"
},
args = {
file
},
components = {
"default"
}
}
end,
condition = {
filetype = {
"python"
}
}
}

15
.config/nvim/lua/plugins/alpha.lua
View File

@ -32,17 +32,8 @@ local function get_random_image()
}
}
local i = 3
math.randomseed(os.time())
if math.fmod(math.random(100), 5) == 0 then
if math.random(0, 1) == 0 then
i = 1
else
i = 2
end
end
-- local i = math.random(#images)
local i = clamp(math.random(1, 40), 1, #images)
return images[i]
end
@ -53,7 +44,7 @@ end
return {
{
"goolord/alpha-nvim",
lazy = false,
lazy=false,
config = function()
local dashboard = require("alpha.themes.dashboard")
dashboard.section.header.val = get_random_image()

14
.config/nvim/lua/plugins/auto_session.lua
View File

@ -8,12 +8,8 @@ return {
init = function()
vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
vim.keymap.set('n', '<leader>ss', '<cmd>SessionSave<CR>', {
desc = "Save"
})
vim.keymap.set('n', '<leader>sd', '<cmd>SessionDelete<CR>', {
desc = "Delete"
})
vim.keymap.set('n', '<leader><C-s>', '<cmd>SessionSave<CR>')
vim.keymap.set('n', '<leader><C-d>', '<cmd>SessionDelete<CR>')
end,
opts = {
log_level = "error",
@ -31,13 +27,11 @@ return {
'nvim-telescope/telescope.nvim'
},
init = function()
vim.keymap.set('n', '<leader>sf', function() require('session-lens').search_session() end, {
desc = "Find"
})
vim.keymap.set('n', '<leader>p', function() require('session-lens').search_session() end)
end,
config = function()
require('session-lens').setup({
prompt_title = 'Sessions'
prompt_title = 'Projects'
})
end
}

154
.config/nvim/lua/plugins/dap.lua
View File

@ -1,154 +0,0 @@
return {
{
'mfussenegger/nvim-dap',
config = function()
local dap = require("dap")
dap.adapters.gdb = {
type = "executable",
command = "gdb",
args = {
"-i",
"dap"
}
}
dap.adapters.python = function(cb, config)
if config.request == 'attach' then
local port = (config.connect or config).port
local host = (config.connect or config).host or '127.0.0.1'
cb({
type = 'server',
port = assert(port, '`connect.port` is required for a python `attach` configuration'),
host = host,
options = {
source_filetype = 'python'
}
})
else
cb({
type = 'executable',
command = 'python',
args = {
'-m',
'debugpy.adapter'
},
options = {
source_filetype = 'python'
}
})
end
end
dap.configurations.c = {
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false
}
}
dap.configurations.cpp = {
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false
}
}
dap.configurations.python = {
{
type = 'python',
request = 'launch',
name = "Launch file",
program = "${file}",
pythonPath = function()
local cwd = vim.fn.getcwd()
if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
return cwd .. '/venv/bin/python'
elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
return cwd .. '/.venv/bin/python'
else
return '/usr/bin/python'
end
end
}
}
vim.keymap.set("n", "<leader>db", "<cmd>DapToggleBreakpoint<cr>", {
desc = "Toggle breakpoint"
})
vim.keymap.set("n", "<leader>dc", "<cmd>DapContinue<cr>", {
desc = "Continue"
})
vim.keymap.set("n", "<leader>dt", "<cmd>DapTerminate<cr>", {
desc = "Terminate"
})
vim.keymap.set("n", "<leader>di", "<cmd>DapStepInto<cr>", {
desc = "Step into"
})
vim.keymap.set("n", "<leader>dn", "<cmd>DapStepOver<cr>", {
desc = "Step over"
})
vim.keymap.set("n", "<leader>do", "<cmd>DapStepOut<cr>", {
desc = "Step out"
})
vim.keymap.set("n", '<Leader>dh', function() require('dap.ui.widgets').hover() end, {
desc = "Hover"
})
end
},
{
"rcarriga/nvim-dap-ui",
dependencies = {
"mfussenegger/nvim-dap",
"nvim-neotest/nvim-nio"
},
config = function()
require("dapui").setup({
controls = {
enabled = false
},
layouts = {
{
elements = {
{
id = "scopes",
size = 0.33
},
{
id = "breakpoints",
size = 0.33
},
{
id = "stacks",
size = 0.33
}
},
position = "left",
size = 60
},
{
elements = {
{
id = "repl",
size = 1
}
},
position = "bottom",
size = 15
}
}
})
vim.keymap.set("n", "<leader>du", function() require("dapui").toggle() end, {
desc = " Toggle UI"
})
end
}
}

4
.config/nvim/lua/plugins/doge.lua
View File

@ -3,13 +3,9 @@ return {
'kkoomen/vim-doge',
build = ':call doge#install()',
init = function()
vim.g.doge_enable_mappings = 0
vim.g.doge_doc_standard_cpp = 'doxygen_cpp_comment_slash'
vim.g.doge_mapping_comment_jump_forward = '<c-j>'
vim.g.doge_mapping_comment_jump_backward = '<c-k>'
vim.keymap.set('n', '<leader>gd', '<Plug>(doge-generate)', { silent = true, desc = "Generate doc"})
-- nmap <silent> <Leader>d <Plug>(doge-generate)
end
}
}

4
.config/nvim/lua/plugins/harpoon.lua
View File

@ -8,8 +8,8 @@ return {
}
},
init = function()
vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end, {desc = "Toggle harpoon ui"})
vim.keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end, {desc = "Add to harpoon list"})
vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end)
vim.keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end)
vim.keymap.set("n", "<C-h>", function() require("harpoon.ui").nav_file(1) end)
vim.keymap.set("n", "<C-t>", function() require("harpoon.ui").nav_file(2) end)

93
.config/nvim/lua/plugins/lsp.lua
View File

@ -37,14 +37,26 @@ return {
cmp.setup({
sources = {
-- LuaFormatter off
{ name = 'path' },
{ name = 'nvim_lsp' },
{ name = 'nvim_lua' },
{ name = 'luasnip', keyword_length = 2 },
{ name = 'buffer', keyword_length = 3 },
{ name = 'nvim_lsp_signature_help' }
-- LuaFormatter on
{
name = 'path'
},
{
name = 'nvim_lsp'
},
{
name = 'nvim_lua'
},
{
name = 'luasnip',
keyword_length = 2
},
{
name = 'buffer',
keyword_length = 3
},
{
name = 'nvim_lsp_signature_help'
}
},
formatting = lsp_zero.cmp_format(),
mapping = cmp.mapping.preset.insert({
@ -61,12 +73,15 @@ return {
})
cmp.setup.filetype('gitcommit', {
-- LuaFormatter off
sources = cmp.config.sources(
{ { name = 'git' } },
{ { name = 'buffer' } }
)
-- LuaFormatter on
sources = cmp.config.sources({
{
name = 'git'
}
}, {
{
name = 'buffer'
}
})
})
cmp.setup.cmdline({
@ -111,34 +126,31 @@ return {
dependencies = {
'hrsh7th/cmp-nvim-lsp',
'williamboman/mason-lspconfig.nvim',
"folke/trouble.nvim"
'folke/trouble.nvim' -- required for the current config
},
config = function()
local lsp_zero = require('lsp-zero')
lsp_zero.extend_lspconfig()
lsp_zero.on_attach(function(client, bufnr)
vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, {
desc = "Go to definition"
})
vim.keymap.set("n", "<leader>lh", function() vim.lsp.buf.hover() end, {
desc = "Hover"
})
vim.keymap.set("n", "<leader>lr", ":Trouble lsp_references<CR>", {
desc = "Show references"
})
vim.keymap.set("n", "<leader>ln", function() vim.lsp.buf.rename() end, {
desc = "Rename"
})
vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, {
desc = "Signature help"
})
vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
desc = "Code actions"
})
vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
desc = "Code actions"
})
local opts = {
buffer = bufnr,
remap = false
}
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-- vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
vim.keymap.set("n", "<leader>vrr", "<cmd>Trouble lsp_references<CR>", opts)
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-p>", function() vim.lsp.buf.signature_help() end, opts)
vim.keymap.set("n", "<M-cr>", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("i", "<M-cr>", function() vim.lsp.buf.code_action() end, opts)
end)
require('mason-lspconfig').setup({
@ -160,17 +172,8 @@ return {
require('lspconfig')['clangd'].setup {
cmd = {
"clangd",
"--background-index",
"--clang-tidy",
"--completion-style=bundled",
"--cross-file-rename",
"--header-insertion=iwyu",
-- Required for embedded system compilers
"--query-driver=/**/*g++",
"--offset-encoding=utf-16"
-- "-j=8",
-- "--malloc-trim",
-- "--pch-storage=memory"
}
}
end

38
.config/nvim/lua/plugins/noice.lua
View File

@ -1,38 +0,0 @@
-- lazy.nvim
return {
"folke/noice.nvim",
event = "VeryLazy",
opts = {
lsp = {
signature = {
enabled = false
},
hover = {
enabled = false
}
},
views = {
cmdline_popup = {
backend = "popup",
relative = "editor",
position = {
row = -1,
col = "0%"
},
border = {
style = "none"
}
},
cmdline_popupmenu = {
relative = "editor",
position = {
row = -2,
col = "0%"
}
}
}
},
dependencies = {
"MunifTanjim/nui.nvim"
}
}

6
.config/nvim/lua/plugins/nvim_tree.lua
View File

@ -7,11 +7,7 @@ return {
},
init = function()
vim.opt.termguicolors = true
vim.keymap.set('n', '<leader>e', '<cmd>NvimTreeToggle<cr>', {
noremap = true,
silent = true,
desc = "Explorer"
})
vim.keymap.set('n', '<leader>t', '<cmd>NvimTreeToggle<cr>', {noremap = true, silent = true})
end,
config = function() require("nvim-tree").setup() end
}

28
.config/nvim/lua/plugins/overseer.lua
View File

@ -1,28 +0,0 @@
return {
"stevearc/overseer.nvim",
config = function()
require("overseer").setup({
templates = {
"builtin",
"user.cmake_generate",
"user.cmake_build",
"user.cmake_clean",
"user.cmake_test",
"user.python_run"
}
})
vim.keymap.set("n", "<leader>oo", function() require("overseer").toggle() end, {
desc = "Toggle"
})
vim.keymap.set("n", "<leader>or", ":OverseerRun<CR>", {
desc = "Run"
})
vim.keymap.set("n", "<leader>oq", ":OverseerQuickAction<CR>", {
desc = "Quick Action"
})
vim.keymap.set("n", "<leader>of", ":OverseerQuickAction open float<CR>", {
desc = "Open Float"
})
end
}

10
.config/nvim/lua/plugins/telescope.lua
View File

@ -36,14 +36,14 @@ return {
cmd = "Telescope",
init = function()
-- LuaFormatter off
vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,{desc = "Files"})
vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end,{desc = "grep"})
vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,{desc = "Telescope find files"})
vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end,{desc = "Telescope live grep"})
vim.keymap.set('n', '<leader>fa', function()
require("telescope.builtin").find_files({hidden = true})
end, {desc = "All files"})
end, {desc = "Telescope find all files"})
vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, {desc = "Buffers"})
vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end, {desc = "Help tags"})
vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, {desc = "Telescope buffers"})
vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end, {desc = "Telescope help tags"})
-- LuaFormatter on
end
}

42
.config/nvim/lua/plugins/themes.lua
View File

@ -1,25 +1,16 @@
return {
-- {'doums/darcula', config = function() vim.cmd('colorscheme darcula') end}
-- {
-- "folke/tokyonight.nvim",
-- lazy = false,
-- priority = 1000,
-- opts = {},
-- config = function() vim.cmd('colorscheme tokyonight-moon') end
-- }
-- {
-- 'rose-pine/neovim',
-- config = function()
-- vim.cmd('colorscheme rose-pine-moon')
-- -- LuaFormatter off
-- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-- vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none", fg = "none" })
-- vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = "none" })
-- vim.api.nvim_set_hl(0, "TelescopeBorder", { bg = "none" })
-- -- LuaFormatter on
-- end
-- }
-- {
-- "folke/tokyonight.nvim",
-- lazy = false,
-- priority = 1000,
-- opts = {},
-- config = function() vim.cmd('colorscheme tokyonight-moon') end
-- }
-- {
-- 'rose-pine/neovim',
-- config = function() vim.cmd('colorscheme rose-pine-moon') end
-- }
-- {
-- 'AlexvZyl/nordic.nvim',
-- lazy = false,
@ -49,15 +40,6 @@ return {
opts = {
contrast = "hard"
},
init = function()
vim.cmd("colorscheme gruvbox")
-- LuaFormatter off
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
vim.api.nvim_set_hl(0, "NoiceCmdlineIcon", { bg = "#1d2021" })
vim.api.nvim_set_hl(0, "NoiceCmdlinePopupBorder", { bg = "#1d2021" })
vim.api.nvim_set_hl(0, "NoiceCmdlinePopupTitle", { bg = "#1d2021" })
-- LuaFormatter on
end
init = function() vim.cmd("colorscheme gruvbox") end
}
}

5
.config/nvim/lua/plugins/tpipeline.lua Normal file
View File

@ -0,0 +1,5 @@
return {
{
'vimpostor/vim-tpipeline'
}
}

24
.config/nvim/lua/plugins/trouble.lua
View File

@ -19,24 +19,12 @@ return {
"TroubleRefresh"
},
init = function()
vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end, {
desc = "Toggle"
})
vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end, {
desc = "Workspace diagnostics"
})
vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end, {
desc = "Document diagnostics"
})
vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end, {
desc = "Quickfix"
})
vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end, {
desc = "Loclist"
})
-- vim.keymap.set("n", "<leader>xr", function() require("trouble").toggle("lsp_references") end, {
-- desc = "LSP references"
-- })
vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
vim.keymap.set("n", "gR", function() require("trouble").toggle("lsp_references") end)
end,
config = function()
local trouble_provider = require("trouble.providers.telescope")

6
.config/nvim/lua/plugins/undotree.lua
View File

@ -8,10 +8,6 @@ return {
"UndotreeFocus",
"UndotreePersistUndo"
},
init = function()
vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>", {
desc = "Undotree"
})
end
init = function() vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>") end
}
}

42
.config/nvim/lua/plugins/whichkey.lua
View File

@ -1,42 +0,0 @@
return {
{
"folke/which-key.nvim",
event = "VeryLazy",
init = function()
vim.o.timeout = true
vim.o.timeoutlen = 300
end,
opts = {
defaults = {
["<leader>x"] = {
name = "+Trouble"
}
}
},
config = function()
local wk = require("which-key")
wk.register({
["<leader>"] = {
l = {
name = "+LSP"
},
x = {
name = "+Trouble"
},
o = {
name = "+Overseer"
},
d = {
name = "+Debug"
},
f = {
name = "+Find"
},
s = {
name = "+Session"
},
}
})
end
}
}

8
.config/nvim/lua/remap.lua
View File

@ -20,4 +20,10 @@ vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "q:", "<nop>")
vim.cmd [[call nvim_create_user_command('W', 'w', {'nargs': 0})]]
-- vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])
-- vim.keymap.set('n', '<leader><C-s>', '<cmd>mksession! .nvim_session<CR>', {})
-- vim.keymap
-- .set('n', '<leader><C-l>', '<cmd>silent! source .nvim_session<CR>', {})