trude/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format code

Browse Source
This commit is contained in:
TrudeEH
2024-08-26 22:17:30 +01:00
parent d76d709a8d
commit 290ec9a403
15 changed files with 1074 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config-files/.bashrc
View File

@@ -1,5 +1,5 @@
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 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\$ "
extract() {
if [ -f $1 ]; then
@@ -40,9 +40,9 @@ hex2color(){
r=$(printf '0x%0.2s' "$hex")
g=$(printf '0x%0.2s' ${hex#??})
b=$(printf '0x%0.2s' ${hex#????})
printf '%03d' "$(( (r<75?0:(r-35)/40)*6*6 +
(g<75?0:(g-35)/40)*6 +
(b<75?0:(b-35)/40) + 16 ))"
printf '%03d' "$(((r < 75 ? 0 : (r - 35) / 40) * 6 * 6 + (\
g < 75 ? 0 : (g - 35) / 40) * 6 + (\
b < 75 ? 0 : (b - 35) / 40) + 16))"
}
color2hex() {
@@ -58,9 +58,12 @@ color2hex(){
c="$((((bas & 4) >> 2) * mul))"
printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c"
elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then
b=$(( (dec-16)%6 )); b=$(( b==0?0: b*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 ))
b=$(((dec - 16) % 6))
b=$((b == 0 ? 0 : b * 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"
else
gray=$(((dec - 232) * 10 + 8))
@@ -92,7 +95,7 @@ alias cpp='rsync -ah --progress'
set completion-ignore-case On
# 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
export OFLAGS="--ozone-platform-hint=auto"

1
config-files/.config/git/config
View File

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

453
config-files/.config/nvim/init.lua
View File

@@ -21,7 +21,11 @@ vim.opt.timeoutlen = 300
vim.opt.splitright = true
vim.opt.splitbelow = 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.cursorline = true
vim.opt.scrolloff = 10
@@ -34,10 +38,18 @@ vim.opt.hlsearch = true
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-- 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_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' })
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, {
desc = 'Go to previous [D]iagnostic message'
})
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
-- 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
-- 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.
-- Use CTRL+<hjkl> to switch between windows
--
-- 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-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' })
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', {
desc = 'Move focus to the left 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
-- 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()`
vim.api.nvim_create_autocmd('TextYankPost', {
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()
vim.highlight.on_yank()
end,
end
})
-- NOTE: Install `lazy.nvim` plugin manager
@@ -89,24 +113,33 @@ vim.opt.rtp:prepend(lazypath)
-- To update plugins you can run
-- :Lazy update
--
require('lazy').setup({
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
{ 'numToStr/Comment.nvim', opts = {} }, -- "gc" to comment visual regions/lines
require('lazy').setup({'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
{
'numToStr/Comment.nvim',
opts = {}
}, -- "gc" to comment visual regions/lines
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
'lewis6991/gitsigns.nvim',
opts = {
signs = {
add = { text = '+' },
change = { text = '~' },
delete = { text = '_' },
topdelete = { text = '‾' },
changedelete = { text = '~' },
add = {
text = '+'
},
change = {
text = '~'
},
delete = {
text = '_'
},
{ -- Useful plugin to show you pending keybinds.
topdelete = {
text = '‾'
},
changedelete = {
text = '~'
}
}
}
}, { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
config = function() -- This is the function that runs, AFTER loading
@@ -114,27 +147,47 @@ require('lazy').setup({
-- Document existing key chains
require('which-key').register {
['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
['<leader>d'] = { name = '[D]ocument', _ = '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' },
['<leader>c'] = {
name = '[C]ode',
_ = 'which_key_ignore'
},
['<leader>d'] = {
name = '[D]ocument',
_ = '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
require('which-key').register({
['<leader>h'] = { 'Git [H]unk' },
}, { mode = 'v' })
end,
},
{ -- Fuzzy Finder (files, lsp, etc)
['<leader>h'] = {'Git [H]unk'}
}, {
mode = 'v'
})
end
}, { -- Fuzzy Finder (files, lsp, etc)
'nvim-telescope/telescope.nvim',
event = 'VimEnter',
branch = '0.1.x',
dependencies = {
'nvim-lua/plenary.nvim',
dependencies = {'nvim-lua/plenary.nvim',
{ -- If encountering errors, see telescope-fzf-native README for installation instructions
'nvim-telescope/telescope-fzf-native.nvim',
@@ -146,13 +199,12 @@ require('lazy').setup({
-- installed and loaded.
cond = function()
return vim.fn.executable 'make' == 1
end,
},
{ 'nvim-telescope/telescope-ui-select.nvim' },
-- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
},
end
}, {'nvim-telescope/telescope-ui-select.nvim'}, -- Useful for getting pretty icons, but requires a Nerd Font.
{
'nvim-tree/nvim-web-devicons',
enabled = vim.g.have_nerd_font
}},
config = function()
-- Two important keymaps to use while in Telescope are:
-- - Insert mode: <c-/>
@@ -170,10 +222,8 @@ require('lazy').setup({
-- },
-- pickers = {}
extensions = {
['ui-select'] = {
require('telescope.themes').get_dropdown(),
},
},
['ui-select'] = {require('telescope.themes').get_dropdown()}
}
}
-- Enable Telescope extensions if they are installed
@@ -182,64 +232,98 @@ require('lazy').setup({
-- See `:help 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>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
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>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' })
vim.keymap.set('n', '<leader>sh', builtin.help_tags, {
desc = '[S]earch [H]elp'
})
vim.keymap.set('n', '<leader>sk', builtin.keymaps, {
desc = '[S]earch [K]eymaps'
})
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>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
vim.keymap.set('n', '<leader>/', function()
-- You can pass additional configuration to Telescope to change the theme, layout, etc.
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
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.
-- See `:help telescope.builtin.live_grep()` for information about particular keys
vim.keymap.set('n', '<leader>s/', function()
builtin.live_grep {
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
vim.keymap.set('n', '<leader>sn', function()
builtin.find_files { cwd = vim.fn.stdpath 'config' }
end, { desc = '[S]earch [N]eovim files' })
end,
},
{ -- NOTE: LSP Configuration & Plugins
builtin.find_files {
cwd = vim.fn.stdpath 'config'
}
end, {
desc = '[S]earch [N]eovim files'
})
end
}, { -- NOTE: LSP Configuration & Plugins
'neovim/nvim-lspconfig',
dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim
{ 'williamboman/mason.nvim', config = true },
'williamboman/mason-lspconfig.nvim',
'WhoIsSethDaniel/mason-tool-installer.nvim',
dependencies = { -- Automatically install LSPs and related tools to stdpath for Neovim
{
'williamboman/mason.nvim',
config = true
}, 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim',
-- Useful status updates for LSP.
-- `opts = {}` is the same as calling `require('fidget').setup({})`
{ 'j-hui/fidget.nvim', opts = {} },
-- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
{
'j-hui/fidget.nvim',
opts = {}
}, -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
-- used for completion, annotations and signatures of Neovim apis
{ 'folke/neodev.nvim', opts = {} },
},
{
'folke/neodev.nvim',
opts = {}
}},
config = function()
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)
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
-- 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).
local client = vim.lsp.get_client_by_id(event.data.client_id)
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', {
clear = false
})
vim.api.nvim_create_autocmd({'CursorHold', 'CursorHoldI'}, {
buffer = event.buf,
group = highlight_augroup,
callback = vim.lsp.buf.document_highlight,
callback = vim.lsp.buf.document_highlight
})
vim.api.nvim_create_autocmd({'CursorMoved', 'CursorMovedI'}, {
buffer = event.buf,
group = highlight_augroup,
callback = vim.lsp.buf.clear_references,
callback = vim.lsp.buf.clear_references
})
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)
vim.lsp.buf.clear_references()
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
end,
vim.api.nvim_clear_autocmds {
group = 'kickstart-lsp-highlight',
buffer = event2.buf
}
end
})
end
@@ -321,7 +412,7 @@ require('lazy').setup({
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
end, '[T]oggle Inlay [H]ints')
end
end,
end
})
-- LSP servers and clients are able to communicate to each other what features they support.
@@ -361,13 +452,13 @@ require('lazy').setup({
settings = {
Lua = {
completion = {
callSnippet = 'Replace',
},
callSnippet = 'Replace'
}
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } },
},
},
},
}
}
}
}
-- 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
-- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, {
'stylua', -- Used to format Lua code
vim.list_extend(ensure_installed, {'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 {
handlers = {
function(server_name)
handlers = {function(server_name)
local server = servers[server_name] or {}
-- This handles overriding only values explicitly passed
-- by the server configuration above. Useful when disabling
-- certain features of an LSP (for example, turning off formatting for tsserver)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
require('lspconfig')[server_name].setup(server)
end,
},
end}
}
end,
},
{ -- Autoformat
end
}, { -- Autoformat
'stevearc/conform.nvim',
lazy = false,
keys = {
{
keys = {{
'<leader>f',
function()
require('conform').format { async = true, lsp_fallback = true }
require('conform').format {
async = true,
lsp_fallback = true
}
end,
mode = '',
desc = '[F]ormat buffer',
},
},
desc = '[F]ormat buffer'
}},
opts = {
notify_on_error = false,
format_on_save = function(bufnr)
-- Disable "format_on_save lsp_fallback" for languages that don't
-- have a well standardized coding style. You can add additional
-- 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 {
timeout_ms = 500,
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype]
}
end,
formatters_by_ft = {
lua = { 'stylua' },
lua = {'stylua'}
-- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" },
--
-- You can use a sub-list to tell conform to run *until* a formatter
-- is found.
-- javascript = { { "prettierd", "prettier" } },
},
},
},
{ -- Autocompletion
}
}
}, { -- Autocompletion
'hrsh7th/nvim-cmp',
event = 'InsertEnter',
dependencies = {
-- Snippet Engine & its associated nvim-cmp source
dependencies = { -- Snippet Engine & its associated nvim-cmp source
{
'L3MON4D3/LuaSnip',
build = (function()
@@ -464,16 +553,11 @@ require('lazy').setup({
-- require('luasnip.loaders.from_vscode').lazy_load()
-- 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
-- into multiple repos for maintenance purposes.
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-path',
},
'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path'},
config = function()
-- See `:help cmp`
local cmp = require 'cmp'
@@ -484,9 +568,11 @@ require('lazy').setup({
snippet = {
expand = function(args)
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
-- chosen, you will need to read `:help ins-completion`
@@ -505,7 +591,9 @@ require('lazy').setup({
-- Accept ([y]es) the completion.
-- This will auto-import if your LSP supports it.
-- 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,
-- you can uncomment the following lines
@@ -535,21 +623,21 @@ require('lazy').setup({
if luasnip.locally_jumpable(-1) then
luasnip.jump(-1)
end
end, { 'i', 's' }),
end, {'i', 's'})
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'path' },
},
sources = {{
name = 'nvim_lsp'
}, {
name = 'luasnip'
}, {
name = 'path'
}}
}
end,
},
{ -- You can easily change to a different colorscheme.
end
}, { -- You can easily change to a different colorscheme.
-- Change the name of the colorscheme plugin below, and then
-- 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:
vim.cmd.hi 'Comment gui=none'
end,
},
-- Highlight todo, notes, etc in comments
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
{ -- Collection of various small independent plugins/modules
end
}, -- Highlight todo, notes, etc in comments
{
'folke/todo-comments.nvim',
event = 'VimEnter',
dependencies = {'nvim-lua/plenary.nvim'},
opts = {
signs = false
}
}, { -- Collection of various small independent plugins/modules
'echasnovski/mini.nvim',
config = function()
-- Better Around/Inside textobjects
@@ -579,7 +670,9 @@ require('lazy').setup({
-- - va) - [V]isually select [A]round [)]paren
-- - yinq - [Y]ank [I]nside [N]ext [']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.)
--
@@ -593,7 +686,9 @@ require('lazy').setup({
-- and try some other statusline plugin
local statusline = require 'mini.statusline'
-- 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
-- default behavior. For example, here we set the section for
@@ -605,9 +700,8 @@ require('lazy').setup({
-- ... and there is more!
-- Check out: https://github.com/echasnovski/mini.nvim
end,
},
{ -- Highlight, edit, and navigate code
end
}, { -- Highlight, edit, and navigate code
'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate',
opts = {
@@ -619,9 +713,12 @@ require('lazy').setup({
-- 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
-- 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)
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
@@ -637,13 +734,10 @@ require('lazy').setup({
-- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
-- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
end,
},
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
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
-- place them in the correct locations.
{
'windwp/nvim-autopairs',
event = 'InsertEnter',
@@ -655,32 +749,26 @@ require('lazy').setup({
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
local cmp = require 'cmp'
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
end,
},
{
end
}, {
'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',
},
},
},
},
},
-- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
['\\'] = 'close_window'
}
}
}
}
} -- 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.
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
@@ -689,7 +777,6 @@ require('lazy').setup({
-- require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint',
-- 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.
--
@@ -713,9 +800,9 @@ require('lazy').setup({
source = '📄',
start = '🚀',
task = '📌',
lazy = '💤 ',
},
},
lazy = '💤 '
}
}
})
-- The line beneath this is called `modeline`. See `:help modeline`

6
config-files/.config/nvim/lua/kickstart/health.lua
View File

@@ -3,9 +3,7 @@
-- 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))
@@ -48,5 +46,5 @@ return {
check_version()
check_external_reqs()
end,
end
}

72
config-files/.config/nvim/lua/kickstart/plugins/debug.lua
View File

@@ -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
}

79
config-files/.config/nvim/lua/kickstart/plugins/gitsigns.lua
View File

@@ -1,9 +1,7 @@
-- 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 {
{
return {{
'lewis6991/gitsigns.nvim',
opts = {
on_attach = function(bufnr)
@@ -18,44 +16,79 @@ return {
-- Navigation
map('n', ']c', function()
if vim.wo.diff then
vim.cmd.normal { ']c', bang = true }
vim.cmd.normal {
']c',
bang = true
}
else
gitsigns.nav_hunk 'next'
end
end, { desc = 'Jump to next git [c]hange' })
end, {
desc = 'Jump to next git [c]hange'
})
map('n', '[c', function()
if vim.wo.diff then
vim.cmd.normal { '[c', bang = true }
vim.cmd.normal {
'[c',
bang = true
}
else
gitsigns.nav_hunk 'prev'
end
end, { desc = 'Jump to previous git [c]hange' })
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' })
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' })
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>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' })
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,
},
},
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
}
}}

8
config-files/.config/nvim/lua/kickstart/plugins/indent_line.lua
View File

@@ -1,9 +1,7 @@
return {
{ -- Add indentation guides even on blank lines
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 = {},
},
}
opts = {}
}}

17
config-files/.config/nvim/lua/kickstart/plugins/lint.lua
View File

@@ -1,12 +1,10 @@
return {
{ -- Linting
return {{ -- Linting
'mfussenegger/nvim-lint',
event = {'BufReadPre', 'BufNewFile'},
config = function()
local lint = require 'lint'
lint.linters_by_ft = {
markdown = { 'markdownlint' },
markdown = {'markdownlint'}
}
-- 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
-- on the specified events.
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
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
})
end,
},
}
end
}}

24
config-files/.config/nvim/lua/kickstart/plugins/neo-tree.lua
View File

@@ -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'
}
}
}
}
}

24
config-files/.config/picom/picom.conf
View File

@@ -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;
@@ -45,9 +45,9 @@ dbe = false;
# Window transparency
opacity-rule = [
#"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

6
config-files/.homepage/index.html
View File

@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="style.css">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="style.css" />
<title>Homepage</title>
</head>
<body>

21
config-files/.homepage/script.js
View File

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

8
config-files/.homepage/style.css
View File

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

3
install.sh
View File

@@ -94,8 +94,7 @@ options=(
FALSE "Install Tailscale"
FALSE "Install Firefox + Adw theme"
)
checkbox=$(zenity --list --checklist --height=500\
--title="Install Apps" \
checkbox=$(zenity --list --checklist --height=500 --title="Install Apps" \
--column="Select" \
--column="Tasks" "${options[@]}")
readarray -td '|' choices < <(printf '%s' "$checkbox")

2
scripts/colors.sh
View File

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