From 9c6c2e8eed4cbe6def2fec5310fd5c147689b3fe Mon Sep 17 00:00:00 2001 From: Fabio Scotto di Santolo Date: Wed, 25 Jun 2025 21:36:04 +0200 Subject: [PATCH] Added Vim configuration and keychain in ZSH config --- README.md | 1 + nvim/.config/nvim/lazy-lock.json | 28 ++-- vim/.vim/colors/catppuccin_frappe.vim | 163 +++++++++++++++++++++++ vim/.vim/colors/catppuccin_latte.vim | 163 +++++++++++++++++++++++ vim/.vim/colors/catppuccin_macchiato.vim | 163 +++++++++++++++++++++++ vim/.vim/colors/catppuccin_mocha.vim | 163 +++++++++++++++++++++++ vim/.vimrc | 2 + zsh/.zshrc | 1 + 8 files changed, 670 insertions(+), 14 deletions(-) create mode 100644 vim/.vim/colors/catppuccin_frappe.vim create mode 100644 vim/.vim/colors/catppuccin_latte.vim create mode 100644 vim/.vim/colors/catppuccin_macchiato.vim create mode 100644 vim/.vim/colors/catppuccin_mocha.vim create mode 100644 vim/.vimrc diff --git a/README.md b/README.md index f9da915..4b0ba8d 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Below is a list of the software: - PowerShell - Starship - Tmux +- Vim - Yazi - Zoxide - Zsh diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index a92614d..f341d8a 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,17 +1,17 @@ { "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, - "SchemaStore.nvim": { "branch": "main", "commit": "e702367b99c0763e3e5580998aa6d323c6cdb65e" }, + "SchemaStore.nvim": { "branch": "main", "commit": "45fd6c22f30487586c771072dc8c5230931e4c7b" }, "alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" }, - "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, + "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, - "conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" }, + "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" }, "crates.nvim": { "branch": "main", "commit": "5d8b1bef686db0fabe5f1bb593744b617e8f1405" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "39c55811772d61751d8e5206e8746e0e3ec95f64" }, - "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" }, - "grug-far.nvim": { "branch": "main", "commit": "c36f5f9b53f12a60aa53d42282e8ae78aef72178" }, + "fzf-lua": { "branch": "main", "commit": "f21fecf43eeae285583042fb8cf462cf7cb8d05e" }, + "gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" }, + "grug-far.nvim": { "branch": "main", "commit": "1a85fba510c6086b396be5a3c7c77ab32829d7df" }, "hydra.nvim": { "branch": "main", "commit": "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, @@ -19,24 +19,24 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.ai": { "branch": "main", "commit": "95e9d77e58bdf633c4d0c6b8c72892dd10eada51" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, + "mini.ai": { "branch": "main", "commit": "d172ada7b0281044a06cb9a625a862553c457b6f" }, + "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, + "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" }, "multicursors.nvim": { "branch": "main", "commit": "72225ea9e4443c3f4b9df91d0193e07c4ee8d382" }, "neo-tree.nvim": { "branch": "main", "commit": "e01ca7de8e6dbc6118bcb12c4cbe1f88162a337f" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-lint": { "branch": "master", "commit": "cc26ae6a620298bb3f33b0e0681f99a10ae57781" }, - "nvim-lspconfig": { "branch": "master", "commit": "a182334ba933e58240c2c45e6ae2d9c7ae313e00" }, + "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" }, + "nvim-lspconfig": { "branch": "master", "commit": "99d3a0f26bfe402f45257c1398287aef252cbe2d" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "refactoring.nvim": { "branch": "master", "commit": "9cd0186ffe76fe6abc64c0aafb775c8f776ab5ee" }, - "rustaceanvim": { "branch": "master", "commit": "a0c8e9698ef90bcfdf42806a38bf55b612b65b18" }, + "rustaceanvim": { "branch": "master", "commit": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "7bf55ed0ff5be182ad3301cff266581fc1c56cce" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, diff --git a/vim/.vim/colors/catppuccin_frappe.vim b/vim/.vim/colors/catppuccin_frappe.vim new file mode 100644 index 0000000..cee8743 --- /dev/null +++ b/vim/.vim/colors/catppuccin_frappe.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_frappe.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_frappe' +set t_Co=256 + +let s:rosewater = "#F2D5CF" +let s:flamingo = "#EEBEBE" +let s:pink = "#F4B8E4" +let s:mauve = "#CA9EE6" +let s:red = "#E78284" +let s:maroon = "#EA999C" +let s:peach = "#EF9F76" +let s:yellow = "#E5C890" +let s:green = "#A6D189" +let s:teal = "#81C8BE" +let s:sky = "#99D1DB" +let s:sapphire = "#85C1DC" +let s:blue = "#8CAAEE" +let s:lavender = "#BABBF1" + +let s:text = "#C6D0F5" +let s:subtext1 = "#B5BFE2" +let s:subtext0 = "#A5ADCE" +let s:overlay2 = "#949CBB" +let s:overlay1 = "#838BA7" +let s:overlay0 = "#737994" +let s:surface2 = "#626880" +let s:surface1 = "#51576D" +let s:surface0 = "#414559" + +let s:base = "#303446" +let s:mantle = "#292C3C" +let s:crust = "#232634" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1, + \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0 +\ ] diff --git a/vim/.vim/colors/catppuccin_latte.vim b/vim/.vim/colors/catppuccin_latte.vim new file mode 100644 index 0000000..3a4a809 --- /dev/null +++ b/vim/.vim/colors/catppuccin_latte.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_latte.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_latte' +set t_Co=256 + +let s:rosewater = "#DC8A78" +let s:flamingo = "#DD7878" +let s:pink = "#EA76CB" +let s:mauve = "#8839EF" +let s:red = "#D20F39" +let s:maroon = "#E64553" +let s:peach = "#FE640B" +let s:yellow = "#DF8E1D" +let s:green = "#40A02B" +let s:teal = "#179299" +let s:sky = "#04A5E5" +let s:sapphire = "#209FB5" +let s:blue = "#1E66F5" +let s:lavender = "#7287FD" + +let s:text = "#4C4F69" +let s:subtext1 = "#5C5F77" +let s:subtext0 = "#6C6F85" +let s:overlay2 = "#7C7F93" +let s:overlay1 = "#8C8FA1" +let s:overlay0 = "#9CA0B0" +let s:surface2 = "#ACB0BE" +let s:surface1 = "#BCC0CC" +let s:surface0 = "#CCD0DA" + +let s:base = "#EFF1F5" +let s:mantle = "#E6E9EF" +let s:crust = "#DCE0E8" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:subtext1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:surface2, + \ s:subtext0, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:surface1 +\ ] diff --git a/vim/.vim/colors/catppuccin_macchiato.vim b/vim/.vim/colors/catppuccin_macchiato.vim new file mode 100644 index 0000000..f82f3f3 --- /dev/null +++ b/vim/.vim/colors/catppuccin_macchiato.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_macchiato.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_macchiato' +set t_Co=256 + +let s:rosewater = "#F4DBD6" +let s:flamingo = "#F0C6C6" +let s:pink = "#F5BDE6" +let s:mauve = "#C6A0F6" +let s:red = "#ED8796" +let s:maroon = "#EE99A0" +let s:peach = "#F5A97F" +let s:yellow = "#EED49F" +let s:green = "#A6DA95" +let s:teal = "#8BD5CA" +let s:sky = "#91D7E3" +let s:sapphire = "#7DC4E4" +let s:blue = "#8AADF4" +let s:lavender = "#B7BDF8" + +let s:text = "#CAD3F5" +let s:subtext1 = "#B8C0E0" +let s:subtext0 = "#A5ADCB" +let s:overlay2 = "#939AB7" +let s:overlay1 = "#8087A2" +let s:overlay0 = "#6E738D" +let s:surface2 = "#5B6078" +let s:surface1 = "#494D64" +let s:surface0 = "#363A4F" + +let s:base = "#24273A" +let s:mantle = "#1E2030" +let s:crust = "#181926" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1, + \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0 +\ ] diff --git a/vim/.vim/colors/catppuccin_mocha.vim b/vim/.vim/colors/catppuccin_mocha.vim new file mode 100644 index 0000000..6bdf5e4 --- /dev/null +++ b/vim/.vim/colors/catppuccin_mocha.vim @@ -0,0 +1,163 @@ +" Name: catppuccin_mocha.vim + +set background=dark +hi clear + +if exists('syntax on') + syntax reset +endif + +let g:colors_name='catppuccin_mocha' +set t_Co=256 + +let s:rosewater = "#F5E0DC" +let s:flamingo = "#F2CDCD" +let s:pink = "#F5C2E7" +let s:mauve = "#CBA6F7" +let s:red = "#F38BA8" +let s:maroon = "#EBA0AC" +let s:peach = "#FAB387" +let s:yellow = "#F9E2AF" +let s:green = "#A6E3A1" +let s:teal = "#94E2D5" +let s:sky = "#89DCEB" +let s:sapphire = "#74C7EC" +let s:blue = "#89B4FA" +let s:lavender = "#B4BEFE" + +let s:text = "#CDD6F4" +let s:subtext1 = "#BAC2DE" +let s:subtext0 = "#A6ADC8" +let s:overlay2 = "#9399B2" +let s:overlay1 = "#7F849C" +let s:overlay0 = "#6C7086" +let s:surface2 = "#585B70" +let s:surface1 = "#45475A" +let s:surface0 = "#313244" + +let s:base = "#1E1E2E" +let s:mantle = "#181825" +let s:crust = "#11111B" + +function! s:hi(group, guisp, guifg, guibg, gui, cterm) + let cmd = "" + if a:guisp != "" + let cmd = cmd . " guisp=" . a:guisp + endif + if a:guifg != "" + let cmd = cmd . " guifg=" . a:guifg + endif + if a:guibg != "" + let cmd = cmd . " guibg=" . a:guibg + endif + if a:gui != "" + let cmd = cmd . " gui=" . a:gui + endif + if a:cterm != "" + let cmd = cmd . " cterm=" . a:cterm + endif + if cmd != "" + exec "hi " . a:group . cmd + endif +endfunction + + + +call s:hi("Normal", "NONE", s:text, s:base, "NONE", "NONE") +call s:hi("Visual", "NONE", "NONE", s:surface1,"bold", "bold") +call s:hi("Conceal", "NONE", s:overlay1, "NONE", "NONE", "NONE") +call s:hi("ColorColumn", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Cursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("lCursor", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorIM", "NONE", s:base, s:rosewater, "NONE", "NONE") +call s:hi("CursorColumn", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("CursorLine", "NONE", "NONE", s:surface0, "NONE", "NONE") +call s:hi("Directory", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("DiffAdd", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("DiffChange", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("DiffDelete", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("DiffText", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("EndOfBuffer", "NONE", "NONE", "NONE", "NONE", "NONE") +call s:hi("ErrorMsg", "NONE", s:red, "NONE", "bolditalic" , "bold,italic") +call s:hi("VertSplit", "NONE", s:crust, "NONE", "NONE", "NONE") +call s:hi("Folded", "NONE", s:blue, s:surface1, "NONE", "NONE") +call s:hi("FoldColumn", "NONE", s:overlay0, s:base, "NONE", "NONE") +call s:hi("SignColumn", "NONE", s:surface1, s:base, "NONE", "NONE") +call s:hi("IncSearch", "NONE", s:surface1, s:pink, "NONE", "NONE") +call s:hi("CursorLineNR", "NONE", s:lavender, "NONE", "NONE", "NONE") +call s:hi("LineNr", "NONE", s:surface1, "NONE", "NONE", "NONE") +call s:hi("MatchParen", "NONE", s:peach, "NONE", "bold", "bold") +call s:hi("ModeMsg", "NONE", s:text, "NONE", "bold", "bold") +call s:hi("MoreMsg", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("NonText", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Pmenu", "NONE", s:overlay2, s:surface0, "NONE", "NONE") +call s:hi("PmenuSel", "NONE", s:text, s:surface1, "bold", "bold") +call s:hi("PmenuSbar", "NONE", "NONE", s:surface1, "NONE", "NONE") +call s:hi("PmenuThumb", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Question", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("QuickFixLine", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("Search", "NONE", s:pink, s:surface1, "bold", "bold") +call s:hi("SpecialKey", "NONE", s:subtext0, "NONE", "NONE", "NONE") +call s:hi("SpellBad", "NONE", s:base, s:red, "NONE", "NONE") +call s:hi("SpellCap", "NONE", s:base, s:yellow, "NONE", "NONE") +call s:hi("SpellLocal", "NONE", s:base, s:blue, "NONE", "NONE") +call s:hi("SpellRare", "NONE", s:base, s:green, "NONE", "NONE") +call s:hi("StatusLine", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTerm", "NONE", s:text, s:mantle, "NONE", "NONE") +call s:hi("StatusLineTermNC", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLine", "NONE", s:surface1, s:mantle, "NONE", "NONE") +call s:hi("TabLineFill", "NONE", "NONE", s:mantle, "NONE", "NONE") +call s:hi("TabLineSel", "NONE", s:green, s:surface1, "NONE", "NONE") +call s:hi("Title", "NONE", s:blue, "NONE", "bold", "bold") +call s:hi("VisualNOS", "NONE", "NONE", s:surface1, "bold", "bold") +call s:hi("WarningMsg", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("WildMenu", "NONE", "NONE", s:overlay0, "NONE", "NONE") +call s:hi("Comment", "NONE", s:overlay0, "NONE", "NONE", "NONE") +call s:hi("Constant", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Identifier", "NONE", s:flamingo, "NONE", "NONE", "NONE") +call s:hi("Statement", "NONE", s:mauve, "NONE", "NONE", "NONE") +call s:hi("PreProc", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Type", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Special", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Underlined", "NONE", s:text, s:base, "underline", "underline") +call s:hi("Error", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Todo", "NONE", s:base, s:flamingo, "bold", "bold") + +call s:hi("String", "NONE", s:green, "NONE", "NONE", "NONE") +call s:hi("Character", "NONE", s:teal, "NONE", "NONE", "NONE") +call s:hi("Number", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Boolean", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Float", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Function", "NONE", s:blue, "NONE", "NONE", "NONE") +call s:hi("Conditional", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Repeat", "NONE", s:red, "NONE", "NONE", "NONE") +call s:hi("Label", "NONE", s:peach, "NONE", "NONE", "NONE") +call s:hi("Operator", "NONE", s:sky, "NONE", "NONE", "NONE") +call s:hi("Keyword", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("Include", "NONE", s:pink, "NONE", "NONE", "NONE") +call s:hi("StorageClass", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Structure", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("Typedef", "NONE", s:yellow, "NONE", "NONE", "NONE") +call s:hi("debugPC", "NONE", "NONE", s:crust, "NONE", "NONE") +call s:hi("debugBreakpoint", "NONE", s:overlay0, s:base, "NONE", "NONE") + +hi link Define PreProc +hi link Macro PreProc +hi link PreCondit PreProc +hi link SpecialChar Special +hi link Tag Special +hi link Delimiter Special +hi link SpecialComment Special +hi link Debug Special +hi link Exception Error +hi link StatusLineTerm StatusLine +hi link StatusLineTermNC StatusLineNC +hi link Terminal Normal +hi link Ignore Comment + +" Set terminal colors for playing well with plugins like fzf +let g:terminal_ansi_colors = [ + \ s:surface1, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext1, + \ s:surface2, s:red, s:green, s:yellow, s:blue, s:pink, s:teal, s:subtext0 +\ ] diff --git a/vim/.vimrc b/vim/.vimrc new file mode 100644 index 0000000..1fb3dab --- /dev/null +++ b/vim/.vimrc @@ -0,0 +1,2 @@ +:set relativenumber +:colorscheme desert diff --git a/zsh/.zshrc b/zsh/.zshrc index 9e1ae20..5e36f06 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -94,6 +94,7 @@ plugins=( golang httpie jsontools + keychain k9s kitty kubectl