only smart-nav on gentoo, and not on other systems, same with tmux navigation
This commit is contained in:
@@ -5,9 +5,9 @@ return
|
||||
priority = 1000,
|
||||
lazy = false,
|
||||
config = function()
|
||||
-- require("catppuccin").setup({
|
||||
-- transparent_background = true,
|
||||
-- })
|
||||
require("catppuccin").setup({
|
||||
transparent_background = true,
|
||||
})
|
||||
|
||||
vim.cmd.colorscheme "catppuccin"
|
||||
end
|
||||
|
||||
@@ -27,31 +27,29 @@ return {
|
||||
})
|
||||
|
||||
-- Configurations
|
||||
dap.configurations = {
|
||||
python = {
|
||||
{
|
||||
-- The first three options are required by nvim-dap
|
||||
type = "python", -- the type here established the link to the adapter definition: `dap.adapters.python`
|
||||
request = "launch",
|
||||
name = "Launch file",
|
||||
dap.configurations.python = {
|
||||
{
|
||||
-- The first three options are required by nvim-dap
|
||||
type = "python", -- the type here established the link to the adapter definition: `dap.adapters.python`
|
||||
request = "launch",
|
||||
name = "Launch file",
|
||||
|
||||
-- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options
|
||||
-- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options
|
||||
|
||||
program = "${file}", -- This configuration will launch the current file if used.
|
||||
pythonPath = function()
|
||||
-- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself.
|
||||
-- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within.
|
||||
-- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable.
|
||||
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,
|
||||
},
|
||||
program = "${file}", -- This configuration will launch the current file if used.
|
||||
pythonPath = function()
|
||||
-- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself.
|
||||
-- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within.
|
||||
-- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable.
|
||||
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 vim.fn.exepath("python")
|
||||
end
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ return {
|
||||
"gopls",
|
||||
"html",
|
||||
"yamlls",
|
||||
"svelte-language-server",
|
||||
"svelte",
|
||||
"clangd",
|
||||
"ansiblels",
|
||||
"vtsls",
|
||||
|
||||
@@ -6,16 +6,6 @@ return {
|
||||
-- options = {
|
||||
-- theme = 'catppuccin'
|
||||
-- },
|
||||
sections = {
|
||||
lualine_x = {
|
||||
function()
|
||||
return require('direnv').statusline()
|
||||
end,
|
||||
'encoding',
|
||||
'fileformat',
|
||||
'filetype',
|
||||
}
|
||||
}
|
||||
})
|
||||
end
|
||||
}
|
||||
|
||||
@@ -6,9 +6,6 @@ return {
|
||||
'BurntSushi/ripgrep',
|
||||
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }
|
||||
},
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
config = function()
|
||||
local telescope = require("telescope")
|
||||
telescope.setup({
|
||||
@@ -28,5 +25,8 @@ return {
|
||||
telescope.load_extension("ui-select")
|
||||
telescope.load_extension("fzf")
|
||||
end
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{{ if ne .chezmoi.hostname "gentoo" }}
|
||||
return {
|
||||
'alexghergh/nvim-tmux-navigation',
|
||||
config = function()
|
||||
@@ -13,3 +14,6 @@ return {
|
||||
}
|
||||
end
|
||||
}
|
||||
{{ else }}
|
||||
return {}
|
||||
{{ end }}
|
||||
@@ -1,11 +1,7 @@
|
||||
return {
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
},
|
||||
opts = {},
|
||||
keys = {
|
||||
{
|
||||
"<leader>?",
|
||||
@@ -15,8 +11,9 @@ return {
|
||||
desc = "Buffer Local Keymaps (which-key)",
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
config = function(_, opts)
|
||||
local wk = require("which-key")
|
||||
wk.setup(opts)
|
||||
wk.add({
|
||||
{ "<leader>d", group = "Debug" },
|
||||
{ "<leader>f", group = "Telescope" },
|
||||
|
||||
Reference in New Issue
Block a user