foodogsquared/dotfiles
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/dotfiles.git synced 2025-01-31 04:57:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: reformat codebase

Browse Source
This commit is contained in:
Gabriel Arazas 2023-09-06 06:55:12 +08:00
parent 2655970a0a
commit 8b4084a972
9 changed files with 564 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nvim/init.lua
View File

@ -4,9 +4,9 @@
require("plugins") require("plugins")
require("lsp-user-config").setup() require("lsp-user-config").setup()
vim.g['mapleader'] = " " vim.g["mapleader"] = " "
vim.g['maplocalleader'] = "," vim.g["maplocalleader"] = ","
vim.g['syntax'] = true vim.g["syntax"] = true
-- Editor configuration -- Editor configuration
vim.opt.completeopt = "menuone,noselect" vim.opt.completeopt = "menuone,noselect"
@ -25,14 +25,14 @@ vim.opt_local.spell = true
vim.opt.smartindent = true vim.opt.smartindent = true
-- I have yet to solve how to do the following in Lua, lmao -- I have yet to solve how to do the following in Lua, lmao
vim.cmd "highlight clear SpellBad" vim.cmd("highlight clear SpellBad")
vim.cmd "highlight clear SpellLocal" vim.cmd("highlight clear SpellLocal")
vim.cmd "highlight clear SpellCap" vim.cmd("highlight clear SpellCap")
vim.cmd "highlight clear SpellRare" vim.cmd("highlight clear SpellRare")
vim.cmd "highlight Visual term=reverse cterm=reverse" vim.cmd("highlight Visual term=reverse cterm=reverse")
vim.cmd "colorscheme fds-theme" vim.cmd("colorscheme fds-theme")
-- Keybindings -- Keybindings
vim.keymap.set('n', '<leader>bd', ':bd<cr>', {}) vim.keymap.set("n", "<leader>bd", ":bd<cr>", {})
vim.keymap.set('i', 'jk', '<Esc>', {}) vim.keymap.set("i", "jk", "<Esc>", {})
vim.keymap.set('n', '<leader>hr', '<cmd>source $MYVIMRC<cr>', {}) vim.keymap.set("n", "<leader>hr", "<cmd>source $MYVIMRC<cr>", {})

16
nvim/lua/lsp-user-config.lua
View File

@ -5,14 +5,18 @@ function setup()
-- Use an on_attach function to only map the following keys -- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer -- after the language server attaches to the current buffer
local on_attach = function(client, bufnr) local on_attach = function(client, bufnr)
local function keymap_set(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end local function keymap_set(...)
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end vim.api.nvim_buf_set_keymap(bufnr, ...)
end
local function buf_set_option(...)
vim.api.nvim_buf_set_option(bufnr, ...)
end
-- Enable completion triggered by <c-x><c-o> -- Enable completion triggered by <c-x><c-o>
buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
-- Mappings. -- Mappings.
local opts = { noremap=true, silent=true } local opts = { noremap = true, silent = true }
-- See `:help vim.lsp.*` for documentation on any of the below functions -- See `:help vim.lsp.*` for documentation on any of the below functions
keymap_set("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts) keymap_set("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
@ -39,12 +43,12 @@ function setup()
capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities) capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
-- Enable the following language servers -- Enable the following language servers
local servers = { "clangd", "rust_analyzer", "pyright", "tsserver", "rnix", "sumneko_lua" } local servers = { "clangd", "rust_analyzer", "pyright", "tsserver", "rnix", "lua_ls" }
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { nvim_lsp[lsp].setup({
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
} })
end end
end end

562
nvim/lua/lush_theme/fds-theme.lua
View File

@ -1,5 +1,5 @@
-- CREDITS: pwntester/nautilus.nvim -- CREDITS: pwntester/nautilus.nvim
local lush = require('lush') local lush = require("lush")
local hsl = lush.hsluv local hsl = lush.hsluv
--[[ --[[
@ -19,24 +19,25 @@ local hsl = lush.hsluv
base0D - Functions, Methods, Attribute IDs, Headings base0D - Functions, Methods, Attribute IDs, Headings
base0E - Keywords, Storage, Selector, Markup Italic, Diff Changed base0E - Keywords, Storage, Selector, Markup Italic, Diff Changed
base0F - Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?> base0F - Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
]]-- ]]
--
local base00 = hsl('#2b221f') local base00 = hsl("#2b221f")
local base01 = hsl('#412c26') local base01 = hsl("#412c26")
local base02 = hsl('#5c362c') local base02 = hsl("#5c362c")
local base03 = hsl('#a45b43') local base03 = hsl("#a45b43")
local base04 = hsl('#e1bcb2') local base04 = hsl("#e1bcb2")
local base05 = hsl('#f5ecea') local base05 = hsl("#f5ecea")
local base06 = hsl('#fefefe') local base06 = hsl("#fefefe")
local base07 = hsl('#eb8a65') local base07 = hsl("#eb8a65")
local base08 = hsl('#d03e68') local base08 = hsl("#d03e68")
local base09 = hsl('#df937a') local base09 = hsl("#df937a")
local base0A = hsl('#afa644') local base0A = hsl("#afa644")
local base0B = hsl('#85b26e') local base0B = hsl("#85b26e")
local base0C = hsl('#eb914a') local base0C = hsl("#eb914a")
local base0D = hsl('#c67f62') local base0D = hsl("#c67f62")
local base0E = hsl('#8b7ab9') local base0E = hsl("#8b7ab9")
local base0F = hsl('#7f3F83') local base0F = hsl("#7f3F83")
--[[ --[[
@ -66,332 +67,331 @@ vim.g.terminal_color_foreground = base0E.hex
return lush(function() return lush(function()
return { return {
Normal { fg = base05, bg = base00 }, Normal({ fg = base05, bg = base00 }),
NormalFloat { fg = Normal.fg.saturate(15).lighten(5), bg = Normal.bg.saturate(15).lighten(5) }, NormalFloat({ fg = Normal.fg.saturate(15).lighten(5), bg = Normal.bg.saturate(15).lighten(5) }),
Bold { gui = 'bold' }, Bold({ gui = "bold" }),
Debug { fg = base08 }, Debug({ fg = base08 }),
Directory { fg = base0D }, Directory({ fg = base0D }),
Error { fg = base01, bg = base08 }, Error({ fg = base01, bg = base08 }),
ErrorMsg { fg = base08 }, ErrorMsg({ fg = base08 }),
Exception { fg = base08 }, Exception({ fg = base08 }),
FoldColumn { fg = base03 }, FoldColumn({ fg = base03 }),
Folded { fg = base03, bg = base01 }, Folded({ fg = base03, bg = base01 }),
Italic { gui = 'italic' }, Italic({ gui = "italic" }),
Macro { fg = base08 }, Macro({ fg = base08 }),
ModeMsg { fg = base0B }, ModeMsg({ fg = base0B }),
MoreMsg { fg = base0B }, MoreMsg({ fg = base0B }),
Question { fg = base0D }, Question({ fg = base0D }),
Search { fg = base00, bg = base04 }, Search({ fg = base00, bg = base04 }),
IncSearch { fg = base00, bg = base09 }, IncSearch({ fg = base00, bg = base09 }),
Substitute { fg = base01, bg = base0A }, Substitute({ fg = base01, bg = base0A }),
SpecialKey { fg = base03 }, SpecialKey({ fg = base03 }),
TooLong { fg = base08 }, TooLong({ fg = base08 }),
Underlined { fg = base08 }, Underlined({ fg = base08 }),
WarningMsg { fg = base08 }, WarningMsg({ fg = base08 }),
WildMenu { fg = base08, bg = base0A }, WildMenu({ fg = base08, bg = base0A }),
Title { fg = base0D }, Title({ fg = base0D }),
Conceal { fg = base0D }, Conceal({ fg = base0D }),
Cursor { fg = base00, bg = base05 }, Cursor({ fg = base00, bg = base05 }),
NonText { fg = base03 }, NonText({ fg = base03 }),
LineNr { fg = base02.lighten(25), bg = base00 }, LineNr({ fg = base02.lighten(25), bg = base00 }),
LineNrNC { fg = base02.lighten(25), bg = base01 }, LineNrNC({ fg = base02.lighten(25), bg = base01 }),
SignColumn { fg = base01.lighten(40) }, SignColumn({ fg = base01.lighten(40) }),
StatusLine { fg = base02, bg = base01.darken(60) }, StatusLine({ fg = base02, bg = base01.darken(60) }),
StatusLineNC { fg = base02, bg = base01.darken(30) }, StatusLineNC({ fg = base02, bg = base01.darken(30) }),
VertSplit { fg = base02, bg = base00 }, VertSplit({ fg = base02, bg = base00 }),
ColorColumn { fg = base01.lighten(25), bg = base01.darken(25) }, ColorColumn({ fg = base01.lighten(25), bg = base01.darken(25) }),
CursorLine { bg = base01.saturate(-5).darken(15) }, CursorLine({ bg = base01.saturate(-5).darken(15) }),
CursorColumn { CursorLine }, CursorColumn({ CursorLine }),
CursorLineNr { fg = base0A, CursorColumn }, CursorLineNr({ fg = base0A, CursorColumn }),
Visual { CursorColumn, fg = base03.lighten(15) }, Visual({ CursorColumn, fg = base03.lighten(15) }),
VisualNOS { fg = base08 }, VisualNOS({ fg = base08 }),
QuickFixLine { bg = base00 }, QuickFixLine({ bg = base00 }),
QFFileName { fg = base0A }, QFFileName({ fg = base0A }),
QFLineNr { fg = base04 }, QFLineNr({ fg = base04 }),
PMenu { fg = base05, bg = base01 }, PMenu({ fg = base05, bg = base01 }),
PMenuSel { fg = base01, bg = base05 }, PMenuSel({ fg = base01, bg = base05 }),
TabLineSel { fg = base00, bg = base0A }, TabLineSel({ fg = base00, bg = base0A }),
TabLine { fg = base03, bg = base00.darken(15) }, TabLine({ fg = base03, bg = base00.darken(15) }),
TabLineFill { fg = base03, bg = base00.darken(25) }, TabLineFill({ fg = base03, bg = base00.darken(25) }),
EndOfBuffer { fg = base01.lighten(20), bg = base01.darken(20) }, EndOfBuffer({ fg = base01.lighten(20), bg = base01.darken(20) }),
-- Standard syntax highlighting -- Standard syntax highlighting
Boolean { fg = base09 }, Boolean({ fg = base09 }),
Character { fg = base08 }, Character({ fg = base08 }),
Comment { fg = base03, gui = "italic" }, Comment({ fg = base03, gui = "italic" }),
Conditional { fg = base0E }, Conditional({ fg = base0E }),
Constant { fg = base09 }, Constant({ fg = base09 }),
Define { fg = base0E }, Define({ fg = base0E }),
Delimiter { fg = base0F.lighten(10) }, Delimiter({ fg = base0F.lighten(10) }),
Float { fg = base09 }, Float({ fg = base09 }),
Function { fg = base0D }, Function({ fg = base0D }),
Identifier { fg = base0A }, Identifier({ fg = base0A }),
Include { fg = base0D }, Include({ fg = base0D }),
Keyword { fg = base0E }, Keyword({ fg = base0E }),
Label { fg = base0A }, Label({ fg = base0A }),
Number { fg = base03 }, Number({ fg = base03 }),
Operator { fg = base03 }, Operator({ fg = base03 }),
PreProc { fg = base0A }, PreProc({ fg = base0A }),
Repeat { fg = base0A }, Repeat({ fg = base0A }),
Special { fg = base0C }, Special({ fg = base0C }),
SpecialChar { fg = base0F.lighten(15).saturate(10) }, SpecialChar({ fg = base0F.lighten(15).saturate(10) }),
Statement { fg = base08 }, Statement({ fg = base08 }),
StorageClass { fg = base0A }, StorageClass({ fg = base0A }),
String { fg = base0B }, String({ fg = base0B }),
Structure { fg = base0E }, Structure({ fg = base0E }),
Tag { fg = base0A }, Tag({ fg = base0A }),
Todo { fg = base0A, bg = base01 }, Todo({ fg = base0A, bg = base01 }),
Type { fg = base0A }, Type({ fg = base0A }),
Typedef { fg = base0A }, Typedef({ fg = base0A }),
--- ---
-- Extra definitions -- Extra definitions
--- ---
-- Help -- Help
HelpDoc { fg = base05, bg = base0D, gui = 'bold,italic' }, HelpDoc({ fg = base05, bg = base0D, gui = "bold,italic" }),
HelpIgnore { fg = base0B, gui = 'bold,italic' }, HelpIgnore({ fg = base0B, gui = "bold,italic" }),
-- C highlighting -- C highlighting
cOperator { fg = base0C }, cOperator({ fg = base0C }),
cPreCondit { fg = base0E }, cPreCondit({ fg = base0E }),
-- C# highlighting -- C# highlighting
csClass { fg = base0A }, csClass({ fg = base0A }),
csAttribute { fg = base0A }, csAttribute({ fg = base0A }),
csModifier { fg = base0E }, csModifier({ fg = base0E }),
csType { fg = base08 }, csType({ fg = base08 }),
csUnspecifiedStatement { fg = base0D }, csUnspecifiedStatement({ fg = base0D }),
csContextualStatement { fg = base0E }, csContextualStatement({ fg = base0E }),
csNewDecleration { fg = base08 }, csNewDecleration({ fg = base08 }),
-- CSS highlighting -- CSS highlighting
cssBraces { fg = base05 }, cssBraces({ fg = base05 }),
cssClassName { fg = base0E }, cssClassName({ fg = base0E }),
cssColor { fg = base0C }, cssColor({ fg = base0C }),
-- Diff highlighting -- Diff highlighting
DiffAdd { fg = base0B, bg = base0B.darken(80) }, DiffAdd({ fg = base0B, bg = base0B.darken(80) }),
DiffAdded { fg = base0B, bg = base0B.darken(80) }, DiffAdded({ fg = base0B, bg = base0B.darken(80) }),
DiffNewFile { fg = base0B, bg = base0B.darken(80) }, DiffNewFile({ fg = base0B, bg = base0B.darken(80) }),
DiffDelete { fg = base08, bg = base08.darken(80) }, DiffDelete({ fg = base08, bg = base08.darken(80) }),
DiffRemoved { fg = base08, bg = base08.darken(80) }, DiffRemoved({ fg = base08, bg = base08.darken(80) }),
DiffChange { fg = base03, bg = base03.darken(60) }, DiffChange({ fg = base03, bg = base03.darken(60) }),
DiffFile { fg = base03, bg = base03.darken(60) }, DiffFile({ fg = base03, bg = base03.darken(60) }),
DiffLine { fg = base03, bg = base03.darken(60) }, DiffLine({ fg = base03, bg = base03.darken(60) }),
DiffText { fg = base03, bg = base03.darken(60) }, DiffText({ fg = base03, bg = base03.darken(60) }),
-- Git highlighting -- Git highlighting
gitcommitOverflow { fg = base08 }, gitcommitOverflow({ fg = base08 }),
gitcommitSummary { fg = base0B }, gitcommitSummary({ fg = base0B }),
gitcommitComment { fg = base03 }, gitcommitComment({ fg = base03 }),
gitcommitUntracked { fg = base03 }, gitcommitUntracked({ fg = base03 }),
gitcommitDiscarded { fg = base03 }, gitcommitDiscarded({ fg = base03 }),
gitcommitSelected { fg = base03 }, gitcommitSelected({ fg = base03 }),
gitcommitHeader { fg = base0E }, gitcommitHeader({ fg = base0E }),
gitcommitSelectedType { fg = base0D }, gitcommitSelectedType({ fg = base0D }),
gitcommitUnmergedType { fg = base0D }, gitcommitUnmergedType({ fg = base0D }),
gitcommitDiscardedType { fg = base0D }, gitcommitDiscardedType({ fg = base0D }),
gitcommitBranch { fg = base09, gui = 'bold' }, gitcommitBranch({ fg = base09, gui = "bold" }),
gitcommitUntrackedFile { fg = base0A }, gitcommitUntrackedFile({ fg = base0A }),
gitcommitUnmergedFile { fg = base08, gui = 'bold' }, gitcommitUnmergedFile({ fg = base08, gui = "bold" }),
gitcommitDiscardedFile { fg = base08, gui = 'bold' }, gitcommitDiscardedFile({ fg = base08, gui = "bold" }),
gitcommitSelectedFile { fg = base0B, gui = 'bold' }, gitcommitSelectedFile({ fg = base0B, gui = "bold" }),
-- GitGutter highlighting -- GitGutter highlighting
GitGutterAdd { fg = base0B, bg = base01 }, GitGutterAdd({ fg = base0B, bg = base01 }),
GitGutterChange { fg = base0D, bg = base01 }, GitGutterChange({ fg = base0D, bg = base01 }),
GitGutterDelete { fg = base08, bg = base01 }, GitGutterDelete({ fg = base08, bg = base01 }),
GitGutterChangeDelete { fg = base0E, bg = base01 }, GitGutterChangeDelete({ fg = base0E, bg = base01 }),
-- HTML highlighting -- HTML highlighting
htmlBold { fg = base0A }, htmlBold({ fg = base0A }),
htmlItalic { fg = base0E }, htmlItalic({ fg = base0E }),
htmlEndTag { fg = base05 }, htmlEndTag({ fg = base05 }),
htmlTag { fg = base05 }, htmlTag({ fg = base05 }),
-- JavaScript highlighting -- JavaScript highlighting
javaScript { fg = base05 }, javaScript({ fg = base05 }),
javaScriptBraces { fg = base05 }, javaScriptBraces({ fg = base05 }),
javaScriptNumber { fg = base09 }, javaScriptNumber({ fg = base09 }),
-- pangloss/vim-javascript highlighting -- pangloss/vim-javascript highlighting
jsOperator { fg = base0D }, jsOperator({ fg = base0D }),
jsStatement { fg = base0E }, jsStatement({ fg = base0E }),
jsReturn { fg = base0E }, jsReturn({ fg = base0E }),
jsThis { fg = base08 }, jsThis({ fg = base08 }),
jsClassDefinition { fg = base0A }, jsClassDefinition({ fg = base0A }),
jsFunction { fg = base0E }, jsFunction({ fg = base0E }),
jsFuncName { fg = base0D }, jsFuncName({ fg = base0D }),
jsFuncCall { fg = base0D }, jsFuncCall({ fg = base0D }),
jsClassFuncName { fg = base0D }, jsClassFuncName({ fg = base0D }),
jsClassMethodType { fg = base0E }, jsClassMethodType({ fg = base0E }),
jsRegexpString { fg = base0C }, jsRegexpString({ fg = base0C }),
jsGlobalObjects { fg = base0A }, jsGlobalObjects({ fg = base0A }),
jsGlobalNodeObjects { fg = base0A }, jsGlobalNodeObjects({ fg = base0A }),
jsExceptions { fg = base0A }, jsExceptions({ fg = base0A }),
jsBuiltins { fg = base0A }, jsBuiltins({ fg = base0A }),
-- Mail highlighting -- Mail highlighting
mailQuoted1 { fg = base0A }, mailQuoted1({ fg = base0A }),
mailQuoted2 { fg = base0B }, mailQuoted2({ fg = base0B }),
mailQuoted3 { fg = base0E }, mailQuoted3({ fg = base0E }),
mailQuoted4 { fg = base0C }, mailQuoted4({ fg = base0C }),
mailQuoted5 { fg = base0D }, mailQuoted5({ fg = base0D }),
mailQuoted6 { fg = base0A }, mailQuoted6({ fg = base0A }),
mailURL { fg = base0D }, mailURL({ fg = base0D }),
mailEmail { fg = base0D }, mailEmail({ fg = base0D }),
-- Markdown highlighting -- Markdown highlighting
markdownh1 { fg = base0D, gui = 'bold' }, markdownh1({ fg = base0D, gui = "bold" }),
markdownh2 { fg = base0D, gui = 'bold' }, markdownh2({ fg = base0D, gui = "bold" }),
markdownh3 { fg = base0D, gui = 'bold' }, markdownh3({ fg = base0D, gui = "bold" }),
markdownh4 { fg = base0D, gui = 'bold' }, markdownh4({ fg = base0D, gui = "bold" }),
markdownh5 { fg = base0D, gui = 'bold' }, markdownh5({ fg = base0D, gui = "bold" }),
markdownh6 { fg = base0A, gui = 'bold' }, markdownh6({ fg = base0A, gui = "bold" }),
markdownRule { fg = markdownh2.bg, gui = 'bold' }, markdownRule({ fg = markdownh2.bg, gui = "bold" }),
markdownItalic { fg = base05, gui = 'italic' }, markdownItalic({ fg = base05, gui = "italic" }),
markdownBold { fg = base05, gui = 'bold' }, markdownBold({ fg = base05, gui = "bold" }),
markdownBoldItalic { fg = base05, gui = 'bold,italic' }, markdownBoldItalic({ fg = base05, gui = "bold,italic" }),
markdownCodeDelimiter { fg = base0B, gui = 'bold' }, markdownCodeDelimiter({ fg = base0B, gui = "bold" }),
markdownCode { fg = base07, bg = base00 }, markdownCode({ fg = base07, bg = base00 }),
markdownCodeBlock { fg = base0B }, markdownCodeBlock({ fg = base0B }),
markdownFootnoteDefinition { fg = base05, gui = 'italic' }, markdownFootnoteDefinition({ fg = base05, gui = "italic" }),
markdownListMarker { fg = base05, gui = 'bold' }, markdownListMarker({ fg = base05, gui = "bold" }),
markdownLineBreak { fg = base08, gui = 'underline' }, markdownLineBreak({ fg = base08, gui = "underline" }),
markdownError { fg = base05, bg = base00 }, markdownError({ fg = base05, bg = base00 }),
markdownHeadingDelimiter { fg = base0D }, markdownHeadingDelimiter({ fg = base0D }),
markdownUrl { fg = base09 }, markdownUrl({ fg = base09 }),
markdownFootnote { fg = base0E, gui = 'italic' }, markdownFootnote({ fg = base0E, gui = "italic" }),
markdownBlockquote { fg = base0C, gui = 'bold' }, markdownBlockquote({ fg = base0C, gui = "bold" }),
markdownLinkText { fg = base08, gui = 'italic' }, markdownLinkText({ fg = base08, gui = "italic" }),
-- NERDTree highlighting -- NERDTree highlighting
NERDTreeDirSlash { fg = base0D }, NERDTreeDirSlash({ fg = base0D }),
NERDTreeExecFile { fg = base05 }, NERDTreeExecFile({ fg = base05 }),
-- PHP highlighting -- PHP highlighting
phpMemberSelector { fg = base05 }, phpMemberSelector({ fg = base05 }),
phpComparison { fg = base05 }, phpComparison({ fg = base05 }),
phpParent { fg = base05 }, phpParent({ fg = base05 }),
phpMethodsVar { fg = base0C }, phpMethodsVar({ fg = base0C }),
-- Python highlighting -- Python highlighting
pythonOperator { fg = base0E }, pythonOperator({ fg = base0E }),
pythonRepeat { fg = base0E }, pythonRepeat({ fg = base0E }),
pythonInclude { fg = base0E }, pythonInclude({ fg = base0E }),
pythonStatement { fg = base0E }, pythonStatement({ fg = base0E }),
-- Ruby highlighting -- Ruby highlighting
rubyAttribute { fg = base0D }, rubyAttribute({ fg = base0D }),
rubyConstant { fg = base0A }, rubyConstant({ fg = base0A }),
rubyInterpolationDelimiter { fg = base0F }, rubyInterpolationDelimiter({ fg = base0F }),
rubyRegexp { fg = base0C }, rubyRegexp({ fg = base0C }),
rubySymbol { fg = base0B }, rubySymbol({ fg = base0B }),
rubyStringDelimiter { fg = base0B }, rubyStringDelimiter({ fg = base0B }),
-- SASS highlighting -- SASS highlighting
sassidChar { fg = base08 }, sassidChar({ fg = base08 }),
sassClassChar { fg = base09 }, sassClassChar({ fg = base09 }),
sassInclude { fg = base0E }, sassInclude({ fg = base0E }),
sassMixing { fg = base0E }, sassMixing({ fg = base0E }),
sassMixinName { fg = base0D }, sassMixinName({ fg = base0D }),
-- Spelling highlighting -- Spelling highlighting
SpellBad { gui = 'undercurl' }, --, base08) SpellBad({ gui = "undercurl" }), --, base08)
SpellLocal { gui = 'undercurl' }, --, base0C) SpellLocal({ gui = "undercurl" }), --, base0C)
SpellCap { gui = 'undercurl' }, --, base0D) SpellCap({ gui = "undercurl" }), --, base0D)
SpellRare { gui = 'undercurl' }, --, base0E) SpellRare({ gui = "undercurl" }), --, base0E)
-- Startify highlighting -- Startify highlighting
StartifyBracket { fg = base03 }, StartifyBracket({ fg = base03 }),
StartifyFile { fg = base07 }, StartifyFile({ fg = base07 }),
StartifyFooter { fg = base03 }, StartifyFooter({ fg = base03 }),
StartifyHeader { fg = base0B }, StartifyHeader({ fg = base0B }),
StartifyNumber { fg = base09 }, StartifyNumber({ fg = base09 }),
StartifyPath { fg = base03 }, StartifyPath({ fg = base03 }),
StartifySection { fg = base0E }, StartifySection({ fg = base0E }),
StartifySelect { fg = base0C }, StartifySelect({ fg = base0C }),
StartifySlash { fg = base03 }, StartifySlash({ fg = base03 }),
StartifySpecial { fg = base03 }, StartifySpecial({ fg = base03 }),
-- Java highlighting -- Java highlighting
javaOperator { fg = base0D }, javaOperator({ fg = base0D }),
-- Telescope highlighting -- Telescope highlighting
TelescopeNormal { fg = base05, bg = base01 }, TelescopeNormal({ fg = base05, bg = base01 }),
TelescopeBorder { fg = base00, bg = base01 }, TelescopeBorder({ fg = base00, bg = base01 }),
TelescopePromptPrefix { fg = base0A, bg = base01 }, TelescopePromptPrefix({ fg = base0A, bg = base01 }),
TelescopeMatching { fg = base0D, bg = base01 }, TelescopeMatching({ fg = base0D, bg = base01 }),
TelescopeSelection { fg = base0A, bg = base01 }, TelescopeSelection({ fg = base0A, bg = base01 }),
TelescopeSelectionCaret { fg = base0A, bg = base01 }, TelescopeSelectionCaret({ fg = base0A, bg = base01 }),
--LSP highlighting --LSP highlighting
LspDiagnosticsDefaultError { fg = base08 }, LspDiagnosticsDefaultError({ fg = base08 }),
LspDiagnosticsDefaultWarning { fg = base09 }, LspDiagnosticsDefaultWarning({ fg = base09 }),
LspDiagnosticsDefaultHint { fg = base0A }, LspDiagnosticsDefaultHint({ fg = base0A }),
LspDiagnosticsDefaultInformation { fg = base0B }, LspDiagnosticsDefaultInformation({ fg = base0B }),
-- XML highlighting -- XML highlighting
xmlTagName { fg = base0D }, xmlTagName({ fg = base0D }),
xmlCdatastart { fg = base0A }, xmlCdatastart({ fg = base0A }),
xmlEndTag { fg = xmlTagName.bg }, xmlEndTag({ fg = xmlTagName.bg }),
xmlCdataCdata { fg = xmlCdatastart.bg }, xmlCdataCdata({ fg = xmlCdatastart.bg }),
-- MatchParen -- MatchParen
MatchParen { fg = base07, bg = base08 }, MatchParen({ fg = base07, bg = base08 }),
-- CodeQL -- CodeQL
CodeqlAstFocus { fg = base00, bg = base03 }, CodeqlAstFocus({ fg = base00, bg = base03 }),
-- TreeSitter -- TreeSitter
TSError { fg = Error.bg, gui = 'bold' }, TSError({ fg = Error.bg, gui = "bold" }),
TSPunctDelimiter { fg = base05 }, TSPunctDelimiter({ fg = base05 }),
TSPunctBracket { fg = base05 }, TSPunctBracket({ fg = base05 }),
TSConstant { fg = Constant.fg }, TSConstant({ fg = Constant.fg }),
TSConstBuiltin { fg = Constant.fg }, TSConstBuiltin({ fg = Constant.fg }),
TSConstMacro { fg = Constant.fg }, TSConstMacro({ fg = Constant.fg }),
TSString { fg = String.fg }, TSString({ fg = String.fg }),
TSStringRegex { fg = base03 }, TSStringRegex({ fg = base03 }),
TSStringEscape { fg = base03 }, TSStringEscape({ fg = base03 }),
TSCharacter { fg = Character.fg }, TSCharacter({ fg = Character.fg }),
TSNumber { fg = Number.fg }, TSNumber({ fg = Number.fg }),
TSBoolean { fg = Boolean.fg }, TSBoolean({ fg = Boolean.fg }),
TSFloat { fg = Number.fg }, TSFloat({ fg = Number.fg }),
TSFunction { fg = Function.fg }, TSFunction({ fg = Function.fg }),
TSFuncBuiltin { fg = Function.fg }, TSFuncBuiltin({ fg = Function.fg }),
TSFuncMacro { fg = Function.fg }, TSFuncMacro({ fg = Function.fg }),
TSParameter { fg = base0D }, TSParameter({ fg = base0D }),
TSConstructor { fg = base0E }, TSConstructor({ fg = base0E }),
TSKeywordFunction { fg = base0E }, TSKeywordFunction({ fg = base0E }),
TSLiteral { fg = base04, gui = 'bold' }, TSLiteral({ fg = base04, gui = "bold" }),
TSVariable { fg = base03.lighten(25) }, TSVariable({ fg = base03.lighten(25) }),
TSVariableBuiltin { fg = base0E }, TSVariableBuiltin({ fg = base0E }),
TSParameterReference { fg = TSParameter.fg }, TSParameterReference({ fg = TSParameter.fg }),
TSMethod { fg = Function.fg }, TSMethod({ fg = Function.fg }),
TSConditional { fg = Conditional.fg }, TSConditional({ fg = Conditional.fg }),
TSRepeat { fg = Repeat.fg }, TSRepeat({ fg = Repeat.fg }),
TSLabel { fg = Label.fg }, TSLabel({ fg = Label.fg }),
TSOperator { fg = Operator.fg }, TSOperator({ fg = Operator.fg }),
TSKeyword { fg = Keyword.fg }, TSKeyword({ fg = Keyword.fg }),
TSException { fg = Exception.fg }, TSException({ fg = Exception.fg }),
TSType { fg = Type.fg }, TSType({ fg = Type.fg }),
TSTypeBuiltin { fg = Type.fg }, TSTypeBuiltin({ fg = Type.fg }),
TSStructure { fg = Structure.fg }, TSStructure({ fg = Structure.fg }),
TSInclude { fg = Include.fg }, TSInclude({ fg = Include.fg }),
TSAnnotation { fg = base03 }, TSAnnotation({ fg = base03 }),
TSStrong { fg = base05, bg = base00, gui = 'bold' }, TSStrong({ fg = base05, bg = base00, gui = "bold" }),
TSTitle { fg = base0D }, TSTitle({ fg = base0D }),
-- Diff highlighting -- Diff highlighting
GitSignsAdd { fg = base0B, }, GitSignsAdd({ fg = base0B }),
GitSignsDelete { fg = base08 }, GitSignsDelete({ fg = base08 }),
GitSignsChange { fg = base03 }, GitSignsChange({ fg = base03 }),
-- Indent-Blank-Lines -- Indent-Blank-Lines
IndentGuide { fg = base01, bg = base05 }, IndentGuide({ fg = base01, bg = base05 }),
} }
end) end)

155
nvim/lua/plugins.lua
View File

@ -5,7 +5,7 @@
local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
packer_bootstrap = vim.fn.system({"git", "clone", "https://github.com/wbthomason/packer.nvim", install_path}) packer_bootstrap = vim.fn.system({ "git", "clone", "https://github.com/wbthomason/packer.nvim", install_path })
end end
local packer = require("packer") local packer = require("packer")
@ -14,46 +14,46 @@ local util = require("packer.util")
return packer.startup({ return packer.startup({
function(use) function(use)
-- Let the package manager manage itself. -- Let the package manager manage itself.
use { "wbthomason/packer.nvim" } use({ "wbthomason/packer.nvim" })
-- Custom color themes! -- Custom color themes!
use { "rktjmp/lush.nvim" } use({ "rktjmp/lush.nvim" })
-- EditorConfig plugin -- EditorConfig plugin
use { "editorconfig/editorconfig-vim" } use({ "editorconfig/editorconfig-vim" })
-- Colorize common color strings -- Colorize common color strings
use { use({
"norcalli/nvim-colorizer.lua", "norcalli/nvim-colorizer.lua",
config = function() config = function()
require("colorizer").setup() require("colorizer").setup()
end end,
} })
-- Snippets engine. -- Snippets engine.
-- A must have for me. -- A must have for me.
use { use({
"L3MON4D3/LuaSnip", "L3MON4D3/LuaSnip",
requires = { requires = {
"rafamadriz/friendly-snippets", "rafamadriz/friendly-snippets",
}, },
config = function () config = function()
require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_lua").lazy_load() require("luasnip.loaders.from_lua").lazy_load()
local ls = require("luasnip") local ls = require("luasnip")
local types = require("luasnip.util.types") local types = require("luasnip.util.types")
ls.config.set_config { ls.config.set_config({
history = true, history = true,
update_events = "TextChanged,TextChangedI", update_events = "TextChanged,TextChangedI",
ext_opts = { ext_opts = {
[types.choiceNode] = { [types.choiceNode] = {
active = { active = {
virt_text = { {"<- Current choice", "Comment"} }, virt_text = { { "<- Current choice", "Comment" } },
}, },
}, },
}, },
} })
vim.keymap.set({ "i", "s" }, "<c-j>", function() vim.keymap.set({ "i", "s" }, "<c-j>", function()
if ls.jumpable(1) then if ls.jumpable(1) then
@ -77,52 +77,72 @@ return packer.startup({
require("luasnip.extras.select_choice")() require("luasnip.extras.select_choice")()
end) end)
end, end,
} })
-- Fuzzy finder of lists -- Fuzzy finder of lists
use { use({
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
requires = { requires = {
{"nvim-lua/popup.nvim"}, { "nvim-lua/popup.nvim" },
{"nvim-lua/plenary.nvim"}, { "nvim-lua/plenary.nvim" },
{"nvim-telescope/telescope-project.nvim"} { "nvim-telescope/telescope-project.nvim" },
}, },
config = function() config = function()
-- Telescope setup -- Telescope setup
require("telescope").setup { require("telescope").setup({
extensions = { extensions = {
project = { project = {
base_dirs = { base_dirs = {
{"~/library/projects/software", max_depth = 2}, { "~/library/projects/software", max_depth = 2 },
{"~/library/projects/packages"}, { "~/library/projects/packages" },
{"~/library/writings"}, { "~/library/writings" },
}, },
}, },
}, },
} })
require("telescope").load_extension("project") require("telescope").load_extension("project")
vim.keymap.set('n', '<leader>ff', '<cmd>lua require("telescope.builtin").find_files({ hidden = true })<cr>', { noremap = true }) vim.keymap.set(
vim.keymap.set('n', '<leader>fF', '<cmd>lua require("telescope.builtin").find_files({ cwd = require("telescope.utils").buffer_dir(), hidden = true })<cr>', { noremap = true }) "n",
vim.keymap.set('n', '<leader>fg', '<cmd>lua require("telescope.builtin").grep_string()<cr>', { noremap = true }) "<leader>ff",
vim.keymap.set('n', '<leader>fG', '<cmd>lua require("telescope.builtin").live_grep()<cr>', { noremap = true }) '<cmd>lua require("telescope.builtin").find_files({ hidden = true })<cr>',
vim.keymap.set('n', '<leader>fb', '<cmd>lua require("telescope.builtin").buffers()<cr>', { noremap = true }) { noremap = true }
vim.keymap.set('n', '<leader>fh', '<cmd>lua require("telescope.builtin").help_tags()<cr>', { noremap = true }) )
vim.keymap.set('n', '<leader>ft', '<cmd>lua require("telescope.builtin").treesitter()<cr>', { noremap = true }) vim.keymap.set(
vim.keymap.set('n', '<leader>fb', '<cmd>lua require("telescope.builtin").buffers()<cr>', { noremap = true }) "n",
vim.keymap.set('n', '<leader>fr', '<cmd>lua require("telescope.builtin").oldfiles()<cr>', { noremap = true }) "<leader>fF",
vim.keymap.set('n', '<leader>fR', '<cmd>lua require("telescope.builtin").oldfiles({ only_cwd = true })<cr>', { noremap = true }) '<cmd>lua require("telescope.builtin").find_files({ cwd = require("telescope.utils").buffer_dir(), hidden = true })<cr>',
vim.keymap.set('n', '<leader>fA', '<cmd>lua require("telescope.builtin").resume()<cr>', { noremap = true }) { noremap = true }
)
vim.keymap.set("n", "<leader>fg", '<cmd>lua require("telescope.builtin").grep_string()<cr>', { noremap = true })
vim.keymap.set("n", "<leader>fG", '<cmd>lua require("telescope.builtin").live_grep()<cr>', { noremap = true })
vim.keymap.set("n", "<leader>fb", '<cmd>lua require("telescope.builtin").buffers()<cr>', { noremap = true })
vim.keymap.set("n", "<leader>fh", '<cmd>lua require("telescope.builtin").help_tags()<cr>', { noremap = true })
vim.keymap.set("n", "<leader>ft", '<cmd>lua require("telescope.builtin").treesitter()<cr>', { noremap = true })
vim.keymap.set("n", "<leader>fb", '<cmd>lua require("telescope.builtin").buffers()<cr>', { noremap = true })
vim.keymap.set("n", "<leader>fr", '<cmd>lua require("telescope.builtin").oldfiles()<cr>', { noremap = true })
vim.keymap.set(
"n",
"<leader>fR",
'<cmd>lua require("telescope.builtin").oldfiles({ only_cwd = true })<cr>',
{ noremap = true }
)
vim.keymap.set("n", "<leader>fA", '<cmd>lua require("telescope.builtin").resume()<cr>', { noremap = true })
-- Ekeymap.set -- Ekeymap.set
vim.keymap.set('n', '<leader>fp', '<cmd>lua require("telescope").extensions.project.project({})<cr>', { noremap = true }) vim.keymap.set(
"n",
"<leader>fp",
'<cmd>lua require("telescope").extensions.project.project({})<cr>',
{ noremap = true }
)
end, end,
} })
-- Marks in ~~steroids~~ coconut oil -- Marks in ~~steroids~~ coconut oil
use { use({
"ThePrimeagen/harpoon", "ThePrimeagen/harpoon",
config = function() config = function()
vim.keymap.set("n", "<leader>fm", "<cmd>lua require('harpoon.mark').add_file()<cr>", {}) vim.keymap.set("n", "<leader>fm", "<cmd>lua require('harpoon.mark').add_file()<cr>", {})
@ -133,12 +153,12 @@ return packer.startup({
require("telescope").load_extension("harpoon") require("telescope").load_extension("harpoon")
end end
end, end,
requires = { {"nvim-lua/plenary.nvim"} } requires = { { "nvim-lua/plenary.nvim" } },
} })
-- A completion engine. -- A completion engine.
-- nvim-cmp is mostly explicit by making the configuration process manual unlike bigger plugins like CoC -- nvim-cmp is mostly explicit by making the configuration process manual unlike bigger plugins like CoC
use { use({
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
requires = { requires = {
"hrsh7th/cmp-buffer", "hrsh7th/cmp-buffer",
@ -152,7 +172,7 @@ return packer.startup({
cmp.setup({ cmp.setup({
snippet = { snippet = {
expand = function (args) expand = function(args)
ls.lsp_expand(args.body) ls.lsp_expand(args.body)
end, end,
}, },
@ -178,25 +198,25 @@ return packer.startup({
}), }),
}, },
}) })
end end,
} })
-- A linting engine, a DAP client, and an LSP client entered into a bar. -- A linting engine, a DAP client, and an LSP client entered into a bar.
use { use({
"dense-analysis/ale", "dense-analysis/ale",
config = function() config = function()
vim.g.ale_disable_lsp = 1 vim.g.ale_disable_lsp = 1
end, end,
} })
use { "neovim/nvim-lspconfig" } use({ "neovim/nvim-lspconfig" })
use { "mfussenegger/nvim-dap" } use({ "mfussenegger/nvim-dap" })
use { "puremourning/vimspector" } use({ "puremourning/vimspector" })
-- tree-sitter -- tree-sitter
use { use({
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
requires = { requires = {
"nvim-treesitter/nvim-treesitter-textobjects" "nvim-treesitter/nvim-treesitter-textobjects",
}, },
run = ":TSUpdate", run = ":TSUpdate",
config = function() config = function()
@ -241,38 +261,41 @@ return packer.startup({
}, },
}, },
}) })
end end,
} })
-- One of the most popular plugins. -- One of the most popular plugins.
-- Allows to create more substantial status bars. -- Allows to create more substantial status bars.
use { "vim-airline/vim-airline" } use({ "vim-airline/vim-airline" })
-- Fuzzy finder for finding files freely and fastly. -- Fuzzy finder for finding files freely and fastly.
use { use({
"junegunn/fzf", "junegunn/fzf",
requires = "junegunn/fzf.vim" requires = "junegunn/fzf.vim",
} })
-- Enable visuals for addition/deletion of lines in the gutter (side) similar to Visual Studio Code. -- Enable visuals for addition/deletion of lines in the gutter (side) similar to Visual Studio Code.
use { "airblade/vim-gitgutter" } use({ "airblade/vim-gitgutter" })
-- Language plugins. -- Language plugins.
use { "LnL7/vim-nix" } -- Nix use({ "LnL7/vim-nix" }) -- Nix
use { "vmchale/dhall-vim" } -- Dhall use({ "vmchale/dhall-vim" }) -- Dhall
use { "ziglang/zig.vim" } -- Zig use({ "ziglang/zig.vim" }) -- Zig
use({ "RRethy/nvim-base16" })
-- Use Neovim even inside of browsers. -- Use Neovim even inside of browsers.
use { use({
"glacambre/firenvim", "glacambre/firenvim",
run = function() run = function()
vim.fn["firenvim#install"](0) vim.fn["firenvim#install"](0)
end end,
} })
use { "https://gitlab.com/HiPhish/guile.vim.git" } use({ "https://gitlab.com/HiPhish/guile.vim.git" })
use { "Olical/conjure", } use({ "Olical/conjure" })
end, end,
config = { config = {
compile_path = util.join_paths(vim.fn.stdpath('data'), 'site', 'after', 'plugin', 'packer_compiled.lua'), compile_path = util.join_paths(vim.fn.stdpath("data"), "site", "after", "plugin", "packer_compiled.lua"),
}}) },
})

13
nvim/luasnippets/all.lua
View File

@ -1,20 +1,20 @@
return { return {
s( s(
"today", "today",
f(function () f(function()
return os.date "%F" return os.date("%F")
end) end)
), ),
s( s(
"retrieve", "retrieve",
f(function () f(function()
return string.format("(retrieved %s)", os.date("%F")) return string.format("(retrieved %s)", os.date("%F"))
end) end)
), ),
s( s(
{ trig = "reldate (-?%d+) \"(.+)\"", regTrig = true }, { trig = 'reldate (-?%d+) "(.+)"', regTrig = true },
f(function(_, snip) f(function(_, snip)
-- The point is in number of days. -- The point is in number of days.
local point = 60 * 60 * 24 * snip.captures[1] local point = 60 * 60 * 24 * snip.captures[1]
@ -24,10 +24,7 @@ return {
end) end)
), ),
s( s("#!", fmt("#!{}", i(1, "/usr/bin/env bash"))),
"#!",
fmt("#!{}", i(1, "/usr/bin/env bash"))
),
parse("ie", "(i.e., $1)"), parse("ie", "(i.e., $1)"),
parse("eg", "(e.g., $1)"), parse("eg", "(e.g., $1)"),

121
nvim/luasnippets/asciidoc.lua
View File

@ -7,83 +7,102 @@ return {
parse("it", "__$1__"), parse("it", "__$1__"),
parse("sp", "^$1^"), parse("sp", "^$1^"),
parse("sb", "~$1~"), parse("sb", "~$1~"),
s("tt", s(
fmt( "tt",
"{}{}{}", fmt("{}{}{}", {
{ c(1, { t("`"), t("`+") }),
c(1, { t "`", t "`+" }),
i(2, "TEXT"), i(2, "TEXT"),
rep(1), rep(1),
})), })
),
parse("foot", "footnote:[$1]"), parse("foot", "footnote:[$1]"),
s("link", s(
fmt( "link",
"link:{}[{}]", fmt("link:{}[{}]", {
{
i(1, "LINK"), i(1, "LINK"),
rep(1), rep(1),
})), })
),
parse("var", ":$1: $2"), parse("var", ":$1: $2"),
parse("audio", "audio::$1[$2]"), parse("audio", "audio::$1[$2]"),
parse("video", "video::$1[$2]"), parse("video", "video::$1[$2]"),
s("img", s(
fmt([[ "img",
fmt(
[[
.{} .{}
image::{}[{}, {}] image::{}[{}, {}]
{} {}
]], { ]],
{
i(1, "CAPTION"), i(1, "CAPTION"),
i(2, "IMAGE_PATH"), i(2, "IMAGE_PATH"),
i(3, "ALT_TEXT"), i(3, "ALT_TEXT"),
i(4, "width=100%,height=100%"), i(4, "width=100%,height=100%"),
i(0), i(0),
})), }
)
),
s("fmt", s(
"fmt",
fmt("{}{}{}", { fmt("{}{}{}", {
c(1, { c(1, {
t "**", t("**"),
t "__", t("__"),
t "`", t("`"),
}), }),
i(2), i(2),
rep(1), rep(1),
})), })
),
s("dt", s(
fmt([[ "dt",
fmt(
[[
{}:: {}::
{} {}
]], { ]],
{
i(1, "TERM"), i(1, "TERM"),
i(2, "DEFINITION"), i(2, "DEFINITION"),
})), }
)
),
s("src", s(
fmt([[ "src",
fmt(
[[
[source, {}] [source, {}]
---- ----
{} {}
---- ----
{} {}
]], { ]],
{
i(1, "LANGUAGE"), i(1, "LANGUAGE"),
i(2, "CODE"), i(2, "CODE"),
i(0), i(0),
})), }
)
),
s( s(
{ trig = "h(%d)", regTrig = true }, { trig = "h(%d)", regTrig = true },
fmt([[ fmt(
[[
{} {} {} {}
{} {}
{} {}
]], { ]],
{
f(function(_, snip) f(function(_, snip)
local level = max_asciidoc_header(snip.captures[1]) local level = max_asciidoc_header(snip.captures[1])
return string.rep("=", level) return string.rep("=", level)
@ -91,55 +110,61 @@ return {
i(1, "CHAPTER"), i(1, "CHAPTER"),
d(2, function(_, snip) d(2, function(_, snip)
local nodes = {} local nodes = {}
table.insert(nodes, t "") table.insert(nodes, t(""))
local level = max_asciidoc_header(snip.captures[1]) local level = max_asciidoc_header(snip.captures[1])
if level == 1 then if level == 1 then
table.insert(nodes, t ":toc:") table.insert(nodes, t(":toc:"))
end end
local parent = c(1, nodes) local parent = c(1, nodes)
if level > 1 then if level > 1 then
parent = t "" parent = t("")
end end
return sn(nil, parent) return sn(nil, parent)
end, {}), end, {}),
i(0), i(0),
}) }
)
), ),
s( s(
"admon", "admon",
fmt("{}: {}", { fmt("{}: {}", {
c(1, { c(1, {
t "NOTE", t("NOTE"),
t "TIP", t("TIP"),
t "IMPORTANT", t("IMPORTANT"),
t "CAUTION", t("CAUTION"),
t "WARNING", t("WARNING"),
}), }),
i(0), i(0),
})), })
),
s( s(
"admonB", "admonB",
fmt([[ fmt(
[[
[{}] [{}]
==== ====
{} {}
==== ====
{} {}
]], { ]],
{
c(1, { c(1, {
t "NOTE", t("NOTE"),
t "TIP", t("TIP"),
t "IMPORTANT", t("IMPORTANT"),
t "CAUTION", t("CAUTION"),
t "WARNING", t("WARNING"),
}), }),
i(2, "BODY"), i(2, "BODY"),
i(0), i(0),
})), }
)
),
} }

4
wezterm/config/appearance.lua
View File

@ -32,10 +32,10 @@ function module.apply_to_config(config)
config.font_size = 19 config.font_size = 19
-- Thankfully, wezterm can detect fontconfig aliases. -- Thankfully, wezterm can detect fontconfig aliases.
config.font = wezterm.font_with_fallback { config.font = wezterm.font_with_fallback({
"monospace", "monospace",
"Noto Color Emoji", "Noto Color Emoji",
} })
-- Desaturate any inactive panes. -- Desaturate any inactive panes.
config.inactive_pane_hsb = { config.inactive_pane_hsb = {

4
wezterm/config/events.lua
View File

@ -29,11 +29,11 @@ wezterm.on("view-last-output-in-new-pane", function(_, pane)
f:close() f:close()
end end
pane:split { pane:split({
args = { os.getenv("PAGER") or "less", tmpname }, args = { os.getenv("PAGER") or "less", tmpname },
direction = "Bottom", direction = "Bottom",
domain = { DomainName = "local" }, domain = { DomainName = "local" },
} })
-- Without this, it would quickly close all of the process immediately. -- Without this, it would quickly close all of the process immediately.
wezterm.sleep_ms(1000) wezterm.sleep_ms(1000)

46
wezterm/config/keys.lua
View File

@ -26,7 +26,7 @@ function module.apply_to_config(config)
{ {
event = { Down = { streak = 1, button = "Left" } }, event = { Down = { streak = 1, button = "Left" } },
action = act.ExtendSelectionToMouseCursor "Word", action = act.ExtendSelectionToMouseCursor("Word"),
mods = keymod, mods = keymod,
}, },
} }
@ -34,8 +34,8 @@ function module.apply_to_config(config)
-- It also makes use of key tables which is defined after. -- It also makes use of key tables which is defined after.
config.keys = { config.keys = {
-- Clipboard -- Clipboard
{ key = "c", mods = keymod, action = act.CopyTo "Clipboard" }, { key = "c", mods = keymod, action = act.CopyTo("Clipboard") },
{ key = "v", mods = keymod, action = act.PasteFrom "Clipboard" }, { key = "v", mods = keymod, action = act.PasteFrom("Clipboard") },
-- Font resize. -- Font resize.
{ key = "+", mods = keymod, action = act.IncreaseFontSize }, { key = "+", mods = keymod, action = act.IncreaseFontSize },
@ -54,22 +54,22 @@ function module.apply_to_config(config)
{ {
key = "p", key = "p",
mods = "LEADER", mods = "LEADER",
action = act.ActivateKeyTable { action = act.ActivateKeyTable({
name = "pane_navigation", name = "pane_navigation",
timeout_milliseconds = 1000, timeout_milliseconds = 1000,
replace_current = true, replace_current = true,
one_shot = true, one_shot = true,
}, }),
}, },
{ {
key = "r", key = "r",
mods = "LEADER", mods = "LEADER",
action = act.ActivateKeyTable { action = act.ActivateKeyTable({
name = "resize_pane", name = "resize_pane",
replace_current = true, replace_current = true,
one_shot = false, one_shot = false,
}, }),
}, },
{ key = "h", mods = keymod, action = act.ActivatePaneDirection("Left") }, { key = "h", mods = keymod, action = act.ActivatePaneDirection("Left") },
@ -98,10 +98,10 @@ function module.apply_to_config(config)
one_shot = true, one_shot = true,
}), }),
}, },
{ mods = alt_keymod, key = "h", action = act.ActivateTabRelative(-1), }, { mods = alt_keymod, key = "h", action = act.ActivateTabRelative(-1) },
{ mods = alt_keymod, key = "j", action = act.ActivateTab(-1), }, { mods = alt_keymod, key = "j", action = act.ActivateTab(-1) },
{ mods = alt_keymod, key = "k", action = act.ActivateTab(0), }, { mods = alt_keymod, key = "k", action = act.ActivateTab(0) },
{ mods = alt_keymod, key = "l", action = act.ActivateTabRelative(1), }, { mods = alt_keymod, key = "l", action = act.ActivateTabRelative(1) },
{ key = "t", mods = keymod, action = act.ShowTabNavigator }, { key = "t", mods = keymod, action = act.ShowTabNavigator },
{ key = "d", mods = alt_keymod, action = act.CloseCurrentTab({ confirm = false }) }, { key = "d", mods = alt_keymod, action = act.CloseCurrentTab({ confirm = false }) },
@ -113,63 +113,63 @@ function module.apply_to_config(config)
name = "hints", name = "hints",
timeout_milliseconds = 1000, timeout_milliseconds = 1000,
replace_current = true, replace_current = true,
one_shot = true one_shot = true,
}), }),
}, },
{ key = "r", mods = keymod, action = act.ReloadConfiguration }, { key = "r", mods = keymod, action = act.ReloadConfiguration },
{ key = "o", mods = keymod, action = act.ShowDebugOverlay }, { key = "o", mods = keymod, action = act.ShowDebugOverlay },
{ key = "p", mods = keymod, action = act.ActivateCommandPalette }, { key = "p", mods = keymod, action = act.ActivateCommandPalette },
{ key = "e", mods = keymod, action = act.EmitEvent "view-last-output-in-new-pane" }, { key = "e", mods = keymod, action = act.EmitEvent("view-last-output-in-new-pane") },
-- Selection -- Selection
{ key = "Space", mods = "LEADER", action = act.QuickSelect }, { key = "Space", mods = "LEADER", action = act.QuickSelect },
{ key = "a", mods = keymod, action = act.QuickSelect }, { key = "a", mods = keymod, action = act.QuickSelect },
{ key = "s", mods = keymod, action = act.Search { CaseSensitiveString = "" } }, { key = "s", mods = keymod, action = act.Search({ CaseSensitiveString = "" }) },
} }
config.key_tables = { config.key_tables = {
hints = { hints = {
{ key = "g", action = act.Search { Regex = "[0-9a-f]{6,}" } }, { key = "g", action = act.Search({ Regex = "[0-9a-f]{6,}" }) },
{ {
key = "h", key = "h",
action = act.QuickSelectArgs { action = act.QuickSelectArgs({
patterns = { patterns = {
"[0-9a-f]{7,40}", -- SHA1 hashes, usually used for Git. "[0-9a-f]{7,40}", -- SHA1 hashes, usually used for Git.
"[0-9a-f]{7,64}", -- SHA256 hashes, used often for getting hashes for Guix packaging. "[0-9a-f]{7,64}", -- SHA256 hashes, used often for getting hashes for Guix packaging.
"sha256-[[:alpha:][:digit:]-=+/?]{44}", -- SHA256 hashes in Base64, used often in getting hashes for Nix packaging. "sha256-[[:alpha:][:digit:]-=+/?]{44}", -- SHA256 hashes in Base64, used often in getting hashes for Nix packaging.
"[[:alpha:][:digit:]-=+/?]{44,64}", "[[:alpha:][:digit:]-=+/?]{44,64}",
}, },
}, }),
}, },
-- Basically the equivalent of `kitty hints word`. -- Basically the equivalent of `kitty hints word`.
{ {
key = "w", key = "w",
action = act.QuickSelectArgs { action = act.QuickSelectArgs({
patterns = { patterns = {
"\\S+", "\\S+",
}, },
}, }),
}, },
-- The equivalent to `kitty hints line`. -- The equivalent to `kitty hints line`.
{ {
key = "l", key = "l",
action = act.QuickSelectArgs { action = act.QuickSelectArgs({
patterns = { patterns = {
".+", ".+",
}, },
}, }),
}, },
{ key = "Space", action = act.QuickSelect }, { key = "Space", action = act.QuickSelect },
{ key = "s", action = act.QuickSelect }, { key = "s", action = act.QuickSelect },
{ key = "f", action = act.Search { CaseSensitiveString = "" } }, { key = "f", action = act.Search({ CaseSensitiveString = "" }) },
}, },
pane_navigation = { pane_navigation = {
{ key = "d", action = act.CloseCurrentPane { confirm = false } }, { key = "d", action = act.CloseCurrentPane({ confirm = false }) },
{ key = "h", action = act.ActivatePaneDirection("Left") }, { key = "h", action = act.ActivatePaneDirection("Left") },
{ key = "j", action = act.ActivatePaneDirection("Down") }, { key = "j", action = act.ActivatePaneDirection("Down") },
{ key = "k", action = act.ActivatePaneDirection("Up") }, { key = "k", action = act.ActivatePaneDirection("Up") },