Format code
This commit is contained in:
@@ -3,9 +3,8 @@ email = "ehtrude@gmail.com"
|
||||
name = "TrudeEH"
|
||||
|
||||
[credential "https://github.com"]
|
||||
helper =
|
||||
helper = !/usr/bin/gh auth git-credential
|
||||
helper =
|
||||
helper = !/usr/bin/gh auth git-credential
|
||||
[credential "https://gist.github.com"]
|
||||
helper =
|
||||
helper = !/usr/bin/gh auth git-credential
|
||||
|
||||
helper =
|
||||
helper = !/usr/bin/gh auth git-credential
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,16 +3,14 @@
|
||||
-- This file is not required for your own configuration,
|
||||
-- but helps people determine if their system is setup correctly.
|
||||
--
|
||||
--]]
|
||||
|
||||
local check_version = function()
|
||||
--]] local check_version = function()
|
||||
local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch)
|
||||
if not vim.version.cmp then
|
||||
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
|
||||
return
|
||||
end
|
||||
|
||||
if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
|
||||
if vim.version.cmp(vim.version(), {0, 9, 4}) >= 0 then
|
||||
vim.health.ok(string.format("Neovim version is: '%s'", verstr))
|
||||
else
|
||||
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
|
||||
@@ -21,7 +19,7 @@ end
|
||||
|
||||
local check_external_reqs = function()
|
||||
-- Basic utils: `git`, `make`, `unzip`
|
||||
for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do
|
||||
for _, exe in ipairs {'git', 'make', 'unzip', 'rg'} do
|
||||
local is_executable = vim.fn.executable(exe) == 1
|
||||
if is_executable then
|
||||
vim.health.ok(string.format("Found executable: '%s'", exe))
|
||||
@@ -48,5 +46,5 @@ return {
|
||||
|
||||
check_version()
|
||||
check_external_reqs()
|
||||
end,
|
||||
end
|
||||
}
|
||||
|
||||
@@ -5,25 +5,15 @@
|
||||
-- Primarily focused on configuring the debugger for Go, but can
|
||||
-- be extended to other languages as well. That's why it's called
|
||||
-- kickstart.nvim and not kitchen-sink.nvim ;)
|
||||
|
||||
return {
|
||||
-- NOTE: Yes, you can install new plugins here!
|
||||
'mfussenegger/nvim-dap',
|
||||
-- NOTE: And you can specify dependencies as well
|
||||
dependencies = {
|
||||
-- Creates a beautiful debugger UI
|
||||
'rcarriga/nvim-dap-ui',
|
||||
|
||||
-- Required dependency for nvim-dap-ui
|
||||
'nvim-neotest/nvim-nio',
|
||||
|
||||
-- Installs the debug adapters for you
|
||||
'williamboman/mason.nvim',
|
||||
'jay-babu/mason-nvim-dap.nvim',
|
||||
|
||||
-- Add your own debuggers here
|
||||
'leoluz/nvim-dap-go',
|
||||
},
|
||||
dependencies = { -- Creates a beautiful debugger UI
|
||||
'rcarriga/nvim-dap-ui', -- Required dependency for nvim-dap-ui
|
||||
'nvim-neotest/nvim-nio', -- Installs the debug adapters for you
|
||||
'williamboman/mason.nvim', 'jay-babu/mason-nvim-dap.nvim', -- Add your own debuggers here
|
||||
'leoluz/nvim-dap-go'},
|
||||
config = function()
|
||||
local dap = require 'dap'
|
||||
local dapui = require 'dapui'
|
||||
@@ -39,21 +29,31 @@ return {
|
||||
|
||||
-- You'll need to check that you have the required things installed
|
||||
-- online, please don't ask me how to install them :)
|
||||
ensure_installed = {
|
||||
-- Update this to ensure that you have the debuggers for the langs you want
|
||||
'delve',
|
||||
},
|
||||
ensure_installed = { -- Update this to ensure that you have the debuggers for the langs you want
|
||||
'delve'}
|
||||
}
|
||||
|
||||
-- Basic debugging keymaps, feel free to change to your liking!
|
||||
vim.keymap.set('n', '<F5>', dap.continue, { desc = 'Debug: Start/Continue' })
|
||||
vim.keymap.set('n', '<F1>', dap.step_into, { desc = 'Debug: Step Into' })
|
||||
vim.keymap.set('n', '<F2>', dap.step_over, { desc = 'Debug: Step Over' })
|
||||
vim.keymap.set('n', '<F3>', dap.step_out, { desc = 'Debug: Step Out' })
|
||||
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' })
|
||||
vim.keymap.set('n', '<F5>', dap.continue, {
|
||||
desc = 'Debug: Start/Continue'
|
||||
})
|
||||
vim.keymap.set('n', '<F1>', dap.step_into, {
|
||||
desc = 'Debug: Step Into'
|
||||
})
|
||||
vim.keymap.set('n', '<F2>', dap.step_over, {
|
||||
desc = 'Debug: Step Over'
|
||||
})
|
||||
vim.keymap.set('n', '<F3>', dap.step_out, {
|
||||
desc = 'Debug: Step Out'
|
||||
})
|
||||
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, {
|
||||
desc = 'Debug: Toggle Breakpoint'
|
||||
})
|
||||
vim.keymap.set('n', '<leader>B', function()
|
||||
dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
|
||||
end, { desc = 'Debug: Set Breakpoint' })
|
||||
end, {
|
||||
desc = 'Debug: Set Breakpoint'
|
||||
})
|
||||
|
||||
-- Dap UI setup
|
||||
-- For more information, see |:help nvim-dap-ui|
|
||||
@@ -61,7 +61,11 @@ return {
|
||||
-- Set icons to characters that are more likely to work in every terminal.
|
||||
-- Feel free to remove or use ones that you like more! :)
|
||||
-- Don't feel like these are good choices.
|
||||
icons = { expanded = '▾', collapsed = '▸', current_frame = '*' },
|
||||
icons = {
|
||||
expanded = '▾',
|
||||
collapsed = '▸',
|
||||
current_frame = '*'
|
||||
},
|
||||
controls = {
|
||||
icons = {
|
||||
pause = '⏸',
|
||||
@@ -72,13 +76,15 @@ return {
|
||||
step_back = 'b',
|
||||
run_last = '▶▶',
|
||||
terminate = '⏹',
|
||||
disconnect = '⏏',
|
||||
},
|
||||
},
|
||||
disconnect = '⏏'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
|
||||
vim.keymap.set('n', '<F7>', dapui.toggle, { desc = 'Debug: See last session result.' })
|
||||
vim.keymap.set('n', '<F7>', dapui.toggle, {
|
||||
desc = 'Debug: See last session result.'
|
||||
})
|
||||
|
||||
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
|
||||
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
|
||||
@@ -89,8 +95,8 @@ return {
|
||||
delve = {
|
||||
-- On Windows delve must be run attached or it crashes.
|
||||
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
|
||||
detached = vim.fn.has 'win32' == 0,
|
||||
},
|
||||
detached = vim.fn.has 'win32' == 0
|
||||
}
|
||||
}
|
||||
end,
|
||||
end
|
||||
}
|
||||
|
||||
@@ -1,61 +1,94 @@
|
||||
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
||||
-- NOTE: gitsigns is already included in init.lua but contains only the base
|
||||
-- config. This will add also the recommended keymaps.
|
||||
return {{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
on_attach = function(bufnr)
|
||||
local gitsigns = require 'gitsigns'
|
||||
|
||||
return {
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
on_attach = function(bufnr)
|
||||
local gitsigns = require 'gitsigns'
|
||||
local function map(mode, l, r, opts)
|
||||
opts = opts or {}
|
||||
opts.buffer = bufnr
|
||||
vim.keymap.set(mode, l, r, opts)
|
||||
end
|
||||
|
||||
local function map(mode, l, r, opts)
|
||||
opts = opts or {}
|
||||
opts.buffer = bufnr
|
||||
vim.keymap.set(mode, l, r, opts)
|
||||
-- Navigation
|
||||
map('n', ']c', function()
|
||||
if vim.wo.diff then
|
||||
vim.cmd.normal {
|
||||
']c',
|
||||
bang = true
|
||||
}
|
||||
else
|
||||
gitsigns.nav_hunk 'next'
|
||||
end
|
||||
end, {
|
||||
desc = 'Jump to next git [c]hange'
|
||||
})
|
||||
|
||||
-- Navigation
|
||||
map('n', ']c', function()
|
||||
if vim.wo.diff then
|
||||
vim.cmd.normal { ']c', bang = true }
|
||||
else
|
||||
gitsigns.nav_hunk 'next'
|
||||
end
|
||||
end, { desc = 'Jump to next git [c]hange' })
|
||||
map('n', '[c', function()
|
||||
if vim.wo.diff then
|
||||
vim.cmd.normal {
|
||||
'[c',
|
||||
bang = true
|
||||
}
|
||||
else
|
||||
gitsigns.nav_hunk 'prev'
|
||||
end
|
||||
end, {
|
||||
desc = 'Jump to previous git [c]hange'
|
||||
})
|
||||
|
||||
map('n', '[c', function()
|
||||
if vim.wo.diff then
|
||||
vim.cmd.normal { '[c', bang = true }
|
||||
else
|
||||
gitsigns.nav_hunk 'prev'
|
||||
end
|
||||
end, { desc = 'Jump to previous git [c]hange' })
|
||||
|
||||
-- Actions
|
||||
-- visual mode
|
||||
map('v', '<leader>hs', function()
|
||||
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
|
||||
end, { desc = 'stage git hunk' })
|
||||
map('v', '<leader>hr', function()
|
||||
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
|
||||
end, { desc = 'reset git hunk' })
|
||||
-- normal mode
|
||||
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
|
||||
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
|
||||
map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
|
||||
map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
|
||||
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
|
||||
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
|
||||
map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
|
||||
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
|
||||
map('n', '<leader>hD', function()
|
||||
gitsigns.diffthis '@'
|
||||
end, { desc = 'git [D]iff against last commit' })
|
||||
-- Toggles
|
||||
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
|
||||
map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
|
||||
end,
|
||||
},
|
||||
},
|
||||
}
|
||||
-- Actions
|
||||
-- visual mode
|
||||
map('v', '<leader>hs', function()
|
||||
gitsigns.stage_hunk {vim.fn.line '.', vim.fn.line 'v'}
|
||||
end, {
|
||||
desc = 'stage git hunk'
|
||||
})
|
||||
map('v', '<leader>hr', function()
|
||||
gitsigns.reset_hunk {vim.fn.line '.', vim.fn.line 'v'}
|
||||
end, {
|
||||
desc = 'reset git hunk'
|
||||
})
|
||||
-- normal mode
|
||||
map('n', '<leader>hs', gitsigns.stage_hunk, {
|
||||
desc = 'git [s]tage hunk'
|
||||
})
|
||||
map('n', '<leader>hr', gitsigns.reset_hunk, {
|
||||
desc = 'git [r]eset hunk'
|
||||
})
|
||||
map('n', '<leader>hS', gitsigns.stage_buffer, {
|
||||
desc = 'git [S]tage buffer'
|
||||
})
|
||||
map('n', '<leader>hu', gitsigns.undo_stage_hunk, {
|
||||
desc = 'git [u]ndo stage hunk'
|
||||
})
|
||||
map('n', '<leader>hR', gitsigns.reset_buffer, {
|
||||
desc = 'git [R]eset buffer'
|
||||
})
|
||||
map('n', '<leader>hp', gitsigns.preview_hunk, {
|
||||
desc = 'git [p]review hunk'
|
||||
})
|
||||
map('n', '<leader>hb', gitsigns.blame_line, {
|
||||
desc = 'git [b]lame line'
|
||||
})
|
||||
map('n', '<leader>hd', gitsigns.diffthis, {
|
||||
desc = 'git [d]iff against index'
|
||||
})
|
||||
map('n', '<leader>hD', function()
|
||||
gitsigns.diffthis '@'
|
||||
end, {
|
||||
desc = 'git [D]iff against last commit'
|
||||
})
|
||||
-- Toggles
|
||||
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, {
|
||||
desc = '[T]oggle git show [b]lame line'
|
||||
})
|
||||
map('n', '<leader>tD', gitsigns.toggle_deleted, {
|
||||
desc = '[T]oggle git show [D]eleted'
|
||||
})
|
||||
end
|
||||
}
|
||||
}}
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
return {
|
||||
{ -- Add indentation guides even on blank lines
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
-- Enable `lukas-reineke/indent-blankline.nvim`
|
||||
-- See `:help ibl`
|
||||
main = 'ibl',
|
||||
opts = {},
|
||||
},
|
||||
}
|
||||
return {{ -- Add indentation guides even on blank lines
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
-- Enable `lukas-reineke/indent-blankline.nvim`
|
||||
-- See `:help ibl`
|
||||
main = 'ibl',
|
||||
opts = {}
|
||||
}}
|
||||
|
||||
@@ -1,55 +1,54 @@
|
||||
return {
|
||||
return {{ -- Linting
|
||||
'mfussenegger/nvim-lint',
|
||||
event = {'BufReadPre', 'BufNewFile'},
|
||||
config = function()
|
||||
local lint = require 'lint'
|
||||
lint.linters_by_ft = {
|
||||
markdown = {'markdownlint'}
|
||||
}
|
||||
|
||||
{ -- Linting
|
||||
'mfussenegger/nvim-lint',
|
||||
event = { 'BufReadPre', 'BufNewFile' },
|
||||
config = function()
|
||||
local lint = require 'lint'
|
||||
lint.linters_by_ft = {
|
||||
markdown = { 'markdownlint' },
|
||||
}
|
||||
-- To allow other plugins to add linters to require('lint').linters_by_ft,
|
||||
-- instead set linters_by_ft like this:
|
||||
-- lint.linters_by_ft = lint.linters_by_ft or {}
|
||||
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
|
||||
--
|
||||
-- However, note that this will enable a set of default linters,
|
||||
-- which will cause errors unless these tools are available:
|
||||
-- {
|
||||
-- clojure = { "clj-kondo" },
|
||||
-- dockerfile = { "hadolint" },
|
||||
-- inko = { "inko" },
|
||||
-- janet = { "janet" },
|
||||
-- json = { "jsonlint" },
|
||||
-- markdown = { "vale" },
|
||||
-- rst = { "vale" },
|
||||
-- ruby = { "ruby" },
|
||||
-- terraform = { "tflint" },
|
||||
-- text = { "vale" }
|
||||
-- }
|
||||
--
|
||||
-- You can disable the default linters by setting their filetypes to nil:
|
||||
-- lint.linters_by_ft['clojure'] = nil
|
||||
-- lint.linters_by_ft['dockerfile'] = nil
|
||||
-- lint.linters_by_ft['inko'] = nil
|
||||
-- lint.linters_by_ft['janet'] = nil
|
||||
-- lint.linters_by_ft['json'] = nil
|
||||
-- lint.linters_by_ft['markdown'] = nil
|
||||
-- lint.linters_by_ft['rst'] = nil
|
||||
-- lint.linters_by_ft['ruby'] = nil
|
||||
-- lint.linters_by_ft['terraform'] = nil
|
||||
-- lint.linters_by_ft['text'] = nil
|
||||
|
||||
-- To allow other plugins to add linters to require('lint').linters_by_ft,
|
||||
-- instead set linters_by_ft like this:
|
||||
-- lint.linters_by_ft = lint.linters_by_ft or {}
|
||||
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
|
||||
--
|
||||
-- However, note that this will enable a set of default linters,
|
||||
-- which will cause errors unless these tools are available:
|
||||
-- {
|
||||
-- clojure = { "clj-kondo" },
|
||||
-- dockerfile = { "hadolint" },
|
||||
-- inko = { "inko" },
|
||||
-- janet = { "janet" },
|
||||
-- json = { "jsonlint" },
|
||||
-- markdown = { "vale" },
|
||||
-- rst = { "vale" },
|
||||
-- ruby = { "ruby" },
|
||||
-- terraform = { "tflint" },
|
||||
-- text = { "vale" }
|
||||
-- }
|
||||
--
|
||||
-- You can disable the default linters by setting their filetypes to nil:
|
||||
-- lint.linters_by_ft['clojure'] = nil
|
||||
-- lint.linters_by_ft['dockerfile'] = nil
|
||||
-- lint.linters_by_ft['inko'] = nil
|
||||
-- lint.linters_by_ft['janet'] = nil
|
||||
-- lint.linters_by_ft['json'] = nil
|
||||
-- lint.linters_by_ft['markdown'] = nil
|
||||
-- lint.linters_by_ft['rst'] = nil
|
||||
-- lint.linters_by_ft['ruby'] = nil
|
||||
-- lint.linters_by_ft['terraform'] = nil
|
||||
-- lint.linters_by_ft['text'] = nil
|
||||
|
||||
-- Create autocommand which carries out the actual linting
|
||||
-- on the specified events.
|
||||
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
|
||||
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
|
||||
group = lint_augroup,
|
||||
callback = function()
|
||||
require('lint').try_lint()
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
-- Create autocommand which carries out the actual linting
|
||||
-- on the specified events.
|
||||
local lint_augroup = vim.api.nvim_create_augroup('lint', {
|
||||
clear = true
|
||||
})
|
||||
vim.api.nvim_create_autocmd({'BufEnter', 'BufWritePost', 'InsertLeave'}, {
|
||||
group = lint_augroup,
|
||||
callback = function()
|
||||
require('lint').try_lint()
|
||||
end
|
||||
})
|
||||
end
|
||||
}}
|
||||
|
||||
@@ -1,25 +1,21 @@
|
||||
-- Neo-tree is a Neovim plugin to browse the file system
|
||||
-- https://github.com/nvim-neo-tree/neo-tree.nvim
|
||||
|
||||
return {
|
||||
'nvim-neo-tree/neo-tree.nvim',
|
||||
version = '*',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
|
||||
'MunifTanjim/nui.nvim',
|
||||
},
|
||||
dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
|
||||
'MunifTanjim/nui.nvim'},
|
||||
cmd = 'Neotree',
|
||||
keys = {
|
||||
{ '\\', ':Neotree reveal<CR>', { desc = 'NeoTree reveal' } },
|
||||
},
|
||||
keys = {{'\\', ':Neotree reveal<CR>', {
|
||||
desc = 'NeoTree reveal'
|
||||
}}},
|
||||
opts = {
|
||||
filesystem = {
|
||||
window = {
|
||||
mappings = {
|
||||
['\\'] = 'close_window',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
['\\'] = 'close_window'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
backend = "glx";
|
||||
glx-no-stencil = true;
|
||||
glx-copy-from-front = false;
|
||||
backend = "glx"
|
||||
glx-no-stencil = true
|
||||
glx-copy-from-front = false
|
||||
|
||||
# Opacity
|
||||
active-opacity = 1;
|
||||
inactive-opacity = 1;
|
||||
frame-opacity = 1;
|
||||
active-opacity = 1
|
||||
inactive-opacity = 1
|
||||
frame-opacity = 1
|
||||
#inactive-opacity-override = false;
|
||||
#blur-background = false;
|
||||
#blur-background-exclude = [
|
||||
@@ -16,7 +16,7 @@ frame-opacity = 1;
|
||||
#blur-strength = 8;
|
||||
|
||||
# Fading
|
||||
fading = false;
|
||||
fading = false
|
||||
#fade-delta = 2;
|
||||
#no-fading-openclose = false;
|
||||
|
||||
@@ -27,8 +27,8 @@ fading = false;
|
||||
#mark-ovredir-focused = true;
|
||||
#detect-rounded-corners = true;
|
||||
#detect-clien-opacity = true;
|
||||
vsync = true;
|
||||
dbe = false;
|
||||
vsync = true
|
||||
dbe = false
|
||||
#unredir-if-possible = false;
|
||||
#focus-exclude = [ ];
|
||||
#detect-transient = true;
|
||||
@@ -44,10 +44,10 @@ dbe = false;
|
||||
|
||||
# Window transparency
|
||||
opacity-rule = [
|
||||
#"90:class_g = 'st'",
|
||||
];
|
||||
#"90:class_g = 'st'",
|
||||
]
|
||||
|
||||
shadow = false;
|
||||
shadow = false
|
||||
#shadow-radius = 12;
|
||||
#shadow-offset-x = -5;
|
||||
#shadow-offset-y = -5;
|
||||
@@ -58,4 +58,4 @@ shadow = false;
|
||||
|
||||
#corner-radius = 0;
|
||||
|
||||
xrender-sync-fence = true;
|
||||
xrender-sync-fence = true
|
||||
|
||||
Reference in New Issue
Block a user