Format code

This commit is contained in:
2024-08-26 22:17:30 +01:00
parent d76d709a8d
commit 290ec9a403
15 changed files with 1074 additions and 947 deletions

View File

@@ -1,5 +1,5 @@
export EDITOR="nvim"; export EDITOR="nvim"
export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ "; export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ "
extract() { extract() {
if [ -f $1 ]; then if [ -f $1 ]; then
@@ -35,35 +35,38 @@ pushall() {
fi fi
} }
hex2color(){ hex2color() {
hex=${1#"#"} hex=${1#"#"}
r=$(printf '0x%0.2s' "$hex") r=$(printf '0x%0.2s' "$hex")
g=$(printf '0x%0.2s' ${hex#??}) g=$(printf '0x%0.2s' ${hex#??})
b=$(printf '0x%0.2s' ${hex#????}) b=$(printf '0x%0.2s' ${hex#????})
printf '%03d' "$(( (r<75?0:(r-35)/40)*6*6 + printf '%03d' "$(((r < 75 ? 0 : (r - 35) / 40) * 6 * 6 + (\
(g<75?0:(g-35)/40)*6 + g < 75 ? 0 : (g - 35) / 40) * 6 + (\
(b<75?0:(b-35)/40) + 16 ))" b < 75 ? 0 : (b - 35) / 40) + 16))"
} }
color2hex(){ color2hex() {
dec=$(($1%256)) ### input must be a number in range 0-255. dec=$(($1 % 256)) ### input must be a number in range 0-255.
if [ "$dec" -lt "16" ]; then if [ "$dec" -lt "16" ]; then
bas=$(( dec%16 )) bas=$((dec % 16))
mul=128 mul=128
[ "$bas" -eq "7" ] && mul=192 [ "$bas" -eq "7" ] && mul=192
[ "$bas" -eq "8" ] && bas=7 [ "$bas" -eq "8" ] && bas=7
[ "$bas" -gt "8" ] && mul=255 [ "$bas" -gt "8" ] && mul=255
a="$(( (bas&1) *mul ))" a="$(((bas & 1) * mul))"
b="$(( ((bas&2)>>1)*mul ))" b="$((((bas & 2) >> 1) * mul))"
c="$(( ((bas&4)>>2)*mul ))" c="$((((bas & 4) >> 2) * mul))"
printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c" printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c"
elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then
b=$(( (dec-16)%6 )); b=$(( b==0?0: b*40 + 55 )) b=$(((dec - 16) % 6))
g=$(( (dec-16)/6%6)); g=$(( g==0?0: g*40 + 55 )) b=$((b == 0 ? 0 : b * 40 + 55))
r=$(( (dec-16)/36 )); r=$(( r==0?0: r*40 + 55 )) g=$(((dec - 16) / 6 % 6))
g=$((g == 0 ? 0 : g * 40 + 55))
r=$(((dec - 16) / 36))
r=$((r == 0 ? 0 : r * 40 + 55))
printf 'dec= %3s color= #%02x%02x%02x\n' "$dec" "$r" "$g" "$b" printf 'dec= %3s color= #%02x%02x%02x\n' "$dec" "$r" "$g" "$b"
else else
gray=$(( (dec-232)*10+8 )) gray=$(((dec - 232) * 10 + 8))
printf 'dec= %3s gray= #%02x%02x%02x\n' "$dec" "$gray" "$gray" "$gray" printf 'dec= %3s gray= #%02x%02x%02x\n' "$dec" "$gray" "$gray" "$gray"
fi fi
} }
@@ -92,7 +95,7 @@ alias cpp='rsync -ah --progress'
set completion-ignore-case On set completion-ignore-case On
# Use bash-completion, if available # Use bash-completion, if available
[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \ [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] &&
. /usr/share/bash-completion/bash_completion . /usr/share/bash-completion/bash_completion
export OFLAGS="--ozone-platform-hint=auto" export OFLAGS="--ozone-platform-hint=auto"

View File

@@ -3,9 +3,8 @@ email = "ehtrude@gmail.com"
name = "TrudeEH" name = "TrudeEH"
[credential "https://github.com"] [credential "https://github.com"]
helper = helper =
helper = !/usr/bin/gh auth git-credential helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"] [credential "https://gist.github.com"]
helper = helper =
helper = !/usr/bin/gh auth git-credential helper = !/usr/bin/gh auth git-credential

View File

@@ -21,7 +21,11 @@ vim.opt.timeoutlen = 300
vim.opt.splitright = true vim.opt.splitright = true
vim.opt.splitbelow = true vim.opt.splitbelow = true
vim.opt.list = true vim.opt.list = true
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '' } vim.opt.listchars = {
tab = '» ',
trail = '·',
nbsp = ''
}
vim.opt.inccommand = 'split' -- Preview substitutions vim.opt.inccommand = 'split' -- Preview substitutions
vim.opt.cursorline = true vim.opt.cursorline = true
vim.opt.scrolloff = 10 vim.opt.scrolloff = 10
@@ -34,10 +38,18 @@ vim.opt.hlsearch = true
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>') vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-- Diagnostic keymaps -- Diagnostic keymaps
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' }) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, {
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' }) desc = 'Go to previous [D]iagnostic message'
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' }) })
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, {
desc = 'Go to next [D]iagnostic message'
})
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, {
desc = 'Show diagnostic [E]rror messages'
})
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, {
desc = 'Open diagnostic [Q]uickfix list'
})
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
-- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which -- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
@@ -45,16 +57,26 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
-- --
-- This won't work in all terminal emulators/tmux/etc. Try your own mapping -- This won't work in all terminal emulators/tmux/etc. Try your own mapping
-- or just use <C-\><C-n> to exit terminal mode -- or just use <C-\><C-n> to exit terminal mode
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }) vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', {
desc = 'Exit terminal mode'
})
-- Keybinds to make split navigation easier. -- Keybinds to make split navigation easier.
-- Use CTRL+<hjkl> to switch between windows -- Use CTRL+<hjkl> to switch between windows
-- --
-- See `:help wincmd` for a list of all window commands -- See `:help wincmd` for a list of all window commands
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' }) vim.keymap.set('n', '<C-h>', '<C-w><C-h>', {
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' }) desc = 'Move focus to the left window'
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' }) })
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' }) vim.keymap.set('n', '<C-l>', '<C-w><C-l>', {
desc = 'Move focus to the right window'
})
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', {
desc = 'Move focus to the lower window'
})
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', {
desc = 'Move focus to the upper window'
})
-- NOTE: Basic Autocommands -- NOTE: Basic Autocommands
-- See `:help lua-guide-autocommands` -- See `:help lua-guide-autocommands`
@@ -64,10 +86,12 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
-- See `:help vim.highlight.on_yank()` -- See `:help vim.highlight.on_yank()`
vim.api.nvim_create_autocmd('TextYankPost', { vim.api.nvim_create_autocmd('TextYankPost', {
desc = 'Highlight when yanking (copying) text', desc = 'Highlight when yanking (copying) text',
group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), group = vim.api.nvim_create_augroup('kickstart-highlight-yank', {
clear = true
}),
callback = function() callback = function()
vim.highlight.on_yank() vim.highlight.on_yank()
end, end
}) })
-- NOTE: Install `lazy.nvim` plugin manager -- NOTE: Install `lazy.nvim` plugin manager
@@ -75,7 +99,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
if not vim.loop.fs_stat(lazypath) then if not vim.loop.fs_stat(lazypath) then
local lazyrepo = 'https://github.com/folke/lazy.nvim.git' local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } vim.fn.system {'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath}
end ---@diagnostic disable-next-line: undefined-field end ---@diagnostic disable-next-line: undefined-field
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
@@ -89,24 +113,33 @@ vim.opt.rtp:prepend(lazypath)
-- To update plugins you can run -- To update plugins you can run
-- :Lazy update -- :Lazy update
-- --
require('lazy').setup({ require('lazy').setup({'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically {
{ 'numToStr/Comment.nvim', opts = {} }, -- "gc" to comment visual regions/lines 'numToStr/Comment.nvim',
opts = {}
{ -- Adds git related signs to the gutter, as well as utilities for managing changes }, -- "gc" to comment visual regions/lines
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
'lewis6991/gitsigns.nvim', 'lewis6991/gitsigns.nvim',
opts = { opts = {
signs = { signs = {
add = { text = '+' }, add = {
change = { text = '~' }, text = '+'
delete = { text = '_' },
topdelete = { text = '' },
changedelete = { text = '~' },
}, },
change = {
text = '~'
}, },
delete = {
text = '_'
}, },
topdelete = {
{ -- Useful plugin to show you pending keybinds. text = ''
},
changedelete = {
text = '~'
}
}
}
}, { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim', 'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = 'VimEnter', -- Sets the loading event to 'VimEnter'
config = function() -- This is the function that runs, AFTER loading config = function() -- This is the function that runs, AFTER loading
@@ -114,27 +147,47 @@ require('lazy').setup({
-- Document existing key chains -- Document existing key chains
require('which-key').register { require('which-key').register {
['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' }, ['<leader>c'] = {
['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, name = '[C]ode',
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' }, _ = 'which_key_ignore'
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' }, },
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, ['<leader>d'] = {
['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, name = '[D]ocument',
['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, _ = 'which_key_ignore'
},
['<leader>r'] = {
name = '[R]ename',
_ = 'which_key_ignore'
},
['<leader>s'] = {
name = '[S]earch',
_ = 'which_key_ignore'
},
['<leader>w'] = {
name = '[W]orkspace',
_ = 'which_key_ignore'
},
['<leader>t'] = {
name = '[T]oggle',
_ = 'which_key_ignore'
},
['<leader>h'] = {
name = 'Git [H]unk',
_ = 'which_key_ignore'
}
} }
-- visual mode -- visual mode
require('which-key').register({ require('which-key').register({
['<leader>h'] = { 'Git [H]unk' }, ['<leader>h'] = {'Git [H]unk'}
}, { mode = 'v' }) }, {
end, mode = 'v'
}, })
end
{ -- Fuzzy Finder (files, lsp, etc) }, { -- Fuzzy Finder (files, lsp, etc)
'nvim-telescope/telescope.nvim', 'nvim-telescope/telescope.nvim',
event = 'VimEnter', event = 'VimEnter',
branch = '0.1.x', branch = '0.1.x',
dependencies = { dependencies = {'nvim-lua/plenary.nvim',
'nvim-lua/plenary.nvim',
{ -- If encountering errors, see telescope-fzf-native README for installation instructions { -- If encountering errors, see telescope-fzf-native README for installation instructions
'nvim-telescope/telescope-fzf-native.nvim', 'nvim-telescope/telescope-fzf-native.nvim',
@@ -146,13 +199,12 @@ require('lazy').setup({
-- installed and loaded. -- installed and loaded.
cond = function() cond = function()
return vim.fn.executable 'make' == 1 return vim.fn.executable 'make' == 1
end, end
}, }, {'nvim-telescope/telescope-ui-select.nvim'}, -- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-telescope/telescope-ui-select.nvim' }, {
'nvim-tree/nvim-web-devicons',
-- Useful for getting pretty icons, but requires a Nerd Font. enabled = vim.g.have_nerd_font
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }},
},
config = function() config = function()
-- Two important keymaps to use while in Telescope are: -- Two important keymaps to use while in Telescope are:
-- - Insert mode: <c-/> -- - Insert mode: <c-/>
@@ -170,10 +222,8 @@ require('lazy').setup({
-- }, -- },
-- pickers = {} -- pickers = {}
extensions = { extensions = {
['ui-select'] = { ['ui-select'] = {require('telescope.themes').get_dropdown()}
require('telescope.themes').get_dropdown(), }
},
},
} }
-- Enable Telescope extensions if they are installed -- Enable Telescope extensions if they are installed
@@ -182,64 +232,98 @@ require('lazy').setup({
-- See `:help telescope.builtin` -- See `:help telescope.builtin`
local builtin = require 'telescope.builtin' local builtin = require 'telescope.builtin'
vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', '<leader>sh', builtin.help_tags, {
vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) desc = '[S]earch [H]elp'
vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' }) })
vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set('n', '<leader>sk', builtin.keymaps, {
vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) desc = '[S]earch [K]eymaps'
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) })
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set('n', '<leader>sf', builtin.find_files, {
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' }) desc = '[S]earch [F]iles'
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) })
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' }) vim.keymap.set('n', '<leader>ss', builtin.builtin, {
desc = '[S]earch [S]elect Telescope'
})
vim.keymap.set('n', '<leader>sw', builtin.grep_string, {
desc = '[S]earch current [W]ord'
})
vim.keymap.set('n', '<leader>sg', builtin.live_grep, {
desc = '[S]earch by [G]rep'
})
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, {
desc = '[S]earch [D]iagnostics'
})
vim.keymap.set('n', '<leader>sr', builtin.resume, {
desc = '[S]earch [R]esume'
})
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, {
desc = '[S]earch Recent Files ("." for repeat)'
})
vim.keymap.set('n', '<leader><leader>', builtin.buffers, {
desc = '[ ] Find existing buffers'
})
-- Slightly advanced example of overriding default behavior and theme -- Slightly advanced example of overriding default behavior and theme
vim.keymap.set('n', '<leader>/', function() vim.keymap.set('n', '<leader>/', function()
-- You can pass additional configuration to Telescope to change the theme, layout, etc. -- You can pass additional configuration to Telescope to change the theme, layout, etc.
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
winblend = 10, winblend = 10,
previewer = false, previewer = false
})
end, {
desc = '[/] Fuzzily search in current buffer'
}) })
end, { desc = '[/] Fuzzily search in current buffer' })
-- It's also possible to pass additional configuration options. -- It's also possible to pass additional configuration options.
-- See `:help telescope.builtin.live_grep()` for information about particular keys -- See `:help telescope.builtin.live_grep()` for information about particular keys
vim.keymap.set('n', '<leader>s/', function() vim.keymap.set('n', '<leader>s/', function()
builtin.live_grep { builtin.live_grep {
grep_open_files = true, grep_open_files = true,
prompt_title = 'Live Grep in Open Files', prompt_title = 'Live Grep in Open Files'
} }
end, { desc = '[S]earch [/] in Open Files' }) end, {
desc = '[S]earch [/] in Open Files'
})
-- Shortcut for searching your Neovim configuration files -- Shortcut for searching your Neovim configuration files
vim.keymap.set('n', '<leader>sn', function() vim.keymap.set('n', '<leader>sn', function()
builtin.find_files { cwd = vim.fn.stdpath 'config' } builtin.find_files {
end, { desc = '[S]earch [N]eovim files' }) cwd = vim.fn.stdpath 'config'
end, }
}, end, {
desc = '[S]earch [N]eovim files'
{ -- NOTE: LSP Configuration & Plugins })
end
}, { -- NOTE: LSP Configuration & Plugins
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
dependencies = { dependencies = { -- Automatically install LSPs and related tools to stdpath for Neovim
-- Automatically install LSPs and related tools to stdpath for Neovim {
{ 'williamboman/mason.nvim', config = true }, 'williamboman/mason.nvim',
'williamboman/mason-lspconfig.nvim', config = true
'WhoIsSethDaniel/mason-tool-installer.nvim', }, 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim',
-- Useful status updates for LSP. -- Useful status updates for LSP.
-- `opts = {}` is the same as calling `require('fidget').setup({})` -- `opts = {}` is the same as calling `require('fidget').setup({})`
{ 'j-hui/fidget.nvim', opts = {} }, {
'j-hui/fidget.nvim',
-- `neodev` configures Lua LSP for your Neovim config, runtime and plugins opts = {}
}, -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
-- used for completion, annotations and signatures of Neovim apis -- used for completion, annotations and signatures of Neovim apis
{ 'folke/neodev.nvim', opts = {} }, {
}, 'folke/neodev.nvim',
opts = {}
}},
config = function() config = function()
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), group = vim.api.nvim_create_augroup('kickstart-lsp-attach', {
clear = true
}),
callback = function(event) callback = function(event)
local map = function(keys, func, desc) local map = function(keys, func, desc)
vim.keymap.set('n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) vim.keymap.set('n', keys, func, {
buffer = event.buf,
desc = 'LSP: ' .. desc
})
end end
-- Jump to the definition of the word under your cursor. -- Jump to the definition of the word under your cursor.
@@ -290,25 +374,32 @@ require('lazy').setup({
-- When you move your cursor, the highlights will be cleared (the second autocommand). -- When you move your cursor, the highlights will be cleared (the second autocommand).
local client = vim.lsp.get_client_by_id(event.data.client_id) local client = vim.lsp.get_client_by_id(event.data.client_id)
if client and client.server_capabilities.documentHighlightProvider then if client and client.server_capabilities.documentHighlightProvider then
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', {
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { clear = false
})
vim.api.nvim_create_autocmd({'CursorHold', 'CursorHoldI'}, {
buffer = event.buf, buffer = event.buf,
group = highlight_augroup, group = highlight_augroup,
callback = vim.lsp.buf.document_highlight, callback = vim.lsp.buf.document_highlight
}) })
vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { vim.api.nvim_create_autocmd({'CursorMoved', 'CursorMovedI'}, {
buffer = event.buf, buffer = event.buf,
group = highlight_augroup, group = highlight_augroup,
callback = vim.lsp.buf.clear_references, callback = vim.lsp.buf.clear_references
}) })
vim.api.nvim_create_autocmd('LspDetach', { vim.api.nvim_create_autocmd('LspDetach', {
group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), group = vim.api.nvim_create_augroup('kickstart-lsp-detach', {
clear = true
}),
callback = function(event2) callback = function(event2)
vim.lsp.buf.clear_references() vim.lsp.buf.clear_references()
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } vim.api.nvim_clear_autocmds {
end, group = 'kickstart-lsp-highlight',
buffer = event2.buf
}
end
}) })
end end
@@ -321,7 +412,7 @@ require('lazy').setup({
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end, '[T]oggle Inlay [H]ints') end, '[T]oggle Inlay [H]ints')
end end
end, end
}) })
-- LSP servers and clients are able to communicate to each other what features they support. -- LSP servers and clients are able to communicate to each other what features they support.
@@ -361,13 +452,13 @@ require('lazy').setup({
settings = { settings = {
Lua = { Lua = {
completion = { completion = {
callSnippet = 'Replace', callSnippet = 'Replace'
}, }
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } }, -- diagnostics = { disable = { 'missing-fields' } },
}, }
}, }
}, }
} }
-- Ensure the servers and tools above are installed -- Ensure the servers and tools above are installed
@@ -381,68 +472,66 @@ require('lazy').setup({
-- You can add other tools here that you want Mason to install -- You can add other tools here that you want Mason to install
-- for you, so that they are available from within Neovim. -- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {}) local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, { vim.list_extend(ensure_installed, {'stylua' -- Used to format Lua code
'stylua', -- Used to format Lua code
}) })
require('mason-tool-installer').setup { ensure_installed = ensure_installed } require('mason-tool-installer').setup {
ensure_installed = ensure_installed
}
require('mason-lspconfig').setup { require('mason-lspconfig').setup {
handlers = { handlers = {function(server_name)
function(server_name)
local server = servers[server_name] or {} local server = servers[server_name] or {}
-- This handles overriding only values explicitly passed -- This handles overriding only values explicitly passed
-- by the server configuration above. Useful when disabling -- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for tsserver) -- certain features of an LSP (for example, turning off formatting for tsserver)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
require('lspconfig')[server_name].setup(server) require('lspconfig')[server_name].setup(server)
end, end}
},
} }
end, end
}, }, { -- Autoformat
{ -- Autoformat
'stevearc/conform.nvim', 'stevearc/conform.nvim',
lazy = false, lazy = false,
keys = { keys = {{
{
'<leader>f', '<leader>f',
function() function()
require('conform').format { async = true, lsp_fallback = true } require('conform').format {
async = true,
lsp_fallback = true
}
end, end,
mode = '', mode = '',
desc = '[F]ormat buffer', desc = '[F]ormat buffer'
}, }},
},
opts = { opts = {
notify_on_error = false, notify_on_error = false,
format_on_save = function(bufnr) format_on_save = function(bufnr)
-- Disable "format_on_save lsp_fallback" for languages that don't -- Disable "format_on_save lsp_fallback" for languages that don't
-- have a well standardized coding style. You can add additional -- have a well standardized coding style. You can add additional
-- languages here or re-enable it for the disabled ones. -- languages here or re-enable it for the disabled ones.
local disable_filetypes = { c = true, cpp = true } local disable_filetypes = {
c = true,
cpp = true
}
return { return {
timeout_ms = 500, timeout_ms = 500,
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype]
} }
end, end,
formatters_by_ft = { formatters_by_ft = {
lua = { 'stylua' }, lua = {'stylua'}
-- Conform can also run multiple formatters sequentially -- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" }, -- python = { "isort", "black" },
-- --
-- You can use a sub-list to tell conform to run *until* a formatter -- You can use a sub-list to tell conform to run *until* a formatter
-- is found. -- is found.
-- javascript = { { "prettierd", "prettier" } }, -- javascript = { { "prettierd", "prettier" } },
}, }
}, }
}, }, { -- Autocompletion
{ -- Autocompletion
'hrsh7th/nvim-cmp', 'hrsh7th/nvim-cmp',
event = 'InsertEnter', event = 'InsertEnter',
dependencies = { dependencies = { -- Snippet Engine & its associated nvim-cmp source
-- Snippet Engine & its associated nvim-cmp source
{ {
'L3MON4D3/LuaSnip', 'L3MON4D3/LuaSnip',
build = (function() build = (function()
@@ -464,16 +553,11 @@ require('lazy').setup({
-- require('luasnip.loaders.from_vscode').lazy_load() -- require('luasnip.loaders.from_vscode').lazy_load()
-- end, -- end,
-- }, -- },
}, }
}, }, 'saadparwaiz1/cmp_luasnip', -- Adds other completion capabilities.
'saadparwaiz1/cmp_luasnip',
-- Adds other completion capabilities.
-- nvim-cmp does not ship with all sources by default. They are split -- nvim-cmp does not ship with all sources by default. They are split
-- into multiple repos for maintenance purposes. -- into multiple repos for maintenance purposes.
'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path'},
'hrsh7th/cmp-path',
},
config = function() config = function()
-- See `:help cmp` -- See `:help cmp`
local cmp = require 'cmp' local cmp = require 'cmp'
@@ -484,9 +568,11 @@ require('lazy').setup({
snippet = { snippet = {
expand = function(args) expand = function(args)
luasnip.lsp_expand(args.body) luasnip.lsp_expand(args.body)
end, end
},
completion = {
completeopt = 'menu,menuone,noinsert'
}, },
completion = { completeopt = 'menu,menuone,noinsert' },
-- For an understanding of why these mappings were -- For an understanding of why these mappings were
-- chosen, you will need to read `:help ins-completion` -- chosen, you will need to read `:help ins-completion`
@@ -505,13 +591,15 @@ require('lazy').setup({
-- Accept ([y]es) the completion. -- Accept ([y]es) the completion.
-- This will auto-import if your LSP supports it. -- This will auto-import if your LSP supports it.
-- This will expand snippets if the LSP sent a snippet. -- This will expand snippets if the LSP sent a snippet.
['<C-y>'] = cmp.mapping.confirm { select = true }, ['<C-y>'] = cmp.mapping.confirm {
select = true
},
-- If you prefer more traditional completion keymaps, -- If you prefer more traditional completion keymaps,
-- you can uncomment the following lines -- you can uncomment the following lines
--['<CR>'] = cmp.mapping.confirm { select = true }, -- ['<CR>'] = cmp.mapping.confirm { select = true },
--['<Tab>'] = cmp.mapping.select_next_item(), -- ['<Tab>'] = cmp.mapping.select_next_item(),
--['<S-Tab>'] = cmp.mapping.select_prev_item(), -- ['<S-Tab>'] = cmp.mapping.select_prev_item(),
-- Manually trigger a completion from nvim-cmp. -- Manually trigger a completion from nvim-cmp.
-- Generally you don't need this, because nvim-cmp will display -- Generally you don't need this, because nvim-cmp will display
@@ -530,26 +618,26 @@ require('lazy').setup({
if luasnip.expand_or_locally_jumpable() then if luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump() luasnip.expand_or_jump()
end end
end, { 'i', 's' }), end, {'i', 's'}),
['<C-h>'] = cmp.mapping(function() ['<C-h>'] = cmp.mapping(function()
if luasnip.locally_jumpable(-1) then if luasnip.locally_jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
end end
end, { 'i', 's' }), end, {'i', 's'})
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
}, },
sources = { sources = {{
{ name = 'nvim_lsp' }, name = 'nvim_lsp'
{ name = 'luasnip' }, }, {
{ name = 'path' }, name = 'luasnip'
}, }, {
name = 'path'
}}
} }
end, end
}, }, { -- You can easily change to a different colorscheme.
{ -- You can easily change to a different colorscheme.
-- Change the name of the colorscheme plugin below, and then -- Change the name of the colorscheme plugin below, and then
-- change the command in the config to whatever the name of that colorscheme is. -- change the command in the config to whatever the name of that colorscheme is.
-- --
@@ -564,13 +652,16 @@ require('lazy').setup({
-- You can configure highlights by doing something like: -- You can configure highlights by doing something like:
vim.cmd.hi 'Comment gui=none' vim.cmd.hi 'Comment gui=none'
end, end
}, }, -- Highlight todo, notes, etc in comments
{
-- Highlight todo, notes, etc in comments 'folke/todo-comments.nvim',
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, event = 'VimEnter',
dependencies = {'nvim-lua/plenary.nvim'},
{ -- Collection of various small independent plugins/modules opts = {
signs = false
}
}, { -- Collection of various small independent plugins/modules
'echasnovski/mini.nvim', 'echasnovski/mini.nvim',
config = function() config = function()
-- Better Around/Inside textobjects -- Better Around/Inside textobjects
@@ -579,7 +670,9 @@ require('lazy').setup({
-- - va) - [V]isually select [A]round [)]paren -- - va) - [V]isually select [A]round [)]paren
-- - yinq - [Y]ank [I]nside [N]ext [']quote -- - yinq - [Y]ank [I]nside [N]ext [']quote
-- - ci' - [C]hange [I]nside [']quote -- - ci' - [C]hange [I]nside [']quote
require('mini.ai').setup { n_lines = 500 } require('mini.ai').setup {
n_lines = 500
}
-- Add/delete/replace surroundings (brackets, quotes, etc.) -- Add/delete/replace surroundings (brackets, quotes, etc.)
-- --
@@ -593,7 +686,9 @@ require('lazy').setup({
-- and try some other statusline plugin -- and try some other statusline plugin
local statusline = require 'mini.statusline' local statusline = require 'mini.statusline'
-- set use_icons to true if you have a Nerd Font -- set use_icons to true if you have a Nerd Font
statusline.setup { use_icons = vim.g.have_nerd_font } statusline.setup {
use_icons = vim.g.have_nerd_font
}
-- You can configure sections in the statusline by overriding their -- You can configure sections in the statusline by overriding their
-- default behavior. For example, here we set the section for -- default behavior. For example, here we set the section for
@@ -605,13 +700,12 @@ require('lazy').setup({
-- ... and there is more! -- ... and there is more!
-- Check out: https://github.com/echasnovski/mini.nvim -- Check out: https://github.com/echasnovski/mini.nvim
end, end
}, }, { -- Highlight, edit, and navigate code
{ -- Highlight, edit, and navigate code
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate', build = ':TSUpdate',
opts = { opts = {
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, ensure_installed = {'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc'},
-- Autoinstall languages that are not installed -- Autoinstall languages that are not installed
auto_install = true, auto_install = true,
highlight = { highlight = {
@@ -619,9 +713,12 @@ require('lazy').setup({
-- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
-- If you are experiencing weird indenting issues, add the language to -- If you are experiencing weird indenting issues, add the language to
-- the list of additional_vim_regex_highlighting and disabled languages for indent. -- the list of additional_vim_regex_highlighting and disabled languages for indent.
additional_vim_regex_highlighting = { 'ruby' }, additional_vim_regex_highlighting = {'ruby'}
}, },
indent = { enable = true, disable = { 'ruby' } }, indent = {
enable = true,
disable = {'ruby'}
}
}, },
config = function(_, opts) config = function(_, opts)
-- [[ Configure Treesitter ]] See `:help nvim-treesitter` -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
@@ -637,65 +734,55 @@ require('lazy').setup({
-- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
-- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
end, end
}, }, -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
-- init.lua. If you want these files, they are in the repository, so you can just download them and
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the -- place them in the correct locations.
-- init.lua. If you want these files, they are in the repository, so you can just download them and {
-- place them in the correct locations.
{
'windwp/nvim-autopairs', 'windwp/nvim-autopairs',
event = 'InsertEnter', event = 'InsertEnter',
-- Optional dependency -- Optional dependency
dependencies = { 'hrsh7th/nvim-cmp' }, dependencies = {'hrsh7th/nvim-cmp'},
config = function() config = function()
require('nvim-autopairs').setup {} require('nvim-autopairs').setup {}
-- If you want to automatically add `(` after selecting a function or method -- If you want to automatically add `(` after selecting a function or method
local cmp_autopairs = require 'nvim-autopairs.completion.cmp' local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
local cmp = require 'cmp' local cmp = require 'cmp'
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
end, end
}, }, {
{
'nvim-neo-tree/neo-tree.nvim', 'nvim-neo-tree/neo-tree.nvim',
version = '*', version = '*',
dependencies = { dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'nvim-lua/plenary.nvim', 'MunifTanjim/nui.nvim'},
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'MunifTanjim/nui.nvim',
},
cmd = 'Neotree', cmd = 'Neotree',
keys = { keys = {{'\\', ':Neotree reveal<CR>', {
{ '\\', ':Neotree reveal<CR>', { desc = 'NeoTree reveal' } }, desc = 'NeoTree reveal'
}, }}},
opts = { opts = {
filesystem = { filesystem = {
window = { window = {
mappings = { mappings = {
['\\'] = 'close_window', ['\\'] = 'close_window'
}, }
}, }
}, }
}, }
}, } -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
-- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart --
-- -- Here are some example plugins that I've included in the Kickstart repository.
-- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim).
-- Uncomment any of the lines below to enable them (you will need to restart nvim). --
-- -- require 'kickstart.plugins.debug',
-- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint',
-- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-- This is the easiest way to modularize your config.
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` --
-- This is the easiest way to modularize your config. -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-- -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- { import = 'custom.plugins' },
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-- { import = 'custom.plugins' },
}, { }, {
ui = { ui = {
-- If you are using a Nerd Font: set icons to an empty table which will use the -- If you are using a Nerd Font: set icons to an empty table which will use the
@@ -713,9 +800,9 @@ require('lazy').setup({
source = '📄', source = '📄',
start = '🚀', start = '🚀',
task = '📌', task = '📌',
lazy = '💤 ', lazy = '💤 '
}, }
}, }
}) })
-- The line beneath this is called `modeline`. See `:help modeline` -- The line beneath this is called `modeline`. See `:help modeline`

View File

@@ -3,16 +3,14 @@
-- This file is not required for your own configuration, -- This file is not required for your own configuration,
-- but helps people determine if their system is setup correctly. -- 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) local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch)
if not vim.version.cmp then if not vim.version.cmp then
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
return return
end 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)) vim.health.ok(string.format("Neovim version is: '%s'", verstr))
else else
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) 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() local check_external_reqs = function()
-- Basic utils: `git`, `make`, `unzip` -- 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 local is_executable = vim.fn.executable(exe) == 1
if is_executable then if is_executable then
vim.health.ok(string.format("Found executable: '%s'", exe)) vim.health.ok(string.format("Found executable: '%s'", exe))
@@ -48,5 +46,5 @@ return {
check_version() check_version()
check_external_reqs() check_external_reqs()
end, end
} }

View File

@@ -5,25 +5,15 @@
-- Primarily focused on configuring the debugger for Go, but can -- Primarily focused on configuring the debugger for Go, but can
-- be extended to other languages as well. That's why it's called -- be extended to other languages as well. That's why it's called
-- kickstart.nvim and not kitchen-sink.nvim ;) -- kickstart.nvim and not kitchen-sink.nvim ;)
return { return {
-- NOTE: Yes, you can install new plugins here! -- NOTE: Yes, you can install new plugins here!
'mfussenegger/nvim-dap', 'mfussenegger/nvim-dap',
-- NOTE: And you can specify dependencies as well -- NOTE: And you can specify dependencies as well
dependencies = { dependencies = { -- Creates a beautiful debugger UI
-- Creates a beautiful debugger UI 'rcarriga/nvim-dap-ui', -- Required dependency for nvim-dap-ui
'rcarriga/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
-- Required dependency for nvim-dap-ui 'leoluz/nvim-dap-go'},
'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() config = function()
local dap = require 'dap' local dap = require 'dap'
local dapui = require 'dapui' local dapui = require 'dapui'
@@ -39,21 +29,31 @@ return {
-- You'll need to check that you have the required things installed -- You'll need to check that you have the required things installed
-- online, please don't ask me how to install them :) -- online, please don't ask me how to install them :)
ensure_installed = { ensure_installed = { -- Update this to ensure that you have the debuggers for the langs you want
-- Update this to ensure that you have the debuggers for the langs you want 'delve'}
'delve',
},
} }
-- Basic debugging keymaps, feel free to change to your liking! -- 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', '<F5>', dap.continue, {
vim.keymap.set('n', '<F1>', dap.step_into, { desc = 'Debug: Step Into' }) desc = 'Debug: Start/Continue'
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', '<F1>', dap.step_into, {
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) 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() vim.keymap.set('n', '<leader>B', function()
dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
end, { desc = 'Debug: Set Breakpoint' }) end, {
desc = 'Debug: Set Breakpoint'
})
-- Dap UI setup -- Dap UI setup
-- For more information, see |:help nvim-dap-ui| -- 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. -- Set icons to characters that are more likely to work in every terminal.
-- Feel free to remove or use ones that you like more! :) -- Feel free to remove or use ones that you like more! :)
-- Don't feel like these are good choices. -- Don't feel like these are good choices.
icons = { expanded = '', collapsed = '', current_frame = '*' }, icons = {
expanded = '',
collapsed = '',
current_frame = '*'
},
controls = { controls = {
icons = { icons = {
pause = '', pause = '',
@@ -72,13 +76,15 @@ return {
step_back = 'b', step_back = 'b',
run_last = '▶▶', run_last = '▶▶',
terminate = '', terminate = '',
disconnect = '', disconnect = ''
}, }
}, }
} }
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. -- 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.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close dap.listeners.before.event_terminated['dapui_config'] = dapui.close
@@ -89,8 +95,8 @@ return {
delve = { delve = {
-- On Windows delve must be run attached or it crashes. -- On Windows delve must be run attached or it crashes.
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring -- 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
} }

View File

@@ -1,9 +1,7 @@
-- Adds git related signs to the gutter, as well as utilities for managing changes -- 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 -- NOTE: gitsigns is already included in init.lua but contains only the base
-- config. This will add also the recommended keymaps. -- config. This will add also the recommended keymaps.
return {{
return {
{
'lewis6991/gitsigns.nvim', 'lewis6991/gitsigns.nvim',
opts = { opts = {
on_attach = function(bufnr) on_attach = function(bufnr)
@@ -18,44 +16,79 @@ return {
-- Navigation -- Navigation
map('n', ']c', function() map('n', ']c', function()
if vim.wo.diff then if vim.wo.diff then
vim.cmd.normal { ']c', bang = true } vim.cmd.normal {
']c',
bang = true
}
else else
gitsigns.nav_hunk 'next' gitsigns.nav_hunk 'next'
end end
end, { desc = 'Jump to next git [c]hange' }) end, {
desc = 'Jump to next git [c]hange'
})
map('n', '[c', function() map('n', '[c', function()
if vim.wo.diff then if vim.wo.diff then
vim.cmd.normal { '[c', bang = true } vim.cmd.normal {
'[c',
bang = true
}
else else
gitsigns.nav_hunk 'prev' gitsigns.nav_hunk 'prev'
end end
end, { desc = 'Jump to previous git [c]hange' }) end, {
desc = 'Jump to previous git [c]hange'
})
-- Actions -- Actions
-- visual mode -- visual mode
map('v', '<leader>hs', function() map('v', '<leader>hs', function()
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } gitsigns.stage_hunk {vim.fn.line '.', vim.fn.line 'v'}
end, { desc = 'stage git hunk' }) end, {
desc = 'stage git hunk'
})
map('v', '<leader>hr', function() map('v', '<leader>hr', function()
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } gitsigns.reset_hunk {vim.fn.line '.', vim.fn.line 'v'}
end, { desc = 'reset git hunk' }) end, {
desc = 'reset git hunk'
})
-- normal mode -- normal mode
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) map('n', '<leader>hs', gitsigns.stage_hunk, {
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) desc = 'git [s]tage 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_hunk, {
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) desc = 'git [r]eset hunk'
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>hS', gitsigns.stage_buffer, {
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) 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() map('n', '<leader>hD', function()
gitsigns.diffthis '@' gitsigns.diffthis '@'
end, { desc = 'git [D]iff against last commit' }) end, {
desc = 'git [D]iff against last commit'
})
-- Toggles -- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) map('n', '<leader>tb', gitsigns.toggle_current_line_blame, {
map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) desc = '[T]oggle git show [b]lame line'
end, })
}, map('n', '<leader>tD', gitsigns.toggle_deleted, {
}, desc = '[T]oggle git show [D]eleted'
} })
end
}
}}

View File

@@ -1,9 +1,7 @@
return { return {{ -- Add indentation guides even on blank lines
{ -- Add indentation guides even on blank lines
'lukas-reineke/indent-blankline.nvim', 'lukas-reineke/indent-blankline.nvim',
-- Enable `lukas-reineke/indent-blankline.nvim` -- Enable `lukas-reineke/indent-blankline.nvim`
-- See `:help ibl` -- See `:help ibl`
main = 'ibl', main = 'ibl',
opts = {}, opts = {}
}, }}
}

View File

@@ -1,12 +1,10 @@
return { return {{ -- Linting
{ -- Linting
'mfussenegger/nvim-lint', 'mfussenegger/nvim-lint',
event = { 'BufReadPre', 'BufNewFile' }, event = {'BufReadPre', 'BufNewFile'},
config = function() config = function()
local lint = require 'lint' local lint = require 'lint'
lint.linters_by_ft = { lint.linters_by_ft = {
markdown = { 'markdownlint' }, markdown = {'markdownlint'}
} }
-- To allow other plugins to add linters to require('lint').linters_by_ft, -- To allow other plugins to add linters to require('lint').linters_by_ft,
@@ -43,13 +41,14 @@ return {
-- Create autocommand which carries out the actual linting -- Create autocommand which carries out the actual linting
-- on the specified events. -- on the specified events.
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) local lint_augroup = vim.api.nvim_create_augroup('lint', {
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { clear = true
})
vim.api.nvim_create_autocmd({'BufEnter', 'BufWritePost', 'InsertLeave'}, {
group = lint_augroup, group = lint_augroup,
callback = function() callback = function()
require('lint').try_lint() require('lint').try_lint()
end, end
}) })
end, end
}, }}
}

View File

@@ -1,25 +1,21 @@
-- Neo-tree is a Neovim plugin to browse the file system -- Neo-tree is a Neovim plugin to browse the file system
-- https://github.com/nvim-neo-tree/neo-tree.nvim -- https://github.com/nvim-neo-tree/neo-tree.nvim
return { return {
'nvim-neo-tree/neo-tree.nvim', 'nvim-neo-tree/neo-tree.nvim',
version = '*', version = '*',
dependencies = { dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'nvim-lua/plenary.nvim', 'MunifTanjim/nui.nvim'},
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'MunifTanjim/nui.nvim',
},
cmd = 'Neotree', cmd = 'Neotree',
keys = { keys = {{'\\', ':Neotree reveal<CR>', {
{ '\\', ':Neotree reveal<CR>', { desc = 'NeoTree reveal' } }, desc = 'NeoTree reveal'
}, }}},
opts = { opts = {
filesystem = { filesystem = {
window = { window = {
mappings = { mappings = {
['\\'] = 'close_window', ['\\'] = 'close_window'
}, }
}, }
}, }
}, }
} }

View File

@@ -1,11 +1,11 @@
backend = "glx"; backend = "glx"
glx-no-stencil = true; glx-no-stencil = true
glx-copy-from-front = false; glx-copy-from-front = false
# Opacity # Opacity
active-opacity = 1; active-opacity = 1
inactive-opacity = 1; inactive-opacity = 1
frame-opacity = 1; frame-opacity = 1
#inactive-opacity-override = false; #inactive-opacity-override = false;
#blur-background = false; #blur-background = false;
#blur-background-exclude = [ #blur-background-exclude = [
@@ -16,7 +16,7 @@ frame-opacity = 1;
#blur-strength = 8; #blur-strength = 8;
# Fading # Fading
fading = false; fading = false
#fade-delta = 2; #fade-delta = 2;
#no-fading-openclose = false; #no-fading-openclose = false;
@@ -27,8 +27,8 @@ fading = false;
#mark-ovredir-focused = true; #mark-ovredir-focused = true;
#detect-rounded-corners = true; #detect-rounded-corners = true;
#detect-clien-opacity = true; #detect-clien-opacity = true;
vsync = true; vsync = true
dbe = false; dbe = false
#unredir-if-possible = false; #unredir-if-possible = false;
#focus-exclude = [ ]; #focus-exclude = [ ];
#detect-transient = true; #detect-transient = true;
@@ -44,10 +44,10 @@ dbe = false;
# Window transparency # Window transparency
opacity-rule = [ opacity-rule = [
#"90:class_g = 'st'", #"90:class_g = 'st'",
]; ]
shadow = false; shadow = false
#shadow-radius = 12; #shadow-radius = 12;
#shadow-offset-x = -5; #shadow-offset-x = -5;
#shadow-offset-y = -5; #shadow-offset-y = -5;
@@ -58,4 +58,4 @@ shadow = false;
#corner-radius = 0; #corner-radius = 0;
xrender-sync-fence = true; xrender-sync-fence = true

View File

@@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css" />
<title>Homepage</title> <title>Homepage</title>
</head> </head>
<body> <body>
<div class="clock" id="clock"> <div class="clock" id="clock">
<span id="clock-text"></span> <span id="clock-text"></span>
</div> </div>
@@ -14,5 +14,5 @@
<span id="date-text"></span> <span id="date-text"></span>
</div> </div>
<script src="script.js"></script> <script src="script.js"></script>
</body> </body>
</html> </html>

View File

@@ -1,7 +1,7 @@
// Load the config.json file (using JavaScript vanilla) // Load the config.json file (using JavaScript vanilla)
let clock_text = document.getElementById('clock-text'); let clock_text = document.getElementById("clock-text");
let date_text = document.getElementById('date-text'); let date_text = document.getElementById("date-text");
displayTime(); displayTime();
setInterval(displayTime, 1000); setInterval(displayTime, 1000);
@@ -12,20 +12,28 @@ function displayTime() {
let date = new Date(); let date = new Date();
let hours = date.getHours(); let hours = date.getHours();
let minutes = date.getMinutes(); let minutes = date.getMinutes();
let ampm = hours >= 12 ? 'PM' : 'AM'; let ampm = hours >= 12 ? "PM" : "AM";
hours = hours % 12; hours = hours % 12;
hours = hours ? hours : 12; hours = hours ? hours : 12;
minutes = minutes < 10 ? '0'+minutes : minutes; minutes = minutes < 10 ? "0" + minutes : minutes;
let time = hours + ":" + minutes + " " + ampm; let time = hours + ":" + minutes + " " + ampm;
clock_text.innerHTML = time; clock_text.innerHTML = time;
} }
function displayDate() { function displayDate() {
let date = new Date(); let date = new Date();
let days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; let days = [
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
];
let day = days[date.getDay()]; let day = days[date.getDay()];
let dayNumber = date.getDate(); let dayNumber = date.getDate();
let month = date.toLocaleString('default', { month: 'long' }); let month = date.toLocaleString("default", { month: "long" });
let year = date.getFullYear(); let year = date.getFullYear();
if (dayNumber == 1 || dayNumber == 21 || dayNumber == 31) { if (dayNumber == 1 || dayNumber == 21 || dayNumber == 31) {
@@ -41,4 +49,3 @@ function displayDate() {
let dateText = day + ", " + dayNumber + " " + month + " " + year; let dateText = day + ", " + dayNumber + " " + month + " " + year;
date_text.innerHTML = dateText; date_text.innerHTML = dateText;
} }

View File

@@ -1,5 +1,8 @@
html, body { html,
font-family: "JetBrainsMono NF", system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; body {
font-family: "JetBrainsMono NF", system-ui, -apple-system, BlinkMacSystemFont,
"Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
sans-serif;
color: #ebdbb2; color: #ebdbb2;
text-align: center; text-align: center;
background: #282828; background: #282828;
@@ -16,4 +19,3 @@ html, body {
.date { .date {
font-size: 2rem; font-size: 2rem;
} }

View File

@@ -22,27 +22,27 @@ fi
# Update System # Update System
( (
auth apt-get update auth apt-get update
echo "20" echo "20"
echo "# Updating distro packages..." echo "# Updating distro packages..."
auth apt-get dist-upgrade -y auth apt-get dist-upgrade -y
echo "40" echo "40"
echo "# Updating installed packages..." echo "# Updating installed packages..."
auth apt-get upgrade -y auth apt-get upgrade -y
echo "60" echo "60"
echo "# Cleaning cache..." echo "# Cleaning cache..."
auth apt-get clean auth apt-get clean
echo "80" echo "80"
echo "# Removing unused dependencies..." echo "# Removing unused dependencies..."
auth apt-get autoremove -y auth apt-get autoremove -y
echo "100" echo "100"
) | ) |
zenity --progress --title="Update System" --text="Updating repositories..." --percentage=0 --no-cancel zenity --progress --title="Update System" --text="Updating repositories..." --percentage=0 --no-cancel
# Dotfiles # Dotfiles
zenity --question \ zenity --question \
--title="Dotfiles" \ --title="Dotfiles" \
--text="Apply Trude's configuration files?" --text="Apply Trude's configuration files?"
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
( (
@@ -54,7 +54,7 @@ if [[ $? == 0 ]]; then
cp -vrf config-files/* $HOME cp -vrf config-files/* $HOME
echo "50" echo "50"
echo "# Configure GNOME/GTK..." echo "# Configure GNOME/GTK..."
dconf load -f / < ./settings.dconf dconf load -f / <./settings.dconf
echo "60" echo "60"
echo "# Reloading font cache..." echo "# Reloading font cache..."
fc-cache -f fc-cache -f
@@ -65,8 +65,8 @@ fi
# Flatpak # Flatpak
zenity --question \ zenity --question \
--title="Install Apps" \ --title="Install Apps" \
--text="Enable Flatpak support?" --text="Enable Flatpak support?"
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
( (
@@ -94,8 +94,7 @@ options=(
FALSE "Install Tailscale" FALSE "Install Tailscale"
FALSE "Install Firefox + Adw theme" FALSE "Install Firefox + Adw theme"
) )
checkbox=$(zenity --list --checklist --height=500\ checkbox=$(zenity --list --checklist --height=500 --title="Install Apps" \
--title="Install Apps" \
--column="Select" \ --column="Select" \
--column="Tasks" "${options[@]}") --column="Tasks" "${options[@]}")
readarray -td '|' choices < <(printf '%s' "$checkbox") readarray -td '|' choices < <(printf '%s' "$checkbox")
@@ -207,7 +206,7 @@ if command -v flatpak; then
checkbox=$(zenity --list --checklist --width=800 --height=600 \ checkbox=$(zenity --list --checklist --width=800 --height=600 \
--title="Install Apps" \ --title="Install Apps" \
--column="Select" \ --column="Select" \
--column="App ID"\ --column="App ID" \
--column="App Name" "${options[@]}") --column="App Name" "${options[@]}")
readarray -td '|' choices < <(printf '%s' "$checkbox") readarray -td '|' choices < <(printf '%s' "$checkbox")

View File

@@ -1,6 +1,6 @@
for i in {0..255} ; do for i in {0..255}; do
printf "\x1b[48;5;%sm%3d\e[0m " "$i" "$i" printf "\x1b[48;5;%sm%3d\e[0m " "$i" "$i"
if (( i == 15 )) || (( i > 15 )) && (( (i-15) % 6 == 0 )); then if ((i == 15)) || ((i > 15)) && (((i - 15) % 6 == 0)); then
printf "\n"; printf "\n"
fi fi
done done