hhhh/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: kitty, nvim and bashrc

Browse source
This commit is contained in:
hhhh hgfh 2026-08-30 14:00:51 +03:00
parent a879e32d65
commit c5570614f5
63 changed files with 7768 additions and 3669 deletions
Download patch file Download diff file Expand all files Collapse all files

114
.bashrc Normal file
View file

@ -0,0 +1,114 @@
# some more ls aliases
export TERM=xterm-256color
export PATH="$HOME/gitui:$PATH"
export PATH="${GOBIN:-${GOPATH:-${HOME}/go}/bin}:${PATH}"
alias lsf="ls -p | grep -v /"
# Shortcuts for build/test
alias mss="meson setup builddir-debug --native-file=native.ini --buildtype=debug"
alias mss-release="meson setup builddir-release --native-file=native.ini --buildtype=release"
alias msr="meson setup builddir-debug --native-file=native.ini --buildtype=debug --reconfigure"
alias msr-release="meson setup builddir-release --native-file=native.ini --buildtype=release --reconfigure"
alias msc="meson compile -C builddir-debug"
alias msc-release="meson compile -C builddir-release"
alias mst="meson test -C builddir-debug"
alias mst-release="meson test -C builddir-release"
alias msb="meson test -C builddir-release --benchmark"
mstf() {
mst -v $1 --test-arg=\"--gtest_filter=\"*$2*\"\"
}
# Ninja
alias nic="ninja -C builddir-debug"
alias nic-release="ninja -C builddir-release"
alias ninja_test_env="env MALLOC_PERTURB_=8 UBSAN_OPTIONS='halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1' MSAN_OPTIONS='halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1' ASAN_OPTIONS='halt_on_error=1:abort_on_error=1:print_summary=1' MESON_TEST_ITERATION=1 "
nit() {
nic $1 && ninja_test_env $(pwd)/builddir-debug/$1
}
nitf() {
nic $1 && ninja_test_env $(pwd)/builddir-debug/$1 --gtest_filter=$2
}
nicc() {
filepath=$1
filename="${filepath##*/}"
nic $1 && cp ./builddir-debug/$1 ~/.local/bin/ && $filename --version
}
# For fast build
export CCACHE_DIR=$HOME/.engine_ccache
export CCACHE_UMASK=007
export CCACHE_LOGFILE=$HOME/.engine_ccache/.log
export CCACHE_NLEVELS=4
export KDB_USE_CCACHE=1
# For tests
export MESON_BUILD=true
export MESON_BUILD_DIR="builddir-debug"
export PATH="$HOME/engine/tornado/bin:$PATH"
export TORNADO_VKGO_PATH="$HOME/Git/vkgo"
export TORNADO_MAKE_DISABLED=1
# For debugging
export PATH="$HOME/Git/FlameGraph/:$PATH"
alias perf-rec="perf record -g -e cpu-cycles -p"
alias perf-rep="perf report"
alias perf-dat="perf script | stackcollapse-perf.pl >"
flamegraph() {
PERF_NAME="pdat"
if [ "$#" -ne 0 ]; then
PERF_NAME=$1
fi
if [ -f perf.data ]; then
mkdir -p img
perf-dat $PERF_NAME
flamegraph.pl $PERF_NAME > img/$PERF_NAME.svg
fi
}
flamegraph-diff() {
if [ -f $1 ] && [ -f $2 ]; then
difffolded.pl $1 $2 | flamegraph.pl > img/perf-diff-$1-$2.svg
fi
}
binlog-dump() {
barsic dump --prefix=$1 --no-start-echo -- binlog-dumper --module $2
}
set-scope() {
SCOPE="default-scope"
if [ "$#" -ne 0 ]; then
SCOPE=$1
fi
systemd-run --user --scope --unit=$SCOPE bash
}
check-scope() {
SCOPE="default-scope"
if [ "$#" -ne 0 ]; then
SCOPE=$1
fi
systemctl --user status $SCOPE.scope
}
shtop() {
local SCOPE="default-scope.scope"
if [ "$#" -ne 0 ]; then
SCOPE="$1"
fi
local CG
CG=$(systemctl --user show "$SCOPE" -p ControlGroup --value) || return 1
htop -p "$(paste -sd, "/sys/fs/cgroup${CG}/cgroup.procs")"
}

2993
kitty/extra.conf Normal file
View file

File diff suppressed because it is too large Load diff

108
kitty/kitty.conf
View file

@ -1,90 +1,26 @@
vim:ft=kitty
# BEGIN_KITTY_FONTS
font_family family="ProFontWindows Nerd Font"
bold_font auto
italic_font auto
bold_italic_font auto
font_size 16.0
# END_KITTY_FONTS
font_family JetBrainsMono Nerd Font
bold_font JetBrainsMono Nerd Font Bold
italic_font JetBrainsMono Nerd Font Italic
bold_italic_font JetBrainsMono Nerd Font Bold Italic
font_size 12.0
# BEGIN_CONFIGS
enable_audio_bell no
visual_bell_duration 0.0
shell_integration enabled
cursor_shape block
foreground #C9D0D3
background #383838
selection_background #4c4c4c
selection_foreground #C9D0D3
url_color #73cef4
cursor #C9D0D3
confirm_os_window_close 0
copy_on_select clipboard
# Цвета для обычного текста
color0 #242424
color8 #484848
# Цвета для яркого текста
color1 #f43753
color9 #f70067
color2 #98be65
color10 #a9ff68
color3 #ffc24b
color11 #f7bb3b
color4 #73cef4
color12 #51afef
color5 #cba6f7
color13 #b33076
color6 #00f1f5
color14 #6FAFBD
color7 #eeeeee
color15 #b8b8b8
# Дополнительные цвета (можно использовать в скриптах или плагинах)
# Зеленые оттенки
color16 #c9d05c
color17 #6A8759
color18 #afd700
color19 #89d957
color20 #4dd158
color21 #AFBF7E
# Красные/розовые оттенки
color22 #7a1b29
color23 #881515
color24 #c955ae
color25 #ad475f
# Оранжевые/коричневые оттенки
color26 #d3b987
color27 #dc9656
color28 #CC7832
color29 #b8733e
color30 #C07C41
color31 #ff9e64
# Синие/голубые оттенки
color32 #b3deef
color33 #596f77
color34 #6897BB
color35 #4682b4
# Серые оттенки
color36 #808080
color37 #73797e
color38 #4B4E4F
color39 #3C3F40
color40 #2B2B2B
color41 #404040
color42 #6d8086
color43 #abb2bf
color44 #d1d4cf
# Фиолетовые оттенки
color45 #9876AA
color46 #392a52
# Темные оттенки
color47 #151838
color48 #bf4537
color49 #c95942
tab_bar_style powerline
tab_powerline_style slanted
# END_CONFIGS
# BEGIN_INCLUDES
# include themes/dracula.conf
# include themes/Spacedust.conf
include themes/Xcodedark.conf
# END_INCLUDES

2993
kitty/kitty.conf.bak Normal file
View file

File diff suppressed because it is too large Load diff

29
kitty/themes/Spacedust.conf Normal file
View file

@ -0,0 +1,29 @@
background #0a1e24
foreground #ecefc1
cursor #708183
selection_background #0a385c
color0 #6e5246
color8 #674c31
color1 #e35a00
color9 #ff8a39
color2 #5cab96
color10 #adcab8
color3 #e3cd7b
color11 #ffc777
color4 #0e548b
color12 #67a0cd
color5 #e35a00
color13 #ff8a39
color6 #06afc7
color14 #83a6b3
color7 #f0f1ce
color15 #fefff0
selection_foreground #0a1e24
# START_AUTOGENERATED_TAB_STYLE
# Feel free to update these colors manually and remove these comments.
active_tab_foreground #eeeeee
active_tab_background #0a385c
inactive_tab_foreground #ecefc1
inactive_tab_background #08181d
# END_AUTOGENERATED_TAB_STYLE

57
kitty/themes/Xcodedark.conf Normal file
View file

@ -0,0 +1,57 @@
# xcodedark by arzg, https://github.com/arzg/vim-colors-xcode
# This work is licensed under the terms of the MIT license.
# For a copy, see https://opensource.org/licenses/MIT.
background #292a30
foreground #dfdfe0
cursor #53606e
selection_foreground #53606e
selection_background #393b44
color0 #292a30
color8 #53606e
# red
color1 #ff8170
# pink
color9 #ff7ab2
# teal
color2 #78c2b3
# lighy teal
color10 #acf2e4
# yellow
color3 #ffa14f
# light yellow
color11 #d9c97c
# blue
color4 #4eb0cc
# light blue
color12 #6bdfff
# purple
color5 #b281eb
# light purple
color13 #dabaff
# green
color6 #84b360
# light green
color14 #b0e687
# light gray
color7 #a3b1bf
# dark gray
color15 #53606e
# START_AUTOGENERATED_TAB_STYLE
# Feel free to update these colors manually and remove these comments.
active_tab_foreground #eeeeee
active_tab_background #393b44
inactive_tab_foreground #dfdfe0
inactive_tab_background #212226
# END_AUTOGENERATED_TAB_STYLE

81
kitty/themes/dracula.conf Normal file
View file

@ -0,0 +1,81 @@
foreground #C9D0D3
background #383838
selection_background #4c4c4c
selection_foreground #C9D0D3
url_color #73cef4
cursor #C9D0D3
# Цвета для обычного текста
color0 #242424
color8 #484848
# Цвета для яркого текста
color1 #f43753
color9 #f70067
color2 #98be65
color10 #a9ff68
color3 #ffc24b
color11 #f7bb3b
color4 #73cef4
color12 #51afef
color5 #cba6f7
color13 #b33076
color6 #00f1f5
color14 #6FAFBD
color7 #eeeeee
color15 #b8b8b8
# Дополнительные цвета (можно использовать в скриптах или плагинах)
# Зеленые оттенки
color16 #c9d05c
color17 #6A8759
color18 #afd700
color19 #89d957
color20 #4dd158
color21 #AFBF7E
# Красные/розовые оттенки
color22 #7a1b29
color23 #881515
color24 #c955ae
color25 #ad475f
# Оранжевые/коричневые оттенки
color26 #d3b987
color27 #dc9656
color28 #CC7832
color29 #b8733e
color30 #C07C41
color31 #ff9e64
# Синие/голубые оттенки
color32 #b3deef
color33 #596f77
color34 #6897BB
color35 #4682b4
# Серые оттенки
color36 #808080
color37 #73797e
color38 #4B4E4F
color39 #3C3F40
color40 #2B2B2B
color41 #404040
color42 #6d8086
color43 #abb2bf
color44 #d1d4cf
# Фиолетовые оттенки
color45 #9876AA
color46 #392a52
# Темные оттенки
color47 #151838
color48 #bf4537
color49 #c95942

21
nvim/init.lua
View file

@ -1,11 +1,28 @@
-- Default my settings
vim.g.mapleader = " "
vim.o.clipboard = "unnamedplus"
vim.opt.wrap = false
vim.wo.number = true
vim.wo.relativenumber = true
vim.opt.wrap = false
-- Add basic configs
require("configs.lazy")
require("mappings")
require("options")
require("custom.init")
-- Telescope
require("telescope").load_extension("noice")
-- Themes
require("themes.xcodedark").setup()
-- ========== Clipboard ============= --
vim.api.nvim_create_autocmd("TextYankPost", {
callback = function()
vim.hl.hl_op({ timeout = 1000 })
local copy_to_unnamedplus = require("vim.ui.clipboard.osc52").copy("+")
copy_to_unnamedplus(vim.v.event.regcontents)
local copy_to_unnamed = require("vim.ui.clipboard.osc52").copy("*")
copy_to_unnamed(vim.v.event.regcontents)
end,
})

50
nvim/lazy-lock.json
View file

@ -1,49 +1,45 @@
{
"LuaSnip": { "branch": "master", "commit": "a62e1083a3cfe8b6b206e7d3d33a51091df25357" },
"LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"cmp-async-path": { "branch": "main", "commit": "f8af3f726e07f2e9d37672eaa9102581aefce149" },
"cmp-async-path": { "branch": "main", "commit": "98185a91d49ff5dd249aebf2f7456e18063fa2a0" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
"duckytype.nvim": { "branch": "main", "commit": "fa59fbd7cf8407337bfe07d01b361a3449f34743" },
"conform.nvim": { "branch": "master", "commit": "016802de402556da54c36bd7359b441266b01cdd" },
"flash.nvim": { "branch": "main", "commit": "5f0f270fdc7c5b0c21d903ee85b9cb06f2ac636a" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
"gitsigns.nvim": { "branch": "main", "commit": "5be654f2232c10ddcad19c1607a67b6b4b78fc29" },
"gitui.nvim": { "branch": "main", "commit": "686d74e79899af760ed9f5f0ad2bd1bb1c135e26" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"log-highlight.nvim": { "branch": "main", "commit": "b2e00cfd41ca94338265a595f3f3f423d9f9322e" },
"lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
"lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
"marks.nvim": { "branch": "master", "commit": "f353e8c08c50f39e99a9ed474172df7eddd89b72" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "eaa34887d444cb002e1b165fac399ae4bbc771f7" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "40276c4df7e6bdce6801d6c035c6227f9115a855" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
"mason.nvim": { "branch": "main", "commit": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9" },
"mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" },
"mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" },
"neotest": { "branch": "master", "commit": "ad991822b7076b1d940b33a9d6d0d30416d5df81" },
"neotest-gtest": { "branch": "main", "commit": "b66f1d33cbf3b37b9803e6bc7ef47ac60eba86b1" },
"neotest-phpunit": { "branch": "main", "commit": "40e53c4294726a16f34f1a383a94c570553c6d46" },
"mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
"nui.nvim": { "branch": "main", "commit": "10fc361835c856ba4233ef5ea135b919bf3dce97" },
"nvim-autopairs": { "branch": "master", "commit": "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c" },
"nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" },
"nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
"nvim-dap-ui": { "branch": "master", "commit": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
"nvim-lspconfig": { "branch": "master", "commit": "75e49cfa588a89ca667d767c0afef3ceac205faa" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-file-operations": { "branch": "main", "commit": "d491d763be6686bbb8eae3b26e8e46e431852c29" },
"nvim-lspconfig": { "branch": "master", "commit": "684cb45c2faa24ce463b4fe9aaf011bfe1e0fb26" },
"nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
"nvim-tree.lua": { "branch": "master", "commit": "f9bfc0059eca24546b69a7006110463da4808f8f" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-treesitter": { "branch": "main", "commit": "8b98b4470eb326f1c7b50dae79f8c963568e5720" },
"nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
"nvim-web-devicons": { "branch": "master", "commit": "2795c26c916bb3c57dde308b82be51971fa92747" },
"persisted.nvim": { "branch": "main", "commit": "1a8e9dcf277d61105619498b2002c287c50424b8" },
"nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
"persisted.nvim": { "branch": "main", "commit": "f4773357d60c71e99a9fc39ebe858b925105431c" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"screenkey.nvim": { "branch": "main", "commit": "16390931d847b1d5d77098daccac4e55654ac9e2" },
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
"telescope.nvim": { "branch": "master", "commit": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59" },
"vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" },
"snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" },
"telescope.nvim": { "branch": "master", "commit": "40aedd8a68c78a656a10a8d62d80c54af59420fb" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
}

45
nvim/lua/configs/bufferline.lua
View file

@ -8,6 +8,37 @@ bufferline.setup {
icon = '▎',
style = 'icon',
},
groups = {
items = {
{
name = 'tornado',
matcher = function(buf)
return (buf.path or ""):lower():match("tornado")
end,
},
{
name = 'gornado',
matcher = function(buf)
return (buf.path or ""):lower():match("gornado")
end,
},
{
name = 'tests',
matcher = function(buf)
return (buf.name or ""):lower():match("*test*%.cpp$")
end,
},
{
name = 'code',
matcher = function(buf)
return (buf.name or ""):lower():match("%.h$")
or (buf.name or ""):lower():match("%.c$")
or (buf.name or ""):lower():match("%.cpp$")
end,
},
},
hidden = false,
},
buffer_close_icon = '󰅖',
modified_icon = '● ',
close_icon = '',
@ -17,20 +48,6 @@ bufferline.setup {
max_prefix_length = 15,
truncate_names = true,
tab_size = 18,
custom_filter = function(buf_number, buf_numbers)
if vim.bo[buf_number].filetype ~= "<i-dont-want-to-see-this>" then
return true
end
if vim.fn.bufname(buf_number) ~= "<buffer-name-I-dont-want>" then
return true
end
if vim.fn.getcwd() == "<work-repo>" and vim.bo[buf_number].filetype ~= "wiki" then
return true
end
if buf_numbers[1] ~= buf_number then
return true
end
end,
offsets = {
{
filetype = "NvimTree",

5
nvim/lua/configs/conform.lua
View file

@ -2,13 +2,12 @@ require('conform').setup({
formatters_by_ft = {
lua = { "stylua" },
cpp = { "clang-format" },
go = { "gofmr" },
go = { "gofmt" },
},
format_on_save = {
-- These options will be passed to conform.format()
timeout_ms = 500,
lsp_fallback = true,
lsp_format = "fallback",
},
notify_on_error = true,
})

2
nvim/lua/configs/lazy.lua
View file

@ -1,5 +1,5 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
if not vim.uv.fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then

55
nvim/lua/configs/lsp/e-lspconfig.lua
View file

@ -1,55 +0,0 @@
local M = {}
local map = vim.keymap.set
-- export on_attach & capabilities
M.on_attach = function(_, bufnr)
local function opts(desc)
return { buffer = bufnr, desc = "LSP " .. desc }
end
map("n", "gD", vim.lsp.buf.declaration, opts "Go to declaration")
map("n", "gd", vim.lsp.buf.definition, opts "Go to definition")
map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts "Add workspace folder")
map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts "Remove workspace folder")
map("n", "<leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts "List workspace folders")
map("n", "<leader>D", vim.lsp.buf.type_definition, opts "Go to type definition")
end
-- disable semanticTokens
M.on_init = function(client, _)
if vim.fn.has "nvim-0.11" ~= 1 then
if client.supports_method "textDocument/semanticTokens" then
client.server_capabilities.semanticTokensProvider = nil
end
else
if client:supports_method "textDocument/semanticTokens" then
client.server_capabilities.semanticTokensProvider = nil
end
end
end
M.capabilities = vim.lsp.protocol.make_client_capabilities()
M.capabilities.textDocument.completion.completionItem = {
documentationFormat = { "markdown", "plaintext" },
snippetSupport = true,
preselectSupport = true,
insertReplaceSupport = true,
labelDetailsSupport = true,
deprecatedSupport = true,
commitCharactersSupport = true,
tagSupport = { valueSet = { 1 } },
resolveSupport = {
properties = {
"documentation",
"detail",
"additionalTextEdits",
},
},
}
return M

89
nvim/lua/configs/lsp/lspconfig.lua
View file

@ -1,30 +1,42 @@
local on_attach = require("configs.lsp.e-lspconfig").on_attach
local on_init = require("configs.lsp.e-lspconfig").on_init
local capabilities = require("configs.lsp.e-lspconfig").capabilities
vim.lsp.config('*', {
capabilities = require('cmp_nvim_lsp').default_capabilities(),
on_init = function(client)
if client:supports_method('textDocument/semanticTokens') then
client.server_capabilities.semanticTokensProvider = nil
end
end,
})
vim.api.nvim_create_autocmd('LspAttach', {
callback = function(args)
local map = vim.keymap.set
local function opts(desc)
return { buffer = args.buf, desc = "LSP " .. desc }
end
map("n", "gD", vim.lsp.buf.declaration, opts "Go to declaration")
map("n", "gd", vim.lsp.buf.definition, opts "Go to definition")
map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts "Add workspace folder")
map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts "Remove workspace folder")
map("n", "<leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts "List workspace folders")
map("n", "<leader>D", vim.lsp.buf.type_definition, opts "Go to type definition")
end,
})
-- C/C++
vim.lsp.config('clangd', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = {
"clangd-22",
"clangd",
"--clang-tidy",
},
filetypes = { "c", "cpp", "h", "hpp", "objc", "objcpp" },
root_markers = { '.git' },
})
vim.lsp.enable('clangd')
-- Go (gopls) lsp server
-- Go
vim.lsp.config('gopls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'gopls' },
filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' },
root_markers = { 'go.mod', '.git' },
single_file_support = true,
settings = {
gopls = {
completeUnimported = true,
@ -37,32 +49,18 @@ vim.lsp.config('gopls', {
},
},
})
vim.lsp.enable('gopls')
-- PhP
-- PHP
vim.lsp.config('phpactor', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'phpactor', 'language-server' },
filetypes = { 'php' },
root_markers = { 'composer.json', '.git' },
init_options = {
["language_server_phpstan.enabled"] = false,
["language_server_psalm.enabled"] = false,
["language_server_mago.enabled"] = false,
}
})
vim.lsp.enable('phpactor')
-- Lua
vim.lsp.config('lua_ls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'lua-language-server' },
filetypes = { 'lua' },
root_markers = { '.luarc.json', '.luarc.jsonc', '.git' },
single_file_support = true,
settings = {
Lua = {
telemetry = { enable = false },
@ -78,34 +76,7 @@ vim.lsp.config('lua_ls', {
},
}
})
vim.lsp.enable('lua_ls')
-- Bash
vim.lsp.config('bashls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'bash-language-server', 'start' },
filetypes = { 'sh', 'bash' },
root_markers = { '.git' },
single_file_support = true,
})
vim.lsp.enable('bashls')
-- Meson
vim.lsp.config('meson_ls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'mesonlsp' },
filetypes = { 'meson' },
root_markers = { 'meson.build', '.git' },
single_file_support = true,
settings = {}
})
vim.lsp.enable('meson_ls')
-- For all
vim.diagnostic.config({
virtual_text = false,
})

78
nvim/lua/configs/neotree.lua Normal file
View file

@ -0,0 +1,78 @@
return {
close_if_last_window = true,
popup_border_style = "rounded",
enable_git_status = true,
enable_diagnostics = true,
filesystem = {
hijack_netrw_behavior = "open_current",
follow_current_file = {
enabled = true,
leave_dirs_open = false,
},
group_empty_dirs = true,
filtered_items = {
visible = false,
hide_hidden = false,
hide_dotfiles = false,
hide_gitignored = false,
hide_by_name = {
"docs",
".git",
".cache",
"builddir-debug",
},
},
bind_to_cwd = true,
cwd_target = {
sidebar = "global",
current = "window",
},
use_libuv_file_watcher = true,
window = {
width = 30,
},
},
default_component_configs = {
indent = {
with_markers = true,
},
modified = {
symbol = "",
},
icon = {
folder_closed = "",
folder_open = "",
folder_empty = "",
default = "󰈚",
},
git_status = {
symbols = {
added = "★",
modified = "✗",
deleted = "",
renamed = "➜",
untracked = "★",
ignored = "◌",
unstaged = "✗",
staged = "✓",
conflict = "",
},
},
name = {
use_git_status_colors = true,
},
},
}

105
nvim/lua/configs/nvimtree.lua
View file

@ -1,105 +0,0 @@
-- return {
-- filters = { dotfiles = false, git_ignored = false, },
-- disable_netrw = true,
-- hijack_cursor = true,
-- sync_root_with_cwd = true,
-- update_focused_file = {
-- enable = true,
-- update_root = false,
-- },
-- bookmarks = {
-- persist = true,
-- },
-- view = {
-- width = 30,
-- preserve_window_proportions = true,
-- },
-- renderer = {
-- root_folder_label = false,
-- highlight_git = true,
-- indent_markers = { enable = true },
-- icons = {
-- glyphs = {
-- default = "󰈚",
-- folder = {
-- default = "",
-- empty = "",
-- empty_open = "",
-- open = "",
-- symlink = "",
-- },
-- git = { unmerged = "" },
-- },
-- },
-- },
-- }
return {
filters = {
dotfiles = false,
git_ignored = false,
},
disable_netrw = true,
hijack_cursor = true,
sync_root_with_cwd = true,
update_focused_file = {
enable = true,
update_root = false,
},
bookmarks = {
persist = true,
},
git = {
enable = true,
ignore = false,
timeout = 5000,
},
view = {
width = 30,
preserve_window_proportions = true,
},
renderer = {
root_folder_label = false,
highlight_git = "all",
indent_markers = {
enable = true,
},
icons = {
show = {
git = true,
modified = false,
file = true,
folder = true,
folder_arrow = true,
},
glyphs = {
default = "󰈚",
folder = {
default = "",
empty = "",
empty_open = "",
open = "",
symlink = "",
},
git = {
unstaged = "✗",
staged = "✓",
unmerged = "",
renamed = "➜",
untracked = "★",
deleted = "",
ignored = "◌",
},
},
},
},
}

2
nvim/lua/configs/telescope.lua
View file

@ -1,4 +1,4 @@
require("telescope").setup(){
require("telescope").setup {
defaults = {
prompt_prefix = "",
selection_caret = " ",

804
nvim/lua/custom/darcula.lua
View file

@ -1,804 +0,0 @@
---@class Config
local config = {
opt = {
integrations = {
telescope = false,
lualine = true,
lsp_semantics_token = true,
nvim_cmp = true,
dap_nvim = true,
},
},
}
---@class MyModule
local M = {}
---@type Config
M.config = config
local color = {
green = "#98be65",
red = "#f43753",
grey = "#C9D0D3",
light_blue = "#b3deef",
background = "#383838",
pale_gold = "#d3b987",
dark = "#2B2B2B",
bright_sky = "#73cef4",
golden_yellow = "#ffc24b",
light_olive_green = "#c9d05c",
medium_gray = "#4c4c4c",
light_brown = "#dc9656",
silver_gray = "#b8b8b8",
bright_cyan = "#00f1f5",
light_slate_gray = "#abb2bf",
dark_grey = "#484848",
comment = "#808080",
light_lime_green = "#a9ff68",
peach_orange = "#ff9e64",
slate_gray = "#6d8086",
light_lavender = "#cba6f7",
very_light_gray = "#eeeeee",
dark_charcoal_gray = "#404040",
very_dark_gray = "#242424",
bright_pink = "#f70067",
burnt_orange = "#CC7832",
dark_maroon = "#7a1b29",
steel_blue = "#596f77",
bright_yellow_green = "#e3e346",
copper_brown = "#C07C41",
deep_fuchsia = "#b33076",
lavender = "#9876AA",
deep_light_blue = "#51afef",
pale_taupe = "#AD9E7D",
olive_green = "#6A8759",
_52 = "#c95942",
_54 = "#bf4537",
_64 = "#89d957",
_70 = "#4dd158",
_66 = "#6FAFBD",
_71 = "#4B4E4F",
_74 = "#3C3F40",
_38 = "#881515",
_39 = "#73797e",
_47 = "#f7bb3b",
_50 = "#d1d4cf",
_53 = "#c955ae",
_55 = "#b8733e",
_56 = "#afd700",
_57 = "#ad475f",
_58 = "#FFC66D",
_61 = "#AFBF7E",
_68 = "#6897BB",
_72 = "#4682b4",
_75 = "#392a52",
_82 = "#151838",
}
---@param args Config?
-- you can define your setup function here. Usually configurations can be merged, accepting outside params and
-- you can also put some validation here for those.
M.setup = function(args)
M.config = vim.tbl_deep_extend("force", M.config, args or {})
if vim.g.colors_name ~= nil then
vim.cmd("highlight clear")
end
if args and type(args.override) == "function" then
c = args.override(color)
color = vim.tbl_deep_extend("force", color, c)
end
-- neovim version should be higher than 0.8.3
if vim.fn.has("nvim-0.8.3") == 0 then
vim.cmd(
"echohl WarningMsg | echo 'Your neovim version is lower than 0.8.3, some features may not work correctly!' | echohl None"
)
end
vim.g.colors_name = "darcula-dark"
vim.o.termguicolors = true
M.configure_highlights()
end
M.configure_highlights = function()
-- colors
-- Highlight groups
local hi = vim.api.nvim_set_hl
if M.config.opt.integrations.lsp_semantics_token then
-- lsp semantics token
hi(0, "@attribute", { link = "TSAttribute" })
hi(0, "@boolean", { link = "TSBoolean" })
hi(0, "@character", { link = "TSCharacter" })
hi(0, "@character.special", { link = "SpecialChar" })
hi(0, "@class", { link = "TSType" })
hi(0, "@comment", { link = "TSComment" })
hi(0, "@conditional", { link = "TSConditional" })
hi(0, "@constant", { link = "TSConstant" })
hi(0, "@constant.builtin", { link = "TSConstantBuiltin" })
hi(0, "@constant.macro", { link = "TSConstant" })
hi(0, "@constructor", { link = "TSConstructor" })
hi(0, "@decorator", { link = "Identifier" })
hi(0, "@enum", { link = "TSType" })
hi(0, "@enumMember", { link = "Constant" })
hi(0, "@error", { link = "TSError" })
hi(0, "@event", { link = "Identifier" })
hi(0, "@exception", { link = "TSException" })
hi(0, "@field", { link = "TSField" })
hi(0, "@float", { link = "TSFloat" })
hi(0, "@function", { link = "TSFunction" })
hi(0, "@function.builtin", { link = "TSFuncBuiltin" })
hi(0, "@function.call", { link = "TSFunctionCall" })
hi(0, "@function.macro", { link = "TSFuncMacro" })
hi(0, "@include", { link = "TSInclude" })
hi(0, "@interface", { link = "Structure" })
hi(0, "@keyword", { link = "TSKeyword" })
hi(0, "@keyword.function", { link = "TSKeywordFunction" })
hi(0, "@keyword.operator", { link = "TSKeywordOperator" })
hi(0, "@keyword.return", { link = "TSKeyword" })
hi(0, "@label", { link = "TSLabel" })
hi(0, "@method", { link = "TSMethod" })
hi(0, "@method.call", { link = "TSMethodCall" })
hi(0, "@modifier", { link = "Identifier" })
hi(0, "@namespace", { link = "TSNamespace" })
hi(0, "@none", { link = "TSNone" })
hi(0, "@number", { link = "TSNumber" })
hi(0, "@operator", { link = "TSOperator" })
hi(0, "@parameter", { link = "TSParameter" })
hi(0, "@property", { link = "TSVariable" })
hi(0, "@punctuation.bracket", { link = "TSPunctBracket" })
hi(0, "@punctuation.delimiter", { link = "TSPunctDelimiter" })
hi(0, "@punctuation.special", { link = "TSPunctSpecial" })
hi(0, "@regexp", { link = "TSStringRegex" })
hi(0, "@repeat", { link = "TSRepeat" })
hi(0, "@string", { link = "TSString" })
hi(0, "@string.escape", { link = "TSStringEscape" })
hi(0, "@string.regex", { link = "TSStringRegex" })
hi(0, "@string.special", { link = "SpecialChar" })
hi(0, "@struct", { link = "TSType" })
hi(0, "@symbol", { link = "TSSymbol" })
hi(0, "@tag", { link = "TSTag" })
hi(0, "@tag.attribute", { link = "TSAttribute" })
hi(0, "@tag.delimiter", { link = "TSTagDelimiter" })
hi(0, "@text", { link = "TSText" })
hi(0, "@text.danger", { link = "DiagnosticError" })
hi(0, "@text.emphasis", { link = "TSEmphasis" })
hi(0, "@text.environment", { link = "Macro" })
hi(0, "@text.environment.name", { link = "Type" })
hi(0, "@text.literal", { link = "TSLiteral" })
hi(0, "@text.math", { link = "Number" })
hi(0, "@text.note", { link = "Tag" })
hi(0, "@text.reference", { link = "TSParameterReference" })
hi(0, "@text.strike", { link = "TSStrike" })
hi(0, "@text.strong", { link = "TSStrong" })
hi(0, "@text.title", { link = "TSTitle" })
hi(0, "@text.todo", { link = "Todo" })
hi(0, "@text.underline", { link = "TSUnderline" })
hi(0, "@text.uri", { link = "TSURI" })
hi(0, "@text.warning", { link = "DiagnosticWarn" })
hi(0, "@type", { link = "TSType" })
hi(0, "@type.builtin", { link = "TSTypeBuiltin" })
hi(0, "@type.definition", { link = "TSTypeDefinition" })
hi(0, "@type.qualifier", { link = "TSType" })
hi(0, "@typeParameter", { link = "Type" })
hi(0, "@variable", { link = "TSVariable" })
hi(0, "@variable.builtin", { link = "TSVariableBuiltin" })
hi(0, "@lsp.type.namespace", { link = "TSNamespace" })
hi(0, "@lsp.type.variable", { link = "TSVariable" })
hi(0, "@lsp.type.parameter", { link = "TSVariable" })
hi(0, "@lsp.typemod.variable.readonly", { link = "TSConstant" })
hi(0, "@lsp.type.type", { link = "TSType" })
hi(0, "@lsp.type.function", {})
hi(0, "@lsp.type.method", {})
hi(0, "@lsp.type.comment", {})
hi(0, "@lsp.typemod.variable.defaultLibrary", { link = "TSKeyword" })
hi(0, "@lsp.mod.defaultLibrary.go", { link = "TSKeyword" })
hi(0, "@lsp.type.property", { link = "TSField" })
hi(0, "@tag.attribute.tsx", { link = "TSParameter" })
hi(0, "@tag.attribute.javascript", { link = "TSParameter" })
end
hi(0, "Bold", { bold = true })
hi(0, "Boolean", { fg = color.light_brown })
hi(0, "Character", { fg = color.red })
-- nvim-cmp
if M.config.opt.integrations.nvim_cmp then
hi(0, "Pmenu", { bg = color._74, ctermbg = 13, ctermfg = 0 })
hi(0, "PmenuSel", { bg = color._71, ctermbg = 0, ctermfg = 242 })
hi(0, "CmpDocumentation", { fg = color.grey })
hi(0, "CmpDocumentationBorder", { fg = color.grey })
hi(0, "CmpItemAbbr", { fg = color.grey })
hi(0, "CmpItemAbbrDefault", { fg = color.grey })
hi(0, "CmpItemAbbrDeprecated", { fg = color.medium_gray, strikethrough = true })
hi(0, "CmpItemAbbrDeprecatedDefault", { fg = color.medium_gray })
hi(0, "CmpItemAbbrMatch", { fg = color.light_blue })
hi(0, "CmpItemAbbrMatchDefault", { fg = color.grey })
hi(0, "CmpItemAbbrMatchFuzzy", { fg = color.light_blue })
hi(0, "CmpItemAbbrMatchFuzzyDefault", { fg = color.grey })
hi(0, "CmpItemKindClass", { fg = color.golden_yellow })
hi(0, "CmpItemKindClassDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindColorDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindConstant", { fg = color.light_brown })
hi(0, "CmpItemKindConstantDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindConstructor", { fg = color.light_blue })
hi(0, "CmpItemKindConstructorDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindDefault", { fg = color.bright_sky })
hi(0, "CmpItemKindEnum", { fg = color.golden_yellow })
hi(0, "CmpItemKindEnumDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindEnumMember", { fg = color.golden_yellow })
hi(0, "CmpItemKindEnumMemberDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindEvent", { fg = color.golden_yellow })
hi(0, "CmpItemKindEventDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindField", { fg = color.red })
hi(0, "CmpItemKindFieldDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindFileDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindFolderDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindFunction", { fg = color.light_blue })
hi(0, "CmpItemKindFunctionDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindInterface", { fg = color.golden_yellow })
hi(0, "CmpItemKindInterfaceDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindKeyword", { fg = color.pale_gold })
hi(0, "CmpItemKindKeywordDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindMethod", { fg = color.light_blue })
hi(0, "CmpItemKindMethodDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindModule", { fg = color.grey })
hi(0, "CmpItemKindModuleDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindOperator", { fg = color.grey })
hi(0, "CmpItemKindOperatorDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindProperty", { fg = color.red })
hi(0, "CmpItemKindPropertyDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindReference", { fg = color.red })
hi(0, "CmpItemKindReferenceDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindSnippet", { fg = color.silver_gray })
hi(0, "CmpItemKindSnippetDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindStruct", { fg = color.golden_yellow })
hi(0, "CmpItemKindStructDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindTextDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindTypeParameter", { fg = color.golden_yellow })
hi(0, "CmpItemKindTypeParameterDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindUnit", { fg = color.golden_yellow })
hi(0, "CmpItemKindUnitDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindValue", { fg = color.light_brown })
hi(0, "CmpItemKindValueDefault", { link = "CmpItemKind" })
hi(0, "CmpItemKindVariable", { fg = color.red })
hi(0, "CmpItemKindVariableDefault", { link = "CmpItemKind" })
hi(0, "CmpItemMenu", { fg = color.silver_gray })
hi(0, "CmpItemMenuDefault", { fg = color.grey })
hi(0, "ColorColumn", { bg = color.background, ctermbg = 1 })
hi(0, "Comment", { ctermfg = 14 })
hi(0, "Conceal", { ctermbg = 242, ctermfg = 7, fg = color.light_blue })
hi(0, "Conditional", { fg = color.pale_gold })
end
-- conflict-marker.vim
hi(0, "Constant", { ctermfg = 13, fg = color.light_brown })
-- copilot.vim
hi(0, "CopilotSuggestion", { ctermfg = 244, fg = color.comment })
-- cursor
hi(0, "Cursor", { bg = color.very_light_gray, fg = color.dark })
hi(0, "CursorColumn", { bg = color.background, ctermbg = 242 })
hi(0, "CursorLine", { bg = color.background })
hi(0, "CursorLineNr", { bg = color.background, bold = true, ctermfg = 11, fg = color.silver_gray })
-- dap.nvim
if M.config.opt.integrations.dap_nvim then
hi(0, "DapUIBreakpointsCurrentLine", { bold = true, fg = color.light_lime_green })
hi(0, "DapUIBreakpointsDisabledLine", { fg = color.dark_grey })
hi(0, "DapUIBreakpointsInfo", { fg = color.light_lime_green })
hi(0, "DapUIBreakpointsPath", { fg = color.bright_cyan })
hi(0, "DapUIDecoration", { fg = color.bright_cyan })
hi(0, "DapUIFloatBorder", { fg = color.bright_cyan })
hi(0, "DapUILineNumber", { fg = color.bright_cyan })
hi(0, "DapUIModifiedValue", { bold = true, fg = color.bright_cyan })
hi(0, "DapUIPlayPause", { fg = color.light_lime_green })
hi(0, "DapUIPlayPauseNC", { fg = color.light_lime_green })
hi(0, "DapUIRestart", { fg = color.light_lime_green })
hi(0, "DapUIRestartNC", { fg = color.light_lime_green })
hi(0, "DapUIScope", { fg = color.bright_cyan })
hi(0, "DapUISource", { fg = color.light_lavender })
hi(0, "DapUIStepBack", { fg = color.bright_cyan })
hi(0, "DapUIStepBackNC", { fg = color.bright_cyan })
hi(0, "DapUIStepInto", { fg = color.bright_cyan })
hi(0, "DapUIStepIntoNC", { fg = color.bright_cyan })
hi(0, "DapUIStepOut", { fg = color.bright_cyan })
hi(0, "DapUIStepOutNC", { fg = color.bright_cyan })
hi(0, "DapUIStepOver", { fg = color.bright_cyan })
hi(0, "DapUIStepOverNC", { fg = color.bright_cyan })
hi(0, "DapUIStop", { fg = color.bright_pink })
hi(0, "DapUIStopNC", { fg = color.bright_pink })
hi(0, "DapUIStoppedThread", { fg = color.bright_cyan })
hi(0, "DapUIThread", { fg = color.light_lime_green })
hi(0, "DapUIType", { fg = color.light_lavender })
hi(0, "DapUIUnavailable", { fg = color.dark_grey })
hi(0, "DapUIUnavailableNC", { fg = color.dark_grey })
hi(0, "DapUIWatchesEmpty", { fg = color.bright_pink })
hi(0, "DapUIWatchesError", { fg = color.bright_pink })
hi(0, "DapUIWatchesValue", { fg = color.light_lime_green })
end
hi(0, "Debug", { fg = color.red })
hi(0, "Define", { fg = color.pale_gold })
hi(0, "DefinitionArrow", { fg = color._57 })
hi(0, "DefinitionBorder", { fg = color.light_blue })
hi(0, "DefinitionFile", { bg = color._82 })
hi(0, "Definitions", { bold = true, fg = color.light_lavender })
hi(0, "DefinitionsIcon", { fg = color.bright_yellow_green })
hi(0, "Delimiter", { fg = color.light_brown })
hi(0, "DiagnosticError", { ctermfg = 1, fg = color.red })
hi(0, "DiagnosticHint", { ctermfg = 7, fg = color.bright_sky })
hi(0, "DiagnosticInfo", { ctermfg = 4, fg = color.grey })
hi(0, "DiagnosticLineCol", { fg = color._39 })
hi(0, "DiagnosticMap", { fg = color.light_lavender })
hi(0, "DiagnosticQuickFix", { bold = true, fg = color._70 })
hi(0, "DiagnosticUnderlineError", { sp = color.red, undercurl = true })
hi(0, "DiagnosticUnderlineHint", { sp = color.bright_sky, undercurl = true })
hi(0, "DiagnosticUnderlineInformation", { sp = color.light_brown, undercurl = true })
hi(0, "DiagnosticUnderlineWarn", { sp = color.pale_gold, undercurl = true })
hi(0, "DiagnosticUnderlineWarning", { sp = color.pale_gold, undercurl = true })
hi(0, "DiagnosticWarn", { ctermfg = 3, fg = color.pale_gold })
-- hi(0, "DiffAdd", { ctermbg = 4, fg = color._05 })
-- hi(0, "DiffAdded", { fg = color._05 })
-- hi(0, "DiffChange", { ctermbg = 5, fg = color._07 })
-- hi(0, "DiffDelete", { bold = true, ctermbg = 6, ctermfg = 12, fg = color.red })
-- hi(0, "DiffFile", { fg = color.red })
-- hi(0, "DiffLine", { fg = color.light_blue })
-- hi(0, "DiffNewFile", { fg = color._05 })
-- hi(0, "DiffRemoved", { fg = color.red })
-- hi(0, "DiffText", { bold = true, ctermbg = 9, fg = color.light_blue })
hi(0, "Directory", { ctermfg = 159, fg = color.light_blue })
hi(0, "Error", { bg = color.red, ctermbg = 9, ctermfg = 15, fg = color.dark })
hi(0, "ErrorMsg", { ctermbg = 1, ctermfg = 15, fg = color.red })
hi(0, "Exception", { fg = color.red })
hi(0, "EyelinerDimmed", { fg = color.medium_gray })
hi(0, "EyelinerPrimary", { fg = color.light_brown })
hi(0, "EyelinerSecondary", { fg = color.pale_gold })
hi(0, "FinderParam", { bg = color._75, bold = true, fg = color.light_lavender })
hi(0, "FinderSpinner", { bold = true, fg = color.deep_fuchsia })
hi(0, "FinderSpinnerBorder", { fg = color.deep_light_blue })
hi(0, "FinderSpinnerTitle", { bold = true, fg = color.deep_fuchsia })
hi(0, "FinderVirtText", { fg = color._52 })
hi(0, "Float", { fg = color.light_brown })
hi(0, "FloatBorder", { fg = color.grey })
hi(0, "FocusedSymbol", { bg = color.background, fg = color.light_olive_green })
hi(0, "FoldColumn", { ctermbg = 242 })
hi(0, "Folded", { bg = color.background, ctermbg = 242 })
hi(0, "Function", { fg = color.light_blue })
hi(0, "GitGutterAdd", { bg = color.dark, fg = color.light_olive_green })
hi(0, "GitGutterChange", { bg = color.dark, fg = color.light_blue })
hi(0, "GitGutterChangeDelete", { bg = color.dark, fg = color.pale_gold })
hi(0, "GitGutterDelete", { bg = color.dark, fg = color.red })
hi(0, "GitSignsStagedAdd", { bg = color.dark, fg = color.green })
hi(0, "GitSignsStagedAddLn", { bg = color.dark, fg = color.green })
hi(0, "GitSignsStagedAddNr", { bg = color.dark, fg = color.green })
hi(0, "GitSignsStagedChange", { bg = color.dark, fg = color.steel_blue })
hi(0, "GitSignsStagedChangeLn", { bg = color.dark, fg = color.very_dark_gray })
hi(0, "GitSignsStagedChangeNr", { bg = color.dark, fg = color.steel_blue })
hi(0, "GitSignsStagedChangedelete", { bg = color.dark, fg = color.steel_blue })
hi(0, "GitSignsStagedChangedeleteLn", { bg = color.dark, fg = color.very_dark_gray })
hi(0, "GitSignsStagedChangedeleteNr", { bg = color.dark, fg = color.steel_blue })
hi(0, "GitSignsStagedDelete", { bg = color.dark, fg = color.dark_maroon })
hi(0, "GitSignsStagedDeleteNr", { bg = color.dark, fg = color.dark_maroon })
hi(0, "GitSignsStagedTopdelete", { bg = color.dark, fg = color.dark_maroon })
hi(0, "GitSignsStagedTopdeleteNr", { bg = color.dark, fg = color.dark_maroon })
hi(0, "HopNextKey", { bold = true, ctermfg = 198, fg = color.bright_pink })
hi(0, "HopNextKey1", { bold = true, ctermfg = 45, fg = color.bright_cyan })
hi(0, "HopNextKey2", { ctermfg = 33, fg = color.bright_cyan })
hi(0, "HopPreview", { link = "IncSearch" })
hi(0, "HopUnmatched", { ctermfg = 242, fg = color.slate_gray, sp = color.slate_gray })
hi(0, "Identifier", { ctermfg = 14, fg = color.red })
hi(0, "Ignore", { ctermfg = 0, fg = color.dark })
-- hi(0, "IlluminatedWordRead", { sp = color._09, underline = true })
-- hi(0, "IlluminatedWordText", { sp = color._09, underline = true })
-- hi(0, "IlluminatedWordWrite", { sp = color._09, underline = true })
hi(0, "Implements", { bold = true, fg = color.light_lavender })
hi(0, "ImplementsIcon", { fg = color.bright_yellow_green })
hi(0, "IncSearch", { bg = color.light_brown, fg = color.background })
hi(0, "Include", { fg = color.copper_brown })
hi(0, "IndentBlanklineChar", { fg = color.dark_grey, nocombine = true })
hi(0, "IndentBlanklineContextChar", { fg = color.silver_gray, nocombine = true })
hi(0, "IndentBlanklineContextStart", { sp = color.golden_yellow, underline = true })
hi(0, "IndentBlanklineSpaceChar", { ctermfg = 12, fg = color.medium_gray, nocombine = true })
hi(0, "IndentBlanklineSpaceCharBlankline", { ctermfg = 12, fg = color.medium_gray, nocombine = true })
hi(0, "Keyword", { fg = color.pale_gold })
hi(0, "LSOutlinePreviewBorder", { fg = color.green })
hi(0, "Label", { fg = color.golden_yellow })
hi(0, "LineNr", { ctermfg = 11, fg = color.silver_gray })
hi(0, "LspDiagnosticsDefaultError", { link = "DiagnosticError" })
hi(0, "LspDiagnosticsDefaultHint", { link = "DiagnosticHint" })
hi(0, "LspDiagnosticsDefaultInformation", { link = "DiagnosticInfo" })
hi(0, "LspDiagnosticsDefaultWarning", { link = "DiagnosticWarn" })
hi(0, "LspDiagnosticsUnderlineError", { link = "DiagnosticUnderlineError" })
hi(0, "LspDiagnosticsUnderlineHint", { link = "DiagnosticUnderlineHint" })
hi(0, "LspDiagnosticsUnderlineInformation", { link = "DiagnosticUnderlineInformation" })
hi(0, "LspDiagnosticsUnderlineWarning", { link = "DiagnosticUnderlineWarning" })
hi(0, "LspReferenceRead", { sp = color.silver_gray, underline = true })
hi(0, "LspReferenceText", { sp = color.silver_gray, underline = true })
hi(0, "LspReferenceWrite", { sp = color.silver_gray, underline = true })
hi(0, "LspSagaAutoPreview", { fg = color.deep_light_blue })
hi(0, "LspSagaCodeActionBorder", { fg = color.light_lavender })
hi(0, "LspSagaCodeActionContent", { bold = true, fg = color.green })
hi(0, "LspSagaCodeActionTitle", { bold = true, fg = color.burnt_orange })
hi(0, "LspSagaDiagnosticBorder", { fg = color.light_lavender })
hi(0, "LspSagaDiagnosticHeader", { fg = color._56 })
hi(0, "LspSagaFinderSelection", { bold = true, fg = color._64 })
hi(0, "LspSagaHoverBorder", { fg = color._47 })
hi(0, "LspSagaLspFinderBorder", { fg = color.deep_light_blue })
hi(0, "LspSagaRenameBorder", { fg = color.bright_cyan })
hi(0, "LspSagaSignatureHelpBorder", { fg = color.green })
hi(0, "Macro", { fg = color.red })
hi(0, "MatchParen", { fg = color.bright_cyan, bold = true })
hi(0, "ModeMsg", { bold = true, fg = color.light_olive_green })
hi(0, "MoreMsg", { bold = true, ctermfg = 121, fg = color.light_olive_green })
hi(0, "NERDTreeFile", { fg = color.grey })
hi(0, "NERDTreeCWD", { fg = color.grey })
hi(0, "NERDTreeGitStatusIgnored", { ctermfg = 81, fg = color.medium_gray })
hi(0, "NERDTreeGitStatusModified", { ctermfg = 224, fg = color.bright_sky })
hi(0, "NERDTreeGitStatusRenamed", { ctermfg = 225, fg = color.light_blue })
hi(0, "NERDTreeGitStatusUntracked", { ctermfg = 14, fg = color.medium_gray })
hi(0, "NonText", { bold = true, ctermfg = 12, fg = color.medium_gray })
hi(0, "Normal", { bg = color.dark, fg = color.grey })
hi(0, "NormalFloat", { fg = color.grey })
hi(0, "NormalNC", { fg = color.grey })
hi(0, "NotifyDEBUGBody", { link = "Normal" })
hi(0, "NotifyDEBUGBorder", { fg = color.bright_sky })
hi(0, "NotifyDEBUGIcon", { fg = color.bright_sky })
hi(0, "NotifyDEBUGTitle", { fg = color.bright_sky })
hi(0, "NotifyERRORBody", { link = "Normal" })
hi(0, "NotifyERRORBorder", { fg = color.red })
hi(0, "NotifyERRORIcon", { fg = color.red })
hi(0, "NotifyERRORTitle", { fg = color.red })
hi(0, "NotifyINFOBody", { link = "Normal" })
hi(0, "NotifyINFOBorder", { fg = color.grey })
hi(0, "NotifyINFOIcon", { fg = color.grey })
hi(0, "NotifyINFOTitle", { fg = color.grey })
hi(0, "NotifyTRACEBody", { link = "Normal" })
hi(0, "NotifyTRACEBorder", { fg = color.bright_sky })
hi(0, "NotifyTRACEIcon", { fg = color.bright_sky })
hi(0, "NotifyTRACETitle", { fg = color.bright_sky })
hi(0, "NotifyWARNBody", { link = "Normal" })
hi(0, "NotifyWARNBorder", { fg = color.pale_gold })
hi(0, "NotifyWARNIcon", { fg = color.pale_gold })
hi(0, "NotifyWARNTitle", { fg = color.pale_gold })
hi(0, "Number", { fg = color.light_brown })
hi(0, "NvimInternalError", { bg = color.red, ctermbg = 9, ctermfg = 9, fg = color.dark })
hi(0, "Operator", { fg = color.grey })
hi(0, "OutlineDetail", { fg = color._39 })
hi(0, "OutlineFoldPrefix", { fg = color._54 })
hi(0, "OutlineIndentEvn", { fg = color._53 })
hi(0, "OutlineIndentOdd", { fg = color._55 })
hi(0, "PreProc", { ctermfg = 81, fg = color.golden_yellow })
hi(0, "Question", { bold = true, ctermfg = 121, fg = color.light_blue })
hi(0, "QuickFixLine", { bg = color.background })
hi(0, "References", { bold = true, fg = color.light_lavender })
hi(0, "ReferencesIcon", { fg = color.bright_yellow_green })
hi(0, "Repeat", { fg = color.golden_yellow })
hi(0, "SagaShadow", { fg = color.dark })
hi(0, "ScrollbarCursor", { ctermfg = 0, fg = color.grey })
hi(0, "ScrollbarCursorHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.grey })
hi(0, "ScrollbarError", { ctermfg = 0, fg = color.red })
hi(0, "ScrollbarErrorHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.red })
hi(0, "ScrollbarGitAdd", { ctermfg = 0, fg = color.green })
hi(0, "ScrollbarGitAddHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.green })
hi(0, "ScrollbarGitChange", { ctermfg = 0, fg = color.bright_yellow_green })
hi(
0,
"ScrollbarGitChangeHandle",
{ bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.bright_yellow_green }
)
hi(0, "ScrollbarGitDelete", { ctermfg = 0, fg = color.red })
hi(0, "ScrollbarGitDeleteHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.red })
hi(0, "ScrollbarHandle", { bg = color.background, ctermbg = 15 })
hi(0, "ScrollbarHint", { ctermfg = 0, fg = color.bright_sky })
hi(0, "ScrollbarHintHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.bright_sky })
hi(0, "ScrollbarInfo", { ctermfg = 0, fg = color.grey })
hi(0, "ScrollbarInfoHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.grey })
hi(0, "ScrollbarMisc", { ctermfg = 0, fg = color.grey })
hi(0, "ScrollbarMiscHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.grey })
hi(0, "ScrollbarSearch", { ctermfg = 0, fg = color.background })
hi(0, "ScrollbarSearchHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.background })
hi(0, "ScrollbarWarn", { ctermfg = 0, fg = color.pale_gold })
hi(0, "ScrollbarWarnHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.pale_gold })
hi(0, "Search", { bg = color.golden_yellow, ctermbg = 11, ctermfg = 0, fg = color.background })
hi(0, "SignColumn", { ctermbg = 242, ctermfg = 14, fg = color.silver_gray })
hi(0, "SniprunFloatingWinErr", { ctermfg = 1, fg = color._38 })
hi(0, "SniprunFloatingWinOk", { ctermfg = 14, fg = color.bright_cyan })
hi(0, "SniprunVirtualTextErr", { bg = color._38, ctermbg = 1, fg = color.dark })
hi(0, "SniprunVirtualTextOk", { bg = color.bright_cyan, ctermbg = 14, fg = color.dark })
hi(0, "Special", { ctermfg = 224, fg = color.bright_sky })
hi(0, "SpecialChar", { fg = color.light_brown })
hi(0, "SpecialKey", { ctermfg = 81, fg = color.medium_gray })
hi(0, "SpellBad", { ctermbg = 9, sp = color.red, undercurl = true })
hi(0, "SpellCap", { ctermbg = 12, sp = color.light_blue, undercurl = true })
hi(0, "SpellLocal", { ctermbg = 14, sp = color.bright_sky, undercurl = true })
hi(0, "SpellRare", { ctermbg = 13, sp = color.pale_gold, undercurl = true })
hi(0, "Statement", { bold = true, ctermfg = 11, fg = color.red })
hi(0, "StatusLine", { bg = color.dark_grey, fg = color.grey })
hi(0, "StatusLineNC", { bg = color.background, fg = color.silver_gray })
hi(0, "StorageClass", { fg = color.golden_yellow })
hi(0, "String", { fg = color.light_olive_green })
hi(0, "Structure", { fg = color.pale_gold })
hi(0, "Substitute", { bg = color.golden_yellow, fg = color.background })
hi(0, "SymbolsOutlineConnector", { fg = color.medium_gray })
hi(0, "TSAnnotation", { fg = color.light_brown })
hi(0, "TSAttribute", { fg = color.golden_yellow })
hi(0, "TSBoolean", { fg = color.light_brown })
hi(0, "TSCharacter", { fg = color.red })
hi(0, "TSComment", { fg = color.comment, italic = true })
hi(0, "GitSignsCurrentLineBlame", { fg = color.comment, italic = true })
hi(0, "TSConditional", { fg = color.burnt_orange })
hi(0, "TSConstBuiltin", { fg = color.light_brown, italic = true })
hi(0, "TSMethodCall", { fg = color.pale_taupe })
hi(0, "TSFunctionCall", { fg = color.pale_taupe })
hi(0, "TSConstMacro", { fg = color.red })
hi(0, "TSConstant", { fg = color.lavender })
hi(0, "TSConstructor", { fg = color.light_blue })
hi(0, "TSCurrentScope", { bold = true })
hi(0, "TSDefinition", { sp = color.silver_gray, underline = true })
hi(0, "TSDefinitionUsage", { sp = color.silver_gray, underline = true })
hi(0, "TSEmphasis", { fg = color.light_brown, italic = true })
hi(0, "TSError", { fg = color.red })
hi(0, "TSException", { fg = color.red })
hi(0, "TSField", { fg = color.grey })
hi(0, "TSFloat", { fg = color.light_brown })
hi(0, "TSFuncBuiltin", { fg = color.burnt_orange, italic = true })
hi(0, "TSFuncMacro", { fg = color.red })
hi(0, "TSFunction", { fg = color._58 })
hi(0, "TSInclude", { fg = color.copper_brown })
hi(0, "TSKeyword", { fg = color.burnt_orange })
hi(0, "TSKeywordFunction", { fg = color.burnt_orange })
hi(0, "TSKeywordOperator", { fg = color.pale_gold })
hi(0, "TSLabel", { fg = color.lavender })
hi(0, "TSLiteral", { fg = color.light_brown })
hi(0, "TSMethod", { fg = color.pale_gold })
hi(0, "TSNamespace", { fg = color._61 })
hi(0, "TSNone", { fg = color.grey })
hi(0, "TSNumber", { fg = color._68 })
hi(0, "TSConstantBuiltin", { fg = color.copper_brown })
hi(0, "TSOperator", { fg = color.grey })
hi(0, "TSParameter", { fg = color.grey })
hi(0, "TSParameterReference", { fg = color.grey })
hi(0, "TSProperty", { fg = color.pale_gold })
hi(0, "TSPunctBracket", { fg = color.grey })
hi(0, "TSPunctDelimiter", { fg = color.light_brown })
hi(0, "TSPunctSpecial", { fg = color.grey })
hi(0, "TSRepeat", { fg = color.pale_gold })
hi(0, "TSStrike", { fg = color.dark, strikethrough = true })
hi(0, "TSString", { fg = color.olive_green })
hi(0, "TSStringEscape", { fg = color.bright_sky })
hi(0, "TSStringRegex", { fg = color.bright_sky })
hi(0, "TSStrong", { bold = true })
hi(0, "TSSymbol", { fg = color.light_olive_green })
hi(0, "TSTag", { fg = color.golden_yellow })
hi(0, "TSTagDelimiter", { fg = color.light_brown })
hi(0, "TSText", { fg = color.grey })
hi(0, "TSTitle", { fg = color.light_blue })
hi(0, "TSType", { fg = color._66 })
hi(0, "TSTypeDefinition", { fg = color.grey })
hi(0, "TSTypeBuiltin", { fg = color.burnt_orange, italic = true })
hi(0, "TSURI", { fg = color.light_brown, underline = true })
hi(0, "TSUnderline", { fg = color.dark, underline = true })
hi(0, "TSVariable", { fg = color.grey })
hi(0, "TSVariableBuiltin", { fg = color.burnt_orange, italic = true })
hi(0, "TabLine", { bg = color.background, ctermbg = 242, ctermfg = 15, fg = color.medium_gray })
hi(0, "TabLineFill", { bg = color.background, fg = color.medium_gray })
hi(0, "TabLineSel", { bg = color.background, fg = color.light_olive_green })
hi(0, "Tag", { fg = color.golden_yellow })
hi(0, "TargetFileName", { fg = color._50 })
-- telescope
if M.config.opt.integrations.telescope then
hi(0, "TelescopeBorder", { bg = color.very_dark_gray, fg = color.very_dark_gray })
hi(0, "TelescopeNormal", { bg = color.very_dark_gray })
hi(0, "TelescopePreviewLine", { bg = color.background })
hi(0, "TelescopePreviewTitle", { bg = color.light_olive_green, fg = color.very_dark_gray })
hi(0, "TelescopePromptBorder", { bg = color.dark_charcoal_gray, fg = color.dark_charcoal_gray })
hi(0, "TelescopePromptNormal", { bg = color.dark_charcoal_gray, fg = color.grey })
hi(0, "TelescopePromptPrefix", { bg = color.dark_charcoal_gray, fg = color.red })
hi(0, "TelescopePromptTitle", { bg = color.red, fg = color.very_dark_gray })
hi(0, "TelescopeResultsTitle", { bg = color.very_dark_gray, fg = color.very_dark_gray })
hi(0, "TelescopeSelection", { bg = color.dark_charcoal_gray })
end
hi(0, "TermCursor", { bg = color.very_light_gray, fg = color.dark })
hi(0, "TermCursorNC", { bg = color.very_light_gray, fg = color.dark })
hi(0, "Title", { ctermfg = 225, fg = color.light_blue })
hi(0, "Todo", { bg = color.background, ctermbg = 11, ctermfg = 0, fg = color.golden_yellow })
hi(0, "TooLong", { fg = color.red })
hi(0, "TreesitterContext", { bg = color.background, italic = true })
hi(0, "Type", { ctermfg = 121, fg = color._66 })
hi(0, "Typedef", { fg = color.golden_yellow })
hi(0, "Underlined", { ctermfg = 81, fg = color.red, underline = true })
hi(0, "User1", { bg = color.dark_grey, fg = color.red })
hi(0, "User2", { bg = color.dark_grey, fg = color.pale_gold })
hi(0, "User3", { bg = color.dark_grey, fg = color.grey })
hi(0, "User4", { bg = color.dark_grey, fg = color.bright_sky })
hi(0, "User5", { bg = color.dark_grey, fg = color.grey })
hi(0, "User6", { bg = color.background, fg = color.grey })
hi(0, "User7", { bg = color.dark_grey, fg = color.grey })
hi(0, "User8", { bg = color.dark_grey, fg = color.dark })
hi(0, "User9", { bg = color.dark_grey, fg = color.dark })
hi(0, "VertSplit", { fg = color.grey })
hi(0, "WinSeparator", { fg = color.grey })
hi(0, "Visual", { bg = color.dark_grey, ctermbg = 242 })
hi(0, "VisualNOS", { fg = color.red })
hi(0, "WarningMsg", { ctermfg = 224, fg = color.red })
hi(0, "WildMenu", { bg = color.golden_yellow, ctermbg = 11, ctermfg = 0, fg = color.red })
hi(0, "WinBar", { fg = color.grey })
hi(0, "WinBarNC", { fg = color.silver_gray })
hi(0, "gitcommitBranch", { bold = true, fg = color.light_brown })
hi(0, "gitcommitComment", { fg = color.medium_gray })
hi(0, "gitcommitDiscarded", { fg = color.medium_gray })
hi(0, "gitcommitDiscardedFile", { bold = true, fg = color.red })
hi(0, "gitcommitDiscardedType", { fg = color.light_blue })
hi(0, "gitcommitHeader", { fg = color.pale_gold })
hi(0, "gitcommitOverflow", { fg = color.red })
hi(0, "gitcommitSelected", { fg = color.medium_gray })
hi(0, "gitcommitSelectedFile", { bold = true, fg = color.light_olive_green })
hi(0, "gitcommitSelectedType", { fg = color.light_blue })
hi(0, "gitcommitSummary", { fg = color.light_olive_green })
hi(0, "gitcommitUnmergedFile", { bold = true, fg = color.red })
hi(0, "gitcommitUnmergedType", { fg = color.light_blue })
hi(0, "gitcommitUntracked", { fg = color.medium_gray })
hi(0, "gitcommitUntrackedFile", { fg = color.golden_yellow })
hi(0, "iCursor", { bg = color._72, fg = color.very_light_gray })
hi(0, "lCursor", { bg = color.very_light_gray, fg = color.dark })
if M.config.opt.integrations.lualine then
hi(0, "lualine_a_command", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_inactive", { bg = color.light_slate_gray, bold = true, fg = color.dark })
hi(0, "lualine_a_insert", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_normal", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_replace", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_visual", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_b_command", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_diagnostics_error_command", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_inactive", { bg = color.light_slate_gray, fg = color.red })
hi(0, "lualine_b_diagnostics_error_insert", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_normal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_replace", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_terminal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_visual", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_hint_command", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_inactive", { bg = color.light_slate_gray, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_insert", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_normal", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_replace", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_terminal", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_visual", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_info_command", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_inactive", { bg = color.light_slate_gray, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_insert", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_normal", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_replace", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_terminal", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_visual", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_warn_command", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_inactive", { bg = color.light_slate_gray, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_insert", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_normal", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_replace", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_terminal", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_visual", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diff_added_command", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_inactive", { bg = color.light_slate_gray, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_insert", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_normal", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_replace", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_terminal", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_visual", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_modified_command", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_inactive", { bg = color.light_slate_gray, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_insert", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_normal", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_replace", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_terminal", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_visual", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_removed_command", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_inactive", { bg = color.light_slate_gray, fg = color.red })
hi(0, "lualine_b_diff_removed_insert", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_normal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_replace", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_terminal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_visual", { bg = color.green, fg = color.red })
hi(0, "lualine_b_inactive", { bg = color.light_slate_gray, fg = color.dark })
hi(0, "lualine_b_insert", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_normal", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_replace", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_visual", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_command", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_inactive", { bg = color.light_slate_gray, fg = color.dark })
hi(0, "lualine_c_insert", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_normal", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_replace", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_visual", { bg = color.green, fg = color.dark })
hi(0, "lualine_x_2_command", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_inactive", { bg = color.light_slate_gray, fg = color.peach_orange })
hi(0, "lualine_x_2_insert", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_normal", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_replace", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_terminal", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_visual", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_filetype_DevIconDefault_command", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_inactive", { bg = color.light_slate_gray, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_insert", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_normal", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_replace", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_terminal", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_visual", { bg = color.green, fg = color.slate_gray })
end
-- nvim-ts-rainbow
hi(0, "rainbowcol1", { fg = color.very_light_gray })
hi(0, "rainbowcol2", { fg = color.light_brown })
hi(0, "rainbowcol3", { fg = color.golden_yellow })
hi(0, "rainbowcol4", { fg = color.very_light_gray })
hi(0, "rainbowcol5", { fg = color.bright_sky })
hi(0, "rainbowcol6", { fg = color.light_blue })
hi(0, "rainbowcol7", { fg = color.pale_gold })
hi(0, "@lsp.type.keyword.go", { link = "TSKeyword" })
hi(0, "@lsp.type.string.go", { link = "TSString" })
hi(0, "Statement", { link = "TSKeyword" })
hi(0, "Comment", { link = "TSComment" })
hi(0, "Number", { link = "TSNumber" })
hi(0, "String", { link = "TSString" })
hi(0, "goImportString", { link = "TSString" })
hi(0, "@lsp.type.function", { link = "TSMethodCall" })
hi(0, "@lsp.typemod.function.definition", { link = "TSFunction" })
hi(0, "@lsp.type.method", { link = "TSMethod" })
hi(0, "goBlock", { link = "TSVariable" })
hi(0, "Identifier", { link = "TSKeyword" })
-- Terminal colors
local g = vim.g
g.terminal_color_0 = color.dark
g.terminal_color_1 = color.red
g.terminal_color_2 = color.light_olive_green
g.terminal_color_3 = color.golden_yellow
g.terminal_color_4 = color.light_blue
g.terminal_color_5 = color.pale_gold
g.terminal_color_6 = color.bright_sky
g.terminal_color_7 = color.very_light_gray
g.terminal_color_8 = color.medium_gray
g.terminal_color_9 = color.red
g.terminal_color_10 = color.light_olive_green
g.terminal_color_11 = color.golden_yellow
g.terminal_color_12 = color.light_blue
g.terminal_color_13 = color.pale_gold
g.terminal_color_14 = color.bright_sky
g.terminal_color_15 = color.very_light_gray
-- Snacks Dashboard
hi(0, "SnacksDashboardHeader", { fg = color.golden_yellow, bold = true })
hi(0, "SnacksDashboardTitle", { fg = color.pale_gold, bold = true })
hi(0, "SnacksDashboardIcon", { fg = color.light_blue })
hi(0, "SnacksDashboardDesc", { fg = color.light_slate_gray })
hi(0, "SnacksDashboardFile", { fg = color.pale_gold, bold = true })
hi(0, "SnacksDashboardKey", { fg = color.burnt_orange })
hi(0, "SnacksDashboardSpecial", { fg = color.light_slate_gray })
hi(0, "SnacksDashboardDir", { fg = color.light_slate_gray })
hi(0, "SnacksDashboardNormal", { fg = color.light_slate_gray })
hi(0, "SnacksDashboardTerminal", { fg = color.light_slate_gray })
hi(0, "SnacksDashboardFooter", { fg = color.light_slate_gray })
-- Neo-Tree
hi(0, "NeoTreeFileName", { fg = color.light_slate_gray })
hi(0, "NeoTreeDotfile", { fg = color.comment })
hi(0, "NeoTreeDirectoryName", { fg = color.pale_gold })
hi(0, "NeoTreeDirectoryIcon", { fg = color.pale_gold })
hi(0, "NeoTreeGitModified", { fg = color.burnt_orange })
hi(0, "NeoTreeGitStaged", { fg = color.olive_green })
hi(0, "NeoTreeGitUntracked", { fg = color.lavender })
hi(0, "NeoTreeNormal", { fg = color.light_slate_gray, bg = color.very_dark_gray })
hi(0, "NeoTreeNormalNC", { fg = color.light_slate_gray, bg = color.very_dark_gray })
hi(0, "NeoTreeTabActive", { fg = color.light_slate_gray, bg = color.very_dark_gray, bold = true })
hi(0, "NeoTreeTabInactive", { fg = color.dark_grey, bg = color.very_dark_gray })
hi(0, "NeoTreeTabSeparatorActive", { fg = color.light_slate_gray, bg = color.very_dark_gray })
hi(0, "NeoTreeTabSeparatorInactive", { fg = color.light_slate_gray, bg = color.dark_grey })
end
return M

33
nvim/lua/custom/init.lua
View file

@ -1,33 +0,0 @@
-- ========== Telescope ============= --
require("telescope").load_extension("noice")
require("telescope.themes").get_dropdown()
-- ========== Theme ============= --
require("custom.darcula").setup()
-- ========== Theme ============= --
require("custom.timetracker").setup()
-- ========== Make ============= --
require("custom.make")
-- ========== Formating ============= --
-- vim.api.nvim_create_autocmd("BufWritePre", {
-- pattern = { "*.c", "*.cpp", "*.h", "*.hpp", "*.go" },
-- callback = function()
-- vim.lsp.buf.format()
-- end,
-- })
-- ========== Clipboard ============= --
vim.o.clipboard = "unnamedplus"
vim.api.nvim_create_autocmd("TextYankPost", {
callback = function()
-- vim.highlight.on_yank()
local copy_to_unnamedplus = require("vim.ui.clipboard.osc52").copy("+")
copy_to_unnamedplus(vim.v.event.regcontents)
local copy_to_unnamed = require("vim.ui.clipboard.osc52").copy("*")
copy_to_unnamed(vim.v.event.regcontents)
end,
})

184
nvim/lua/custom/make.lua
View file

@ -1,184 +0,0 @@
_G.last_make_command = nil
_G.make_terminal_buf = nil
_G.build_targets = {}
local config_file = vim.fn.stdpath('config') .. '/build_targets.json'
-- Загрузка таргетов из файла
local function load_targets()
local ok, data = pcall(vim.fn.readfile, config_file)
if ok and data[1] then
_G.build_targets = vim.fn.json_decode(data[1])
else
_G.build_targets = {}
end
end
-- Сохранение таргетов в файл
local function save_targets()
local data = vim.fn.json_encode(_G.build_targets)
vim.fn.writefile({data}, config_file)
end
-- Загружаем таргеты при старте
load_targets()
local function run_make_command(command)
if _G.make_terminal_buf and vim.api.nvim_buf_is_valid(_G.make_terminal_buf) then
vim.cmd('buffer ' .. _G.make_terminal_buf)
else
vim.cmd('terminal')
_G.make_terminal_buf = vim.api.nvim_get_current_buf()
end
vim.cmd('startinsert')
vim.defer_fn(function()
if vim.b.terminal_job_id then
vim.fn.chansend(vim.b.terminal_job_id, "clear\n")
vim.fn.chansend(vim.b.terminal_job_id, command .. "\n")
end
end, 300)
end
-- Основная команда сборки (оставьте вашу текущую)
vim.api.nvim_create_user_command('Build', function()
vim.ui.input({
prompt = 'Флаги сборки: ',
default = '',
}, function(flags)
if flags == nil then return end
vim.ui.input({
prompt = 'Имя проекта: ',
default = '',
}, function(project_name)
if project_name == nil then return end
local make_cmd = "meson compile" .. flags .. " " .. project_name
_G.last_make_command = make_cmd
run_make_command(make_cmd)
vim.notify("🔨 Сборка запущена: " .. make_cmd)
end)
end)
end, {
desc = "Сборка проекта в терминале"
})
vim.api.nvim_create_user_command('TargetNew', function()
vim.ui.input({
prompt = 'Название таргета: ',
default = '',
}, function(target_name)
if target_name == nil or target_name == '' then return end
vim.ui.input({
prompt = 'Команда сборки для "' .. target_name .. '": ',
default = '',
}, function(build_command)
if build_command == nil or build_command == '' then return end
_G.build_targets[target_name] = build_command
save_targets()
vim.notify("✅ Таргет '" .. target_name .. "' сохранен")
end)
end)
end, {
desc = "Создать новый таргет сборки"
})
-- ПЕРЕПИСАННАЯ команда для выбора таргета с использованием vim.ui.select
vim.api.nvim_create_user_command('Target', function()
local target_count = 0
for _ in pairs(_G.build_targets) do
target_count = target_count + 1
end
if target_count == 0 then
vim.notify("❌ Нет сохраненных таргетов. Используйте :TargetNew", vim.log.levels.ERROR)
return
end
-- Подготавливаем список для vim.ui.select
local targets_list = {}
for name, cmd in pairs(_G.build_targets) do
table.insert(targets_list, {
name = name,
cmd = cmd,
-- Форматируем для красивого отображения
display = string.format("🔨 %s\n 📝 %s", name, cmd)
})
end
-- Сортируем по имени
table.sort(targets_list, function(a, b) return a.name < b.name end)
vim.ui.select(targets_list, {
prompt = '📋 Выберите таргет сборки:',
format_item = function(item)
return item.display
end,
}, function(selected)
if not selected then
vim.notify("❌ Выбор отменен", vim.log.levels.WARN)
return
end
_G.last_make_command = selected.cmd
run_make_command(selected.cmd)
vim.notify("🔨 Запускаю: " .. selected.cmd)
end)
end, {
desc = "Выбрать таргет сборки"
})
-- Команда для просмотра всех таргетов
vim.api.nvim_create_user_command('TargetList', function()
local target_count = 0
for _ in pairs(_G.build_targets) do
target_count = target_count + 1
end
if target_count == 0 then
print("📝 Список таргетов пуст")
return
end
print("📋 Сохраненные таргеты сборки:")
local targets_list = {}
for name, cmd in pairs(_G.build_targets) do
table.insert(targets_list, { name = name, cmd = cmd })
end
table.sort(targets_list, function(a, b) return a.name < b.name end)
for i, target in ipairs(targets_list) do
print(string.format(" %d. %s → %s", i, target.name, target.cmd))
end
end, {
desc = "Показать список всех таргетов"
})
-- Команда для удаления таргета (уже использует vim.ui.select - оставляем как есть)
vim.api.nvim_create_user_command('TargetDelete', function()
local target_count = 0
for _ in pairs(_G.build_targets) do
target_count = target_count + 1
end
if target_count == 0 then
vim.notify("❌ Нет сохраненных таргетов", vim.log.levels.ERROR)
return
end
local targets_list = {}
for name, cmd in pairs(_G.build_targets) do
table.insert(targets_list, name)
end
table.sort(targets_list)
vim.ui.select(targets_list, {
prompt = 'Выберите таргет для удаления:',
}, function(selected)
if not selected then return end
_G.build_targets[selected] = nil
save_targets()
vim.notify("🗑️ Таргет '" .. selected .. "' удален")
end)
end, {
desc = "Удалить таргет сборки"
})
-- Повтор последней сборки (оставьте вашу текущую)
vim.api.nvim_create_user_command('LastBuild', function()
if _G.last_make_command then
run_make_command(_G.last_make_command)
vim.notify("🔁 Повторяю: " .. _G.last_make_command)
else
vim.notify("❌ Нет истории сборок", vim.log.levels.ERROR)
end
end, {
desc = "Повторить последнюю сборку в терминале"
})

234
nvim/lua/custom/timetracker.lua
View file

@ -1,234 +0,0 @@
local M = {}
local uv = vim.loop
local data_dir = vim.fn.stdpath("data") .. "/time_tracker"
local stats_file = data_dir .. "/stats.json"
local heartbeat_file = data_dir .. "/heartbeat_" .. vim.fn.getpid()
local timer = nil
local last_tick = os.time()
--------------------------------------------------
-- Utils
--------------------------------------------------
local function ensure_dir()
vim.fn.mkdir(data_dir, "p")
end
local function read_stats()
local f = io.open(stats_file, "r")
if not f then return {} end
local content = f:read("*a")
f:close()
return vim.json.decode(content) or {}
end
local function write_stats(data)
local f = io.open(stats_file, "w")
if not f then return end
f:write(vim.json.encode(data))
f:close()
end
local function format_time(seconds)
local h = math.floor(seconds / 3600)
local m = math.floor((seconds % 3600) / 60)
return string.format("%dh %dm", h, m)
end
local function current_filetype()
return vim.bo.filetype ~= "" and vim.bo.filetype or "unknown"
end
--------------------------------------------------
-- Time tracking
--------------------------------------------------
local function update_heartbeat()
local f = io.open(heartbeat_file, "w")
if f then
f:write(os.time())
f:close()
end
end
local function add_time(seconds)
local stats = read_stats()
local date = os.date("%Y-%m-%d")
local ft = current_filetype()
stats[date] = stats[date] or { total = 0, languages = {} }
stats[date].total = stats[date].total + seconds
stats[date].languages[ft] =
(stats[date].languages[ft] or 0) + seconds
write_stats(stats)
end
local function start_timer()
timer = uv.new_timer()
timer:start(0, 5000, vim.schedule_wrap(function()
local now = os.time()
local diff = now - last_tick
last_tick = now
update_heartbeat()
add_time(diff)
end))
end
local function cleanup()
os.remove(heartbeat_file)
end
--------------------------------------------------
-- :TimeToday
--------------------------------------------------
local function show_today()
local stats = read_stats()
local today = os.date("%Y-%m-%d")
local data = stats[today]
if not data then
vim.notify("No activity today 🚀", vim.log.levels.INFO)
return
end
local lines = {}
table.insert(lines, "📅 " .. today)
table.insert(lines, "")
table.insert(lines, "Total: " .. format_time(data.total))
table.insert(lines, "")
table.insert(lines, "Languages:")
for lang, time in pairs(data.languages) do
table.insert(lines, string.format(" %s: %s", lang, format_time(time)))
end
vim.notify(table.concat(lines, "\n"), vim.log.levels.INFO, {
title = "Nvim Time Tracker",
})
end
--------------------------------------------------
-- Heatmap
--------------------------------------------------
local function setup_highlights()
vim.api.nvim_set_hl(0, "TimeHeat0", { fg = "#2d333b" })
vim.api.nvim_set_hl(0, "TimeHeat1", { fg = "#0e4429" })
vim.api.nvim_set_hl(0, "TimeHeat2", { fg = "#006d32" })
vim.api.nvim_set_hl(0, "TimeHeat3", { fg = "#26a641" })
vim.api.nvim_set_hl(0, "TimeHeat4", { fg = "#39d353" })
end
local function get_level(seconds)
if seconds == 0 then return 0 end
if seconds < 1800 then return 1 end
if seconds < 7200 then return 2 end
if seconds < 14400 then return 3 end
return 4
end
local function build_matrix()
local stats = read_stats()
local matrix = {}
for w = 1, 53 do
matrix[w] = {}
for d = 1, 7 do
matrix[w][d] = 0
end
end
local today = os.time()
for i = 0, 364 do
local ts = today - i * 86400
local date = os.date("%Y-%m-%d", ts)
local weekday = tonumber(os.date("%w", ts))
weekday = weekday == 0 and 7 or weekday
local week = math.floor((364 - i) / 7) + 1
if week <= 53 then
matrix[week][weekday] =
stats[date] and stats[date].total or 0
end
end
return matrix
end
local function show_year()
setup_highlights()
local matrix = build_matrix()
local buf = vim.api.nvim_create_buf(false, true)
local lines = {}
table.insert(lines, " 📈 Nvim Activity — Last 365 Days")
table.insert(lines, "")
for day = 1, 7 do
local line = ""
for week = 1, 53 do
line = line .. "██"
end
table.insert(lines, line)
end
vim.api.nvim_buf_set_lines(buf, 0, -1, false, lines)
for day = 1, 7 do
for week = 1, 53 do
local seconds = matrix[week][day]
local level = get_level(seconds)
vim.api.nvim_buf_add_highlight(
buf,
-1,
"TimeHeat" .. level,
day + 1,
(week - 1) * 2,
(week - 1) * 2 + 2
)
end
end
local width = 53 * 2 + 4
local height = 10
local win = vim.api.nvim_open_win(buf, true, {
relative = "editor",
width = width,
height = height,
row = math.floor((vim.o.lines - height) / 2),
col = math.floor((vim.o.columns - width) / 2),
style = "minimal",
border = "rounded",
})
vim.keymap.set("n", "q", function()
vim.api.nvim_win_close(win, true)
end, { buffer = buf })
end
--------------------------------------------------
-- Setup
--------------------------------------------------
function M.setup()
ensure_dir()
start_timer()
vim.api.nvim_create_user_command("TimeToday", show_today, {})
vim.api.nvim_create_user_command("TimeYear", show_year, {})
vim.api.nvim_create_autocmd("VimLeavePre", {
callback = cleanup,
})
end
return M

35
nvim/lua/mappings.lua
View file

@ -7,6 +7,11 @@ map("n", "<leader>t", "<cmd>terminal<CR>", { desc = "Create new terminal" })
map("t", "jk", "<C-\\><C-n>")
map("n", "<leader>h", "<C-w>s | <cmd>terminal<CR> | i");
-- ========== Undotree =========== --
vim.cmd("packadd nvim.undotree")
map("n", "<leader>u", require("undotree").open)
-- ========== Debug =========== --
map('n', '<leader>db', '<cmd>DapToggleBreakpoint<CR>', { desc = 'Toggle breakpoint' })
map('n', '<leader>dr', '<cmd>DapContinue<CR>', { desc = 'Start/continue debug' })
@ -21,9 +26,12 @@ map('n', '<leader>lo', '<cmd>lua vim.diagnostic.open_float()<CR>',
{ noremap = true, silent = true, desc = 'Open diagnostic' })
map("n", "<leader>ll", '<cmd>lua vim.lsp.buf.code_action()<CR>',
{ noremap = true, silent = true, desc = 'Show complete by lsp' })
map('n', '[l', '<cmd>DapContinue<CR>', { noremap = true, silent = true, desc = 'Go to prev diagnostic' })
map('n', ']l', '<cmd>DapStepOver<CR>', { noremap = true, silent = true, desc = 'Go to next diagnostic' })
map('n', '<leader>lt', '<cmd>DapStepInto<CR>', { noremap = true, silent = true, desc = 'Open toggle' })
map('n', '[l', function() vim.diagnostic.jump({ count = -1 }) end,
{ noremap = true, silent = true, desc = 'Go to prev diagnostic' })
map('n', ']l', function() vim.diagnostic.jump({ count = 1 }) end,
{ noremap = true, silent = true, desc = 'Go to next diagnostic' })
map('n', '<leader>lt', vim.diagnostic.setloclist,
{ noremap = true, silent = true, desc = 'Toggle diagnostics list' })
map("n", "<leader>ls", vim.diagnostic.setloclist, { desc = "LSP diagnostic loclist" })
map('n', '<leader>lu', function() vim.diagnostic.enable(not vim.diagnostic.is_enabled()) end,
{ desc = "Toggle Diagnostics" })
@ -52,9 +60,9 @@ map("i", "<C-k>", "<Up>", { desc = "move up" })
map("n", "<leader>/", "gcc", { desc = "toggle comment", remap = true })
map("v", "<leader>/", "gc", { desc = "toggle comment", remap = true })
-- ========== Nvim-tree ============= --
map("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "nvimtree toggle window" })
map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "nvimtree focus window" })
-- ========== Neotree ============= --
map("n", "<C-n>", "<cmd>Neotree toggle<CR>", { desc = "nvimtree toggle window" })
map("n", "<leader>e", "<cmd>Neotree focus<CR>", { desc = "nvimtree focus window" })
-- ========== Telescope ============= --
map("n", "<leader>fw", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
@ -76,8 +84,8 @@ map("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
-- ========== Buffers ============= --
map("n", "<leader>x", function()
local bufnr = vim.api.nvim_get_current_buf()
local buftype = vim.api.nvim_buf_get_option(bufnr, 'buftype')
local modified = vim.api.nvim_buf_get_option(bufnr, 'modified')
local buftype = vim.bo[bufnr].buftype
local modified = vim.bo[bufnr].modified
if buftype == 'terminal' then
vim.cmd('bp | sp | bn | bd!')
@ -90,9 +98,14 @@ map("n", "<leader>x", function()
vim.cmd('bp | sp | bn | bd')
end
end, { desc = "Close buffer" })
map("n", "<leader>e", "<cmd>enew<CR>", { desc = "Create buffer" })
map("n", "<leader>n", "<cmd>enew<CR>", { desc = "Create buffer" })
map("n", "<tab>", "<cmd>BufferLineCycleNext<CR>", { desc = "Go to next buffer" })
map("n", "<S-tab>", "<cmd>BufferLineCyclePrev<CR>", { desc = "Go to prev buffer" })
map("n", "<leader>bt", "<cmd>BufferLineGroupToggle tests<CR>", { desc = "Toggle 'tests' group" })
map("n", "<leader>bc", "<cmd>BufferLineGroupToggle code<CR>", { desc = "Toggle 'code' group" })
map("n", "<leader>bp", "<cmd>BufferLineGroupToggle tornado<CR>", { desc = "Toggle 'tornado' group" })
map("n", "<leader>bg", "<cmd>BufferLineGroupToggle gornado<CR>", { desc = "Toggle 'gornado' group" })
-- ========== Git ============= --
map("n", "<leader>gb", "<cmd>Gitsigns blame<CR>", { desc = "Open blame for file" })
@ -102,8 +115,8 @@ map("n", "<leader>gct", "<cmd>GitConflictChooseTheirs<CR>", { desc = "Select the
map("n", "<leader>gcb", "<cmd>GitConflictChooseBoth<CR>", { desc = "Seletct both changes" })
map("n", "<leader>gcn", "<cmd>GitConflictNextConflict<CR>", { desc = "Move to the next conflict" })
map("n", "<leader>gcp", "<cmd>GitConflictPrevConflict<CR>", { desc = "Move to the previous conflict" })
map("n", "<leader>ghn", "<cmd>Gitsigns blame<CR>", { desc = "Show hunk in normal mode" })
map("n", "<leader>ghi", "<cmd>Gitsigns blame<CR>", { desc = "Show hunk inline" })
map("n", "<leader>ghn", "<cmd>Gitsigns preview_hunk<CR>", { desc = "Show hunk in normal mode" })
map("n", "<leader>ghi", "<cmd>Gitsigns preview_hunk_inline<CR>", { desc = "Show hunk inline" })
map("n", "<leader>gd", "<cmd>Gitsigns diffthis<CR>", { desc = "Show diff of buffer" })
map("n", "<leader>gs", "<cmd>Gitsigns stage_buffer<CR>", { desc = "Stage this buffer" })
map("n", "<leader>gu", "<cmd>Gitui<CR>", { desc = "Stage this buffer" })

43
nvim/lua/plugins/common.lua
View file

@ -4,10 +4,6 @@ return {
"nvim-tree/nvim-web-devicons",
opts = {},
},
{
'nvim-mini/mini.nvim',
version = '*'
},
-- Screenkey
{
"NStefan002/screenkey.nvim",
@ -25,7 +21,7 @@ return {
"lewis6991/gitsigns.nvim",
event = { "BufReadPre", "BufNewFile" },
opts = function()
require("configs.gitsigns")
return require("configs.gitsigns")
end,
},
{
@ -33,26 +29,6 @@ return {
version = "*",
config = true
},
-- Nvim tree
{
"nvim-tree/nvim-tree.lua",
cmd = { "NvimTreeToggle", "NvimTreeFocus" },
opts = function()
return require "configs.nvimtree"
end,
},
-- Pairs
{
"nvim-mini/mini.pairs",
event = { "BufReadPost", "BufNewFile" },
opts = {
modes = { insert = true, command = true, terminal = false },
skip_next = [=[[%w%%%'%[%"%.%`%$]]=],
skip_ts = { "string" },
skip_unbalanced = true,
markdown = true,
},
},
-- Formating
{
"stevearc/conform.nvim",
@ -61,11 +37,6 @@ return {
require "configs.conform"
end,
},
-- Yank highlight
{
"machakann/vim-highlightedyank",
event = "VeryLazy",
},
-- Sessions
{
"olimorris/persisted.nvim",
@ -78,4 +49,16 @@ return {
autoload = false,
},
},
-- Navigation
{
"folke/flash.nvim",
event = "VeryLazy",
opts = {},
keys = {
{ "<leader>jj", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash jump" },
{ "<leader>jt", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash treesitter" },
{ "<leader>jr", mode = "o", function() require("flash").remote() end, desc = "Flash remote" },
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash search" },
},
},
}

33
nvim/lua/plugins/development.lua
View file

@ -15,7 +15,17 @@ return {
-- Mason lspconfig
{
"mason-org/mason-lspconfig.nvim",
opts = {},
opts = {
ensure_installed = {
"clangd",
"gopls",
"phpactor",
"lua_ls",
"bashls",
"mesonlsp",
},
automatic_enable = true,
},
dependencies = {
"mason-org/mason.nvim",
"neovim/nvim-lspconfig",
@ -100,6 +110,7 @@ return {
"diff",
"gitcommit",
"gitignore",
"tla",
},
callback = function(args)
pcall(vim.treesitter.start, args.buf)
@ -133,24 +144,6 @@ return {
require("configs.ufo")
end
},
-- Tests
{
"nvim-neotest/neotest",
event = "VeryLazy",
dependencies = {
"nvim-lua/plenary.nvim",
"alfaix/neotest-gtest",
"olimorris/neotest-phpunit",
},
config = function()
require("neotest").setup({
adapters = {
require("neotest-phpunit"),
require("neotest-gtest").setup({}),
},
})
end,
},
-- These are for C/C++ Debbuger
{
"nvim-neotest/nvim-nio",
@ -172,7 +165,7 @@ return {
"jay-babu/mason-nvim-dap.nvim",
event = "VeryLazy",
dependencies = {
"williamboman/mason.nvim",
"mason-org/mason.nvim",
"mfussenegger/nvim-dap",
},
opts = {

41
nvim/lua/plugins/filetree.lua Normal file
View file

@ -0,0 +1,41 @@
return {
{
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
opts = require("configs.neotree"),
dependencies = {
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
"nvim-tree/nvim-web-devicons",
},
},
{
"Crysthamus/nvim-file-operations",
-- branch = "compat" -- if you are on Neovim <= 0.10
dependencies = {
"nvim-neo-tree/neo-tree.nvim", -- makes sure that this loads after Neo-tree.
},
config = function()
require("nvim-file-operations").setup()
end,
},
{
"s1n7ax/nvim-window-picker",
version = "2.*",
config = function()
require("window-picker").setup({
filter_rules = {
include_current_win = false,
autoselect_one = true,
-- filter using buffer options
bo = {
-- if the file type is one of following, the window will be ignored
filetype = { "neo-tree", "neo-tree-popup", "notify" },
-- if the buffer type is one of following, the window will be ignored
buftype = { "terminal", "quickfix" },
},
},
})
end,
},
}

8
nvim/lua/plugins/joke.lua
View file

@ -1,8 +0,0 @@
return {
{
'kwakzalver/duckytype.nvim',
config = function()
require('duckytype').setup {}
end
},
}

18
nvim/lua/plugins/noice.lua
View file

@ -1,14 +1,16 @@
return {
"folke/noice.nvim",
event = "VeryLazy",
opts ={
-- add any options here
},
dependencies = {
"MunifTanjim/nui.nvim",
"rcarriga/nvim-notify",
{
"rcarriga/nvim-notify",
opts = {
background_colour = "#000000",
},
},
},
config = {
opts = {
lsp = {
signature = {
enabled = false,
@ -22,9 +24,9 @@ return {
},
},
presets = {
long_message_to_split = true, -- long messages will be sent to a split
inc_rename = false, -- enables an input dialog for inc-rename.nvim
lsp_doc_border = false, -- add a border to hover docs and signature help
long_message_to_split = true,
inc_rename = false,
lsp_doc_border = false,
},
}
}

5
nvim/lua/plugins/snacks.lua
View file

@ -26,6 +26,7 @@ return {
---@type snacks.dashboard.Item[]
keys = {
{ icon = "", key = "f", desc = "Find File", action = ":lua Snacks.dashboard.pick('files')" },
{ icon = "", key = "o", desc = "Find In Old Files", action = ":Telescope oldfiles" },
{ icon = "", key = "n", desc = "New File", action = ":ene | startinsert" },
{ icon = "", key = "g", desc = "Find Text", action = ":lua Snacks.dashboard.pick('live_grep')" },
{ icon = "", key = "r", desc = "Recent Files", action = ":lua Snacks.dashboard.pick('oldfiles')" },
@ -91,8 +92,8 @@ return {
explorer = { enabled = false },
indent = { enabled = true },
input = { enabled = true },
picker = { enabled = true },
notifier = { enabled = true },
picker = { enabled = false },
notifier = { enabled = false },
quickfile = { enabled = true },
scope = { enabled = true },
scroll = { enabled = true },

4
nvim/lua/plugins/telescope.lua
View file

@ -2,7 +2,7 @@ return {
"nvim-telescope/telescope.nvim",
dependencies = { "nvim-treesitter/nvim-treesitter" },
cmd = "Telescope",
configs = function()
return require "configs.telescope"
config = function()
require "configs.telescope"
end,
}

0
nvim/nvim/lua/configs/treesitter.lua → nvim/lua/plugins/temp.lua
View file

84
nvim/nvim/lua/custom/darcula.lua → nvim/lua/themes/darcula.lua
View file

@ -647,90 +647,6 @@ M.configure_highlights = function()
hi(0, "iCursor", { bg = color._72, fg = color.very_light_gray })
hi(0, "lCursor", { bg = color.very_light_gray, fg = color.dark })
if M.config.opt.integrations.lualine then
hi(0, "lualine_a_command", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_inactive", { bg = color.light_slate_gray, bold = true, fg = color.dark })
hi(0, "lualine_a_insert", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_normal", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_replace", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_a_visual", { bg = color.green, bold = true, fg = color.dark })
hi(0, "lualine_b_command", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_diagnostics_error_command", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_inactive", { bg = color.light_slate_gray, fg = color.red })
hi(0, "lualine_b_diagnostics_error_insert", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_normal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_replace", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_terminal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_error_visual", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diagnostics_hint_command", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_inactive", { bg = color.light_slate_gray, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_insert", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_normal", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_replace", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_terminal", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_hint_visual", { bg = color.green, fg = color.bright_sky })
hi(0, "lualine_b_diagnostics_info_command", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_inactive", { bg = color.light_slate_gray, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_insert", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_normal", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_replace", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_terminal", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_info_visual", { bg = color.green, fg = color.grey })
hi(0, "lualine_b_diagnostics_warn_command", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_inactive", { bg = color.light_slate_gray, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_insert", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_normal", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_replace", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_terminal", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diagnostics_warn_visual", { bg = color.green, fg = color.pale_gold })
hi(0, "lualine_b_diff_added_command", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_inactive", { bg = color.light_slate_gray, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_insert", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_normal", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_replace", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_terminal", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_added_visual", { bg = color.green, fg = color.light_olive_green })
hi(0, "lualine_b_diff_modified_command", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_inactive", { bg = color.light_slate_gray, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_insert", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_normal", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_replace", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_terminal", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_modified_visual", { bg = color.green, fg = color.light_blue })
hi(0, "lualine_b_diff_removed_command", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_inactive", { bg = color.light_slate_gray, fg = color.red })
hi(0, "lualine_b_diff_removed_insert", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_normal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_replace", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_terminal", { bg = color.green, fg = color.red })
hi(0, "lualine_b_diff_removed_visual", { bg = color.green, fg = color.red })
hi(0, "lualine_b_inactive", { bg = color.light_slate_gray, fg = color.dark })
hi(0, "lualine_b_insert", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_normal", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_replace", { bg = color.green, fg = color.dark })
hi(0, "lualine_b_visual", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_command", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_inactive", { bg = color.light_slate_gray, fg = color.dark })
hi(0, "lualine_c_insert", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_normal", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_replace", { bg = color.green, fg = color.dark })
hi(0, "lualine_c_visual", { bg = color.green, fg = color.dark })
hi(0, "lualine_x_2_command", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_inactive", { bg = color.light_slate_gray, fg = color.peach_orange })
hi(0, "lualine_x_2_insert", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_normal", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_replace", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_terminal", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_2_visual", { bg = color.green, fg = color.peach_orange })
hi(0, "lualine_x_filetype_DevIconDefault_command", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_inactive", { bg = color.light_slate_gray, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_insert", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_normal", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_replace", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_terminal", { bg = color.green, fg = color.slate_gray })
hi(0, "lualine_x_filetype_DevIconDefault_visual", { bg = color.green, fg = color.slate_gray })
end
-- nvim-ts-rainbow
hi(0, "rainbowcol1", { fg = color.very_light_gray })
hi(0, "rainbowcol2", { fg = color.light_brown })

582
nvim/lua/themes/xcodedark.lua Normal file
View file

@ -0,0 +1,582 @@
---@class Config
local config = {
opt = {
integrations = {
telescope = false,
lualine = true,
lsp_semantics_token = true,
nvim_cmp = true,
dap_nvim = true,
},
},
}
---@class MyModule
local M = {}
---@type Config
M.config = config
-- Xcode Dark palette: https://github.com/arzg/vim-colors-xcode
local color = {
-- Base
background = "#292a30",
dark = "#1e1f24",
selection = "#393b44",
inactive_bg = "#212226",
cursor_line = "#2d2f36",
medium_gray = "#3a3c44",
foreground = "#dfdfe0",
light_gray = "#a3b1bf",
comment = "#53606e",
dark_gray = "#53606e",
-- Syntax
pink = "#ff7ab2", -- keywords
red = "#ff8170", -- errors, exceptions
teal = "#78c2b3", -- types
light_teal = "#acf2e4", -- string escapes, special
yellow = "#ffa14f", -- macros, builtins, preprocessor
light_yellow = "#d9c97c", -- numbers
blue = "#4eb0cc", -- functions
light_blue = "#6bdfff", -- constructors, special functions
purple = "#b281eb", -- constants
light_purple = "#dabaff", -- type params, light constants
green = "#84b360", -- strings
light_green = "#b0e687", -- string interpolation
}
---@param args Config?
M.setup = function(args)
M.config = vim.tbl_deep_extend("force", M.config, args or {})
if vim.g.colors_name ~= nil then
vim.cmd("highlight clear")
end
if args and type(args.override) == "function" then
local c = args.override(color)
color = vim.tbl_deep_extend("force", color, c)
end
if vim.fn.has("nvim-0.13") == 0 then
vim.cmd("echohl WarningMsg | echo 'nvim >= 0.13 required' | echohl None")
end
vim.g.colors_name = "xcodedark"
vim.o.termguicolors = true
M.configure_highlights()
end
M.configure_highlights = function()
local hi = vim.api.nvim_set_hl
-- ── LSP semantic tokens ───────────────────────────────────────────────────
if M.config.opt.integrations.lsp_semantics_token then
hi(0, "@attribute", { link = "TSAttribute" })
hi(0, "@boolean", { link = "TSBoolean" })
hi(0, "@character", { link = "TSCharacter" })
hi(0, "@character.special", { link = "SpecialChar" })
hi(0, "@class", { link = "TSType" })
hi(0, "@comment", { link = "TSComment" })
hi(0, "@conditional", { link = "TSConditional" })
hi(0, "@constant", { link = "TSConstant" })
hi(0, "@constant.builtin", { link = "TSConstantBuiltin" })
hi(0, "@constant.macro", { link = "TSConstant" })
hi(0, "@constructor", { link = "TSConstructor" })
hi(0, "@decorator", { link = "TSAttribute" })
hi(0, "@enum", { link = "TSType" })
hi(0, "@enumMember", { link = "TSConstant" })
hi(0, "@error", { link = "TSError" })
hi(0, "@event", { link = "Identifier" })
hi(0, "@exception", { link = "TSException" })
hi(0, "@field", { link = "TSField" })
hi(0, "@float", { link = "TSFloat" })
hi(0, "@function", { link = "TSFunction" })
hi(0, "@function.builtin", { link = "TSFuncBuiltin" })
hi(0, "@function.call", { link = "TSFunctionCall" })
hi(0, "@function.macro", { link = "TSFuncMacro" })
hi(0, "@include", { link = "TSInclude" })
hi(0, "@interface", { link = "Structure" })
hi(0, "@keyword", { link = "TSKeyword" })
hi(0, "@keyword.function", { link = "TSKeywordFunction" })
hi(0, "@keyword.operator", { link = "TSKeywordOperator" })
hi(0, "@keyword.return", { link = "TSKeyword" })
hi(0, "@label", { link = "TSLabel" })
hi(0, "@method", { link = "TSMethod" })
hi(0, "@method.call", { link = "TSMethodCall" })
hi(0, "@modifier", { link = "TSKeyword" })
hi(0, "@namespace", { link = "TSNamespace" })
hi(0, "@none", { link = "TSNone" })
hi(0, "@number", { link = "TSNumber" })
hi(0, "@operator", { link = "TSOperator" })
hi(0, "@parameter", { link = "TSParameter" })
hi(0, "@property", { link = "TSField" })
hi(0, "@punctuation.bracket", { link = "TSPunctBracket" })
hi(0, "@punctuation.delimiter", { link = "TSPunctDelimiter" })
hi(0, "@punctuation.special", { link = "TSPunctSpecial" })
hi(0, "@regexp", { link = "TSStringRegex" })
hi(0, "@repeat", { link = "TSRepeat" })
hi(0, "@string", { link = "TSString" })
hi(0, "@string.escape", { link = "TSStringEscape" })
hi(0, "@string.regex", { link = "TSStringRegex" })
hi(0, "@string.special", { link = "SpecialChar" })
hi(0, "@struct", { link = "TSType" })
hi(0, "@symbol", { link = "TSSymbol" })
hi(0, "@tag", { link = "TSTag" })
hi(0, "@tag.attribute", { link = "TSAttribute" })
hi(0, "@tag.delimiter", { link = "TSTagDelimiter" })
hi(0, "@text", { link = "TSText" })
hi(0, "@text.danger", { link = "DiagnosticError" })
hi(0, "@text.emphasis", { link = "TSEmphasis" })
hi(0, "@text.environment", { link = "Macro" })
hi(0, "@text.environment.name", { link = "Type" })
hi(0, "@text.literal", { link = "TSLiteral" })
hi(0, "@text.math", { link = "Number" })
hi(0, "@text.note", { link = "Tag" })
hi(0, "@text.reference", { link = "TSParameterReference" })
hi(0, "@text.strike", { link = "TSStrike" })
hi(0, "@text.strong", { link = "TSStrong" })
hi(0, "@text.title", { link = "TSTitle" })
hi(0, "@text.todo", { link = "Todo" })
hi(0, "@text.underline", { link = "TSUnderline" })
hi(0, "@text.uri", { link = "TSURI" })
hi(0, "@text.warning", { link = "DiagnosticWarn" })
hi(0, "@type", { link = "TSType" })
hi(0, "@type.builtin", { link = "TSTypeBuiltin" })
hi(0, "@type.definition", { link = "TSTypeDefinition" })
hi(0, "@type.qualifier", { link = "TSType" })
hi(0, "@typeParameter", { link = "Type" })
hi(0, "@variable", { link = "TSVariable" })
hi(0, "@variable.builtin", { link = "TSVariableBuiltin" })
hi(0, "@lsp.type.namespace", { link = "TSNamespace" })
hi(0, "@lsp.type.variable", { link = "TSVariable" })
hi(0, "@lsp.type.parameter", { link = "TSVariable" })
hi(0, "@lsp.typemod.variable.readonly", { link = "TSConstant" })
hi(0, "@lsp.type.type", { link = "TSType" })
hi(0, "@lsp.type.function", {})
hi(0, "@lsp.type.method", {})
hi(0, "@lsp.type.comment", {})
hi(0, "@lsp.typemod.variable.defaultLibrary", { link = "TSKeyword" })
hi(0, "@lsp.mod.defaultLibrary.go", { link = "TSKeyword" })
hi(0, "@lsp.type.property", { link = "TSField" })
hi(0, "@tag.attribute.tsx", { link = "TSParameter" })
hi(0, "@tag.attribute.javascript", { link = "TSParameter" })
end
-- ── Base UI ───────────────────────────────────────────────────────────────
hi(0, "Normal", { bg = color.background, fg = color.foreground })
hi(0, "NormalFloat", { bg = color.dark, fg = color.foreground })
hi(0, "NormalNC", { bg = color.background, fg = color.foreground })
hi(0, "Bold", { bold = true })
hi(0, "Italic", { italic = true })
hi(0, "Cursor", { bg = color.light_gray, fg = color.background })
hi(0, "TermCursor", { bg = color.light_gray, fg = color.background })
hi(0, "TermCursorNC", { bg = color.dark_gray, fg = color.background })
hi(0, "iCursor", { bg = color.blue, fg = color.background })
hi(0, "lCursor", { bg = color.light_gray, fg = color.background })
hi(0, "CursorLine", { bg = color.cursor_line })
hi(0, "CursorColumn", { bg = color.cursor_line })
hi(0, "CursorLineNr", { bg = color.cursor_line, fg = color.light_gray, bold = true })
hi(0, "LineNr", { fg = color.comment })
hi(0, "SignColumn", { fg = color.comment })
hi(0, "FoldColumn", { fg = color.comment })
hi(0, "Folded", { bg = color.selection, fg = color.light_gray })
hi(0, "ColorColumn", { bg = color.cursor_line })
hi(0, "VertSplit", { fg = color.medium_gray })
hi(0, "WinSeparator", { fg = color.medium_gray })
hi(0, "StatusLine", { bg = color.selection, fg = color.foreground })
hi(0, "StatusLineNC", { bg = color.medium_gray, fg = color.light_gray })
hi(0, "TabLine", { bg = color.inactive_bg, fg = color.comment })
hi(0, "TabLineFill", { bg = color.inactive_bg })
hi(0, "TabLineSel", { bg = color.selection, fg = color.foreground, bold = true })
hi(0, "WinBar", { fg = color.foreground })
hi(0, "WinBarNC", { fg = color.light_gray })
hi(0, "Visual", { bg = color.selection })
hi(0, "VisualNOS", { fg = color.red })
hi(0, "Search", { bg = color.light_yellow, fg = color.background })
hi(0, "IncSearch", { bg = color.yellow, fg = color.background })
hi(0, "Substitute", { bg = color.light_yellow, fg = color.background })
hi(0, "Pmenu", { bg = color.dark, fg = color.foreground })
hi(0, "PmenuSel", { bg = color.selection, fg = color.foreground })
hi(0, "PmenuSbar", { bg = color.medium_gray })
hi(0, "PmenuThumb", { bg = color.light_gray })
hi(0, "FloatBorder", { fg = color.comment })
hi(0, "MatchParen", { fg = color.light_blue, bold = true })
hi(0, "NonText", { fg = color.medium_gray })
hi(0, "SpecialKey", { fg = color.comment })
hi(0, "Whitespace", { fg = color.medium_gray })
hi(0, "Directory", { fg = color.blue })
hi(0, "Title", { fg = color.blue, bold = true })
hi(0, "ErrorMsg", { fg = color.red })
hi(0, "WarningMsg", { fg = color.yellow })
hi(0, "ModeMsg", { fg = color.light_green, bold = true })
hi(0, "MoreMsg", { fg = color.light_green, bold = true })
hi(0, "Question", { fg = color.blue, bold = true })
hi(0, "QuickFixLine", { bg = color.cursor_line })
hi(0, "WildMenu", { bg = color.yellow, fg = color.background })
hi(0, "IndentBlanklineChar", { fg = color.medium_gray, nocombine = true })
hi(0, "IndentBlanklineContextChar", { fg = color.comment, nocombine = true })
hi(0, "IndentBlanklineContextStart",{ sp = color.teal, underline = true })
hi(0, "IndentBlanklineSpaceChar", { fg = color.medium_gray, nocombine = true })
hi(0, "TreesitterContext", { bg = color.cursor_line, italic = true })
-- ── Syntax ────────────────────────────────────────────────────────────────
hi(0, "Comment", { fg = color.comment, italic = true })
hi(0, "Constant", { fg = color.purple })
hi(0, "String", { fg = color.green })
hi(0, "Character", { fg = color.green })
hi(0, "Number", { fg = color.light_yellow })
hi(0, "Boolean", { fg = color.yellow })
hi(0, "Float", { fg = color.light_yellow })
hi(0, "Identifier", { fg = color.foreground })
hi(0, "Function", { fg = color.blue })
hi(0, "Statement", { fg = color.pink })
hi(0, "Conditional",{ fg = color.pink })
hi(0, "Repeat", { fg = color.pink })
hi(0, "Label", { fg = color.light_yellow })
hi(0, "Operator", { fg = color.light_gray })
hi(0, "Keyword", { fg = color.pink })
hi(0, "Exception", { fg = color.red })
hi(0, "PreProc", { fg = color.yellow })
hi(0, "Include", { fg = color.pink })
hi(0, "Define", { fg = color.yellow })
hi(0, "Macro", { fg = color.yellow })
hi(0, "Type", { fg = color.teal })
hi(0, "StorageClass",{ fg = color.pink })
hi(0, "Structure", { fg = color.teal })
hi(0, "Typedef", { fg = color.teal })
hi(0, "Special", { fg = color.light_teal })
hi(0, "SpecialChar",{ fg = color.light_teal })
hi(0, "Delimiter", { fg = color.light_gray })
hi(0, "Debug", { fg = color.red })
hi(0, "Error", { bg = color.red, fg = color.background })
hi(0, "Todo", { bg = color.selection, fg = color.light_yellow })
hi(0, "Underlined", { fg = color.blue, underline = true })
hi(0, "Ignore", { fg = color.dark })
hi(0, "Tag", { fg = color.light_yellow })
hi(0, "Bold", { bold = true })
-- ── Treesitter ────────────────────────────────────────────────────────────
hi(0, "TSAnnotation", { fg = color.yellow })
hi(0, "TSAttribute", { fg = color.yellow })
hi(0, "TSBoolean", { fg = color.yellow })
hi(0, "TSCharacter", { fg = color.green })
hi(0, "TSComment", { fg = color.comment, italic = true })
hi(0, "TSConditional", { fg = color.pink })
hi(0, "TSConstant", { fg = color.purple })
hi(0, "TSConstBuiltin", { fg = color.yellow, italic = true })
hi(0, "TSConstantBuiltin",{ fg = color.yellow, italic = true })
hi(0, "TSConstMacro", { fg = color.yellow })
hi(0, "TSConstructor", { fg = color.light_blue })
hi(0, "TSCurrentScope", { bold = true })
hi(0, "TSDefinition", { sp = color.light_gray, underline = true })
hi(0, "TSDefinitionUsage",{ sp = color.light_gray, underline = true })
hi(0, "TSEmphasis", { fg = color.yellow, italic = true })
hi(0, "TSError", { fg = color.red })
hi(0, "TSException", { fg = color.red })
hi(0, "TSField", { fg = color.foreground })
hi(0, "TSFloat", { fg = color.light_yellow })
hi(0, "TSFuncBuiltin", { fg = color.yellow, italic = true })
hi(0, "TSFuncMacro", { fg = color.yellow })
hi(0, "TSFunction", { fg = color.blue })
hi(0, "TSFunctionCall", { fg = color.light_teal })
hi(0, "TSMethodCall", { fg = color.light_teal })
hi(0, "TSInclude", { fg = color.pink })
hi(0, "TSKeyword", { fg = color.pink })
hi(0, "TSKeywordFunction",{ fg = color.pink })
hi(0, "TSKeywordOperator",{ fg = color.pink })
hi(0, "TSLabel", { fg = color.light_yellow })
hi(0, "TSLiteral", { fg = color.green })
hi(0, "TSMethod", { fg = color.blue })
hi(0, "TSNamespace", { fg = color.teal })
hi(0, "TSNone", { fg = color.foreground })
hi(0, "TSNumber", { fg = color.light_yellow })
hi(0, "TSOperator", { fg = color.light_gray })
hi(0, "TSParameter", { fg = color.foreground })
hi(0, "TSParameterReference",{ fg = color.foreground })
hi(0, "TSProperty", { fg = color.foreground })
hi(0, "TSPunctBracket", { fg = color.light_gray })
hi(0, "TSPunctDelimiter",{ fg = color.light_gray })
hi(0, "TSPunctSpecial", { fg = color.light_teal })
hi(0, "TSRepeat", { fg = color.pink })
hi(0, "TSString", { fg = color.green })
hi(0, "TSStringEscape", { fg = color.light_teal })
hi(0, "TSStringRegex", { fg = color.light_teal })
hi(0, "TSStrong", { bold = true })
hi(0, "TSStrike", { fg = color.dark, strikethrough = true })
hi(0, "TSSymbol", { fg = color.light_green })
hi(0, "TSTag", { fg = color.light_yellow })
hi(0, "TSTagDelimiter", { fg = color.light_gray })
hi(0, "TSText", { fg = color.foreground })
hi(0, "TSTitle", { fg = color.blue, bold = true })
hi(0, "TSType", { fg = color.teal })
hi(0, "TSTypeBuiltin", { fg = color.yellow, italic = true })
hi(0, "TSTypeDefinition",{ fg = color.teal })
hi(0, "TSURI", { fg = color.blue, underline = true })
hi(0, "TSUnderline", { underline = true })
hi(0, "TSVariable", { fg = color.foreground })
hi(0, "TSVariableBuiltin",{ fg = color.yellow, italic = true })
-- ── Statement / Identifier overrides ─────────────────────────────────────
hi(0, "Statement", { link = "TSKeyword" })
hi(0, "Comment", { link = "TSComment" })
hi(0, "Number", { link = "TSNumber" })
hi(0, "String", { link = "TSString" })
hi(0, "Identifier", { link = "TSVariable" })
hi(0, "@lsp.type.keyword.go", { link = "TSKeyword" })
hi(0, "@lsp.type.string.go", { link = "TSString" })
hi(0, "@lsp.type.function", { link = "TSFunctionCall" })
hi(0, "@lsp.typemod.function.definition", { link = "TSFunction" })
hi(0, "@lsp.type.method", { link = "TSMethod" })
hi(0, "goBlock", { link = "TSVariable" })
hi(0, "goImportString", { link = "TSString" })
-- ── Diagnostics ───────────────────────────────────────────────────────────
hi(0, "DiagnosticError", { fg = color.red })
hi(0, "DiagnosticWarn", { fg = color.yellow })
hi(0, "DiagnosticInfo", { fg = color.blue })
hi(0, "DiagnosticHint", { fg = color.teal })
hi(0, "DiagnosticUnderlineError", { sp = color.red, undercurl = true })
hi(0, "DiagnosticUnderlineWarn", { sp = color.yellow, undercurl = true })
hi(0, "DiagnosticUnderlineInformation",{ sp = color.blue, undercurl = true })
hi(0, "DiagnosticUnderlineHint", { sp = color.teal, undercurl = true })
hi(0, "DiagnosticUnderlineWarning", { sp = color.yellow, undercurl = true })
hi(0, "LspDiagnosticsDefaultError", { link = "DiagnosticError" })
hi(0, "LspDiagnosticsDefaultHint", { link = "DiagnosticHint" })
hi(0, "LspDiagnosticsDefaultInformation", { link = "DiagnosticInfo" })
hi(0, "LspDiagnosticsDefaultWarning", { link = "DiagnosticWarn" })
hi(0, "LspDiagnosticsUnderlineError", { link = "DiagnosticUnderlineError" })
hi(0, "LspDiagnosticsUnderlineHint", { link = "DiagnosticUnderlineHint" })
hi(0, "LspDiagnosticsUnderlineInformation", { link = "DiagnosticUnderlineInformation" })
hi(0, "LspDiagnosticsUnderlineWarning",{ link = "DiagnosticUnderlineWarning" })
hi(0, "LspReferenceRead", { sp = color.light_gray, underline = true })
hi(0, "LspReferenceText", { sp = color.light_gray, underline = true })
hi(0, "LspReferenceWrite", { sp = color.light_gray, underline = true })
-- ── nvim-cmp ──────────────────────────────────────────────────────────────
if M.config.opt.integrations.nvim_cmp then
hi(0, "CmpDocumentation", { fg = color.foreground })
hi(0, "CmpDocumentationBorder", { fg = color.comment })
hi(0, "CmpItemAbbr", { fg = color.foreground })
hi(0, "CmpItemAbbrDeprecated", { fg = color.comment, strikethrough = true })
hi(0, "CmpItemAbbrMatch", { fg = color.blue })
hi(0, "CmpItemAbbrMatchFuzzy", { fg = color.blue })
hi(0, "CmpItemKindDefault", { fg = color.blue })
hi(0, "CmpItemKindClass", { fg = color.teal })
hi(0, "CmpItemKindConstant", { fg = color.purple })
hi(0, "CmpItemKindConstructor", { fg = color.light_blue })
hi(0, "CmpItemKindEnum", { fg = color.teal })
hi(0, "CmpItemKindEnumMember", { fg = color.light_purple })
hi(0, "CmpItemKindEvent", { fg = color.teal })
hi(0, "CmpItemKindField", { fg = color.foreground })
hi(0, "CmpItemKindFunction", { fg = color.blue })
hi(0, "CmpItemKindInterface", { fg = color.teal })
hi(0, "CmpItemKindKeyword", { fg = color.pink })
hi(0, "CmpItemKindMethod", { fg = color.blue })
hi(0, "CmpItemKindModule", { fg = color.foreground })
hi(0, "CmpItemKindOperator", { fg = color.light_gray })
hi(0, "CmpItemKindProperty", { fg = color.foreground })
hi(0, "CmpItemKindReference", { fg = color.foreground })
hi(0, "CmpItemKindSnippet", { fg = color.light_gray })
hi(0, "CmpItemKindStruct", { fg = color.teal })
hi(0, "CmpItemKindTypeParameter",{ fg = color.light_purple })
hi(0, "CmpItemKindUnit", { fg = color.light_yellow })
hi(0, "CmpItemKindValue", { fg = color.purple })
hi(0, "CmpItemKindVariable", { fg = color.foreground })
hi(0, "CmpItemMenu", { fg = color.comment })
end
-- ── DAP ───────────────────────────────────────────────────────────────────
if M.config.opt.integrations.dap_nvim then
hi(0, "DapUIBreakpointsCurrentLine", { bold = true, fg = color.light_green })
hi(0, "DapUIBreakpointsDisabledLine",{ fg = color.comment })
hi(0, "DapUIBreakpointsInfo", { fg = color.light_green })
hi(0, "DapUIBreakpointsPath", { fg = color.light_teal })
hi(0, "DapUIDecoration", { fg = color.light_teal })
hi(0, "DapUIFloatBorder", { fg = color.light_teal })
hi(0, "DapUILineNumber", { fg = color.light_teal })
hi(0, "DapUIModifiedValue", { bold = true, fg = color.light_teal })
hi(0, "DapUIPlayPause", { fg = color.light_green })
hi(0, "DapUIPlayPauseNC", { fg = color.light_green })
hi(0, "DapUIRestart", { fg = color.light_green })
hi(0, "DapUIRestartNC", { fg = color.light_green })
hi(0, "DapUIScope", { fg = color.light_teal })
hi(0, "DapUISource", { fg = color.light_purple })
hi(0, "DapUIStepBack", { fg = color.blue })
hi(0, "DapUIStepBackNC", { fg = color.blue })
hi(0, "DapUIStepInto", { fg = color.blue })
hi(0, "DapUIStepIntoNC", { fg = color.blue })
hi(0, "DapUIStepOut", { fg = color.blue })
hi(0, "DapUIStepOutNC", { fg = color.blue })
hi(0, "DapUIStepOver", { fg = color.blue })
hi(0, "DapUIStepOverNC", { fg = color.blue })
hi(0, "DapUIStop", { fg = color.red })
hi(0, "DapUIStopNC", { fg = color.red })
hi(0, "DapUIStoppedThread", { fg = color.light_teal })
hi(0, "DapUIThread", { fg = color.light_green })
hi(0, "DapUIType", { fg = color.light_purple })
hi(0, "DapUIUnavailable", { fg = color.comment })
hi(0, "DapUIUnavailableNC", { fg = color.comment })
hi(0, "DapUIWatchesEmpty", { fg = color.red })
hi(0, "DapUIWatchesError", { fg = color.red })
hi(0, "DapUIWatchesValue", { fg = color.light_green })
end
-- ── Git ───────────────────────────────────────────────────────────────────
hi(0, "GitGutterAdd", { fg = color.green })
hi(0, "GitGutterChange", { fg = color.blue })
hi(0, "GitGutterChangeDelete", { fg = color.yellow })
hi(0, "GitGutterDelete", { fg = color.red })
hi(0, "GitSignsCurrentLineBlame", { fg = color.comment, italic = true })
hi(0, "GitSignsStagedAdd", { fg = color.light_green })
hi(0, "GitSignsStagedChange", { fg = color.teal })
hi(0, "GitSignsStagedDelete", { fg = color.red })
hi(0, "gitcommitBranch", { bold = true, fg = color.yellow })
hi(0, "gitcommitComment", { fg = color.comment })
hi(0, "gitcommitDiscarded", { fg = color.comment })
hi(0, "gitcommitDiscardedFile", { bold = true, fg = color.red })
hi(0, "gitcommitDiscardedType", { fg = color.blue })
hi(0, "gitcommitHeader", { fg = color.pink })
hi(0, "gitcommitOverflow", { fg = color.red })
hi(0, "gitcommitSelected", { fg = color.comment })
hi(0, "gitcommitSelectedFile", { bold = true, fg = color.light_green })
hi(0, "gitcommitSelectedType", { fg = color.blue })
hi(0, "gitcommitSummary", { fg = color.light_green })
hi(0, "gitcommitUnmergedFile", { bold = true, fg = color.red })
hi(0, "gitcommitUnmergedType", { fg = color.blue })
hi(0, "gitcommitUntracked", { fg = color.comment })
hi(0, "gitcommitUntrackedFile", { fg = color.light_yellow })
-- ── Notify ────────────────────────────────────────────────────────────────
hi(0, "NotifyDEBUGBody", { link = "Normal" })
hi(0, "NotifyDEBUGBorder", { fg = color.comment })
hi(0, "NotifyDEBUGIcon", { fg = color.comment })
hi(0, "NotifyDEBUGTitle", { fg = color.comment })
hi(0, "NotifyERRORBody", { link = "Normal" })
hi(0, "NotifyERRORBorder", { fg = color.red })
hi(0, "NotifyERRORIcon", { fg = color.red })
hi(0, "NotifyERRORTitle", { fg = color.red })
hi(0, "NotifyINFOBody", { link = "Normal" })
hi(0, "NotifyINFOBorder", { fg = color.light_gray })
hi(0, "NotifyINFOIcon", { fg = color.light_gray })
hi(0, "NotifyINFOTitle", { fg = color.light_gray })
hi(0, "NotifyTRACEBody", { link = "Normal" })
hi(0, "NotifyTRACEBorder", { fg = color.purple })
hi(0, "NotifyTRACEIcon", { fg = color.purple })
hi(0, "NotifyTRACETitle", { fg = color.purple })
hi(0, "NotifyWARNBody", { link = "Normal" })
hi(0, "NotifyWARNBorder", { fg = color.yellow })
hi(0, "NotifyWARNIcon", { fg = color.yellow })
hi(0, "NotifyWARNTitle", { fg = color.yellow })
-- ── Telescope ─────────────────────────────────────────────────────────────
if M.config.opt.integrations.telescope then
hi(0, "TelescopeBorder", { bg = color.dark, fg = color.dark })
hi(0, "TelescopeNormal", { bg = color.dark })
hi(0, "TelescopePreviewLine", { bg = color.cursor_line })
hi(0, "TelescopePreviewTitle", { bg = color.light_green, fg = color.background })
hi(0, "TelescopePromptBorder", { bg = color.medium_gray, fg = color.medium_gray })
hi(0, "TelescopePromptNormal", { bg = color.medium_gray, fg = color.foreground })
hi(0, "TelescopePromptPrefix", { bg = color.medium_gray, fg = color.red })
hi(0, "TelescopePromptTitle", { bg = color.red, fg = color.background })
hi(0, "TelescopeResultsTitle", { bg = color.dark, fg = color.dark })
hi(0, "TelescopeSelection", { bg = color.medium_gray })
end
-- ── Snacks Dashboard ──────────────────────────────────────────────────────
hi(0, "SnacksDashboardHeader", { fg = color.light_yellow, bold = true })
hi(0, "SnacksDashboardTitle", { fg = color.yellow, bold = true })
hi(0, "SnacksDashboardIcon", { fg = color.blue })
hi(0, "SnacksDashboardDesc", { fg = color.light_gray })
hi(0, "SnacksDashboardFile", { fg = color.light_teal, bold = true })
hi(0, "SnacksDashboardKey", { fg = color.pink })
hi(0, "SnacksDashboardSpecial", { fg = color.light_gray })
hi(0, "SnacksDashboardDir", { fg = color.light_gray })
hi(0, "SnacksDashboardNormal", { fg = color.light_gray })
hi(0, "SnacksDashboardTerminal", { fg = color.light_gray })
hi(0, "SnacksDashboardFooter", { fg = color.comment })
-- ── Neo-Tree ──────────────────────────────────────────────────────────────
hi(0, "NeoTreeFileName", { fg = color.foreground })
hi(0, "NeoTreeDotfile", { fg = color.comment })
hi(0, "NeoTreeDirectoryName", { fg = color.yellow })
hi(0, "NeoTreeDirectoryIcon", { fg = color.yellow })
hi(0, "NeoTreeGitModified", { fg = color.yellow })
hi(0, "NeoTreeGitStaged", { fg = color.green })
hi(0, "NeoTreeGitUntracked", { fg = color.purple })
hi(0, "NeoTreeNormal", { fg = color.foreground, bg = color.dark })
hi(0, "NeoTreeNormalNC", { fg = color.foreground, bg = color.dark })
hi(0, "NeoTreeTabActive", { fg = color.foreground, bg = color.dark, bold = true })
hi(0, "NeoTreeTabInactive", { fg = color.comment, bg = color.dark })
hi(0, "NeoTreeTabSeparatorActive", { fg = color.foreground, bg = color.dark })
hi(0, "NeoTreeTabSeparatorInactive", { fg = color.comment, bg = color.dark })
-- ── Copilot ───────────────────────────────────────────────────────────────
hi(0, "CopilotSuggestion", { fg = color.comment })
-- ── Spell ─────────────────────────────────────────────────────────────────
hi(0, "SpellBad", { sp = color.red, undercurl = true })
hi(0, "SpellCap", { sp = color.blue, undercurl = true })
hi(0, "SpellLocal", { sp = color.teal, undercurl = true })
hi(0, "SpellRare", { sp = color.yellow, undercurl = true })
-- ── nvim-ts-rainbow ───────────────────────────────────────────────────────
hi(0, "rainbowcol1", { fg = color.foreground })
hi(0, "rainbowcol2", { fg = color.yellow })
hi(0, "rainbowcol3", { fg = color.teal })
hi(0, "rainbowcol4", { fg = color.light_purple })
hi(0, "rainbowcol5", { fg = color.blue })
hi(0, "rainbowcol6", { fg = color.pink })
hi(0, "rainbowcol7", { fg = color.light_teal })
-- ── User / StatusLine accents ─────────────────────────────────────────────
hi(0, "User1", { bg = color.selection, fg = color.red })
hi(0, "User2", { bg = color.selection, fg = color.yellow })
hi(0, "User3", { bg = color.selection, fg = color.foreground })
hi(0, "User4", { bg = color.selection, fg = color.blue })
hi(0, "User5", { bg = color.selection, fg = color.light_gray })
hi(0, "User6", { bg = color.dark, fg = color.light_gray })
hi(0, "User7", { bg = color.selection, fg = color.light_gray })
hi(0, "User8", { bg = color.selection, fg = color.background })
hi(0, "User9", { bg = color.selection, fg = color.background })
-- ── Terminal colors ───────────────────────────────────────────────────────
local g = vim.g
g.terminal_color_0 = color.background
g.terminal_color_1 = color.red
g.terminal_color_2 = color.green
g.terminal_color_3 = color.light_yellow
g.terminal_color_4 = color.blue
g.terminal_color_5 = color.purple
g.terminal_color_6 = color.teal
g.terminal_color_7 = color.light_gray
g.terminal_color_8 = color.dark_gray
g.terminal_color_9 = color.pink
g.terminal_color_10 = color.light_green
g.terminal_color_11 = color.yellow
g.terminal_color_12 = color.light_blue
g.terminal_color_13 = color.light_purple
g.terminal_color_14 = color.light_teal
g.terminal_color_15 = color.foreground
end
return M

606
nvim/lua/themes/xcodedefault.lua Normal file
View file

@ -0,0 +1,606 @@
---@class Config
local config = {
opt = {
integrations = {
telescope = false,
lualine = true,
lsp_semantics_token = true,
nvim_cmp = true,
dap_nvim = true,
},
},
}
---@class MyModule
local M = {}
---@type Config
M.config = config
-- Hybrid: xcodedark backgrounds + nvim-default color philosophy
-- default-dark: Keywords=Yellow bold, Constants=Magenta, Strings=Magenta,
-- Types=Green bold, Functions=Cyan, PreProc=Magenta
-- xcodedark supplies every hex value; bold/italic modifiers come from default.
local color = {
-- ── Backgrounds (xcodedark) ────────────────────────────────────────────
background = "#292a30",
dark = "#1e1f24",
selection = "#393b44",
inactive_bg = "#212226",
cursor_line = "#2d2f36",
medium_gray = "#3a3c44",
-- ── Foregrounds (xcodedark) ────────────────────────────────────────────
foreground = "#dfdfe0",
light_gray = "#a3b1bf",
-- ── Comment: brighter than pure xcode gray so it reads like default cyan
comment = "#6b8a9e",
-- ── Syntax — mapped to default's color roles ───────────────────────────
-- default: Statement/Keyword = Yellow bold → xcode yellow
yellow = "#ffa14f",
-- default: Constant/String/Number = Magenta → xcode purple / light-purple
purple = "#b281eb",
light_purple = "#dabaff",
-- default: Identifier/Function = Cyan → xcode teal / light-teal
teal = "#78c2b3",
light_teal = "#acf2e4",
-- default: Type = Green bold → xcode green / light-green
green = "#84b360",
light_green = "#b0e687",
-- default: PreProc = Magenta (bright) → xcode pink
pink = "#ff7ab2",
-- default: Special = DarkCyan → xcode light-blue
light_blue = "#6bdfff",
blue = "#4eb0cc",
-- default: Error = Red → xcode red
red = "#ff8170",
-- extras
light_yellow = "#d9c97c",
}
---@param args Config?
M.setup = function(args)
M.config = vim.tbl_deep_extend("force", M.config, args or {})
if vim.g.colors_name ~= nil then
vim.cmd("highlight clear")
end
if args and type(args.override) == "function" then
local c = args.override(color)
color = vim.tbl_deep_extend("force", color, c)
end
if vim.fn.has("nvim-0.8.3") == 0 then
vim.cmd("echohl WarningMsg | echo 'nvim >= 0.8.3 required' | echohl None")
end
vim.g.colors_name = "xcodedefault"
vim.o.termguicolors = true
M.configure_highlights()
end
M.configure_highlights = function()
local hi = vim.api.nvim_set_hl
-- ── LSP semantic tokens ───────────────────────────────────────────────────
if M.config.opt.integrations.lsp_semantics_token then
hi(0, "@attribute", { link = "TSAttribute" })
hi(0, "@boolean", { link = "TSBoolean" })
hi(0, "@character", { link = "TSCharacter" })
hi(0, "@character.special", { link = "SpecialChar" })
hi(0, "@class", { link = "TSType" })
hi(0, "@comment", { link = "TSComment" })
hi(0, "@conditional", { link = "TSConditional" })
hi(0, "@constant", { link = "TSConstant" })
hi(0, "@constant.builtin", { link = "TSConstantBuiltin" })
hi(0, "@constant.macro", { link = "TSConstant" })
hi(0, "@constructor", { link = "TSConstructor" })
hi(0, "@decorator", { link = "TSAttribute" })
hi(0, "@enum", { link = "TSType" })
hi(0, "@enumMember", { link = "TSConstant" })
hi(0, "@error", { link = "TSError" })
hi(0, "@event", { link = "Identifier" })
hi(0, "@exception", { link = "TSException" })
hi(0, "@field", { link = "TSField" })
hi(0, "@float", { link = "TSFloat" })
hi(0, "@function", { link = "TSFunction" })
hi(0, "@function.builtin", { link = "TSFuncBuiltin" })
hi(0, "@function.call", { link = "TSFunctionCall" })
hi(0, "@function.macro", { link = "TSFuncMacro" })
hi(0, "@include", { link = "TSInclude" })
hi(0, "@interface", { link = "Structure" })
hi(0, "@keyword", { link = "TSKeyword" })
hi(0, "@keyword.function", { link = "TSKeywordFunction" })
hi(0, "@keyword.operator", { link = "TSKeywordOperator" })
hi(0, "@keyword.return", { link = "TSKeyword" })
hi(0, "@label", { link = "TSLabel" })
hi(0, "@method", { link = "TSMethod" })
hi(0, "@method.call", { link = "TSMethodCall" })
hi(0, "@modifier", { link = "TSKeyword" })
hi(0, "@namespace", { link = "TSNamespace" })
hi(0, "@none", { link = "TSNone" })
hi(0, "@number", { link = "TSNumber" })
hi(0, "@operator", { link = "TSOperator" })
hi(0, "@parameter", { link = "TSParameter" })
hi(0, "@property", { link = "TSField" })
hi(0, "@punctuation.bracket", { link = "TSPunctBracket" })
hi(0, "@punctuation.delimiter", { link = "TSPunctDelimiter" })
hi(0, "@punctuation.special", { link = "TSPunctSpecial" })
hi(0, "@regexp", { link = "TSStringRegex" })
hi(0, "@repeat", { link = "TSRepeat" })
hi(0, "@string", { link = "TSString" })
hi(0, "@string.escape", { link = "TSStringEscape" })
hi(0, "@string.regex", { link = "TSStringRegex" })
hi(0, "@string.special", { link = "SpecialChar" })
hi(0, "@struct", { link = "TSType" })
hi(0, "@symbol", { link = "TSSymbol" })
hi(0, "@tag", { link = "TSTag" })
hi(0, "@tag.attribute", { link = "TSAttribute" })
hi(0, "@tag.delimiter", { link = "TSTagDelimiter" })
hi(0, "@text", { link = "TSText" })
hi(0, "@text.danger", { link = "DiagnosticError" })
hi(0, "@text.emphasis", { link = "TSEmphasis" })
hi(0, "@text.environment", { link = "Macro" })
hi(0, "@text.environment.name", { link = "Type" })
hi(0, "@text.literal", { link = "TSLiteral" })
hi(0, "@text.math", { link = "Number" })
hi(0, "@text.note", { link = "Tag" })
hi(0, "@text.reference", { link = "TSParameterReference" })
hi(0, "@text.strike", { link = "TSStrike" })
hi(0, "@text.strong", { link = "TSStrong" })
hi(0, "@text.title", { link = "TSTitle" })
hi(0, "@text.todo", { link = "Todo" })
hi(0, "@text.underline", { link = "TSUnderline" })
hi(0, "@text.uri", { link = "TSURI" })
hi(0, "@text.warning", { link = "DiagnosticWarn" })
hi(0, "@type", { link = "TSType" })
hi(0, "@type.builtin", { link = "TSTypeBuiltin" })
hi(0, "@type.definition", { link = "TSTypeDefinition" })
hi(0, "@type.qualifier", { link = "TSType" })
hi(0, "@typeParameter", { link = "Type" })
hi(0, "@variable", { link = "TSVariable" })
hi(0, "@variable.builtin", { link = "TSVariableBuiltin" })
hi(0, "@lsp.type.namespace", { link = "TSNamespace" })
hi(0, "@lsp.type.variable", { link = "TSVariable" })
hi(0, "@lsp.type.parameter", { link = "TSVariable" })
hi(0, "@lsp.typemod.variable.readonly", { link = "TSConstant" })
hi(0, "@lsp.type.type", { link = "TSType" })
hi(0, "@lsp.type.function", {})
hi(0, "@lsp.type.method", {})
hi(0, "@lsp.type.comment", {})
hi(0, "@lsp.typemod.variable.defaultLibrary", { link = "TSVariableBuiltin" })
hi(0, "@lsp.mod.defaultLibrary.go", { link = "TSVariableBuiltin" })
hi(0, "@lsp.type.property", { link = "TSField" })
hi(0, "@tag.attribute.tsx", { link = "TSParameter" })
hi(0, "@tag.attribute.javascript", { link = "TSParameter" })
end
-- ── Base UI ───────────────────────────────────────────────────────────────
hi(0, "Normal", { bg = color.background, fg = color.foreground })
hi(0, "NormalFloat", { bg = color.dark, fg = color.foreground })
hi(0, "NormalNC", { bg = color.background, fg = color.foreground })
hi(0, "Bold", { bold = true })
hi(0, "Italic", { italic = true })
hi(0, "Cursor", { bg = color.light_gray, fg = color.background })
hi(0, "TermCursor", { bg = color.light_gray, fg = color.background })
hi(0, "TermCursorNC", { bg = color.comment, fg = color.background })
hi(0, "iCursor", { bg = color.teal, fg = color.background })
hi(0, "lCursor", { bg = color.light_gray, fg = color.background })
hi(0, "CursorLine", { bg = color.cursor_line })
hi(0, "CursorColumn", { bg = color.cursor_line })
hi(0, "CursorLineNr", { bg = color.cursor_line, fg = color.light_gray, bold = true })
hi(0, "LineNr", { fg = color.comment })
hi(0, "SignColumn", { fg = color.comment })
hi(0, "FoldColumn", { fg = color.comment })
hi(0, "Folded", { bg = color.selection, fg = color.light_gray })
hi(0, "ColorColumn", { bg = color.cursor_line })
hi(0, "VertSplit", { fg = color.medium_gray })
hi(0, "WinSeparator", { fg = color.medium_gray })
hi(0, "StatusLine", { bg = color.selection, fg = color.foreground })
hi(0, "StatusLineNC", { bg = color.medium_gray, fg = color.light_gray })
hi(0, "TabLine", { bg = color.inactive_bg, fg = color.comment })
hi(0, "TabLineFill", { bg = color.inactive_bg })
hi(0, "TabLineSel", { bg = color.selection, fg = color.foreground, bold = true })
hi(0, "WinBar", { fg = color.foreground })
hi(0, "WinBarNC", { fg = color.light_gray })
hi(0, "Visual", { bg = color.selection })
hi(0, "VisualNOS", { fg = color.red })
-- default uses reversed/highlighted search — keep that boldness
hi(0, "Search", { bg = color.yellow, fg = color.background, bold = true })
hi(0, "IncSearch", { bg = color.light_yellow, fg = color.background, bold = true })
hi(0, "Substitute", { bg = color.yellow, fg = color.background })
hi(0, "Pmenu", { bg = color.dark, fg = color.foreground })
hi(0, "PmenuSel", { bg = color.selection, fg = color.foreground })
hi(0, "PmenuSbar", { bg = color.medium_gray })
hi(0, "PmenuThumb", { bg = color.light_gray })
hi(0, "FloatBorder", { fg = color.comment })
hi(0, "MatchParen", { fg = color.light_teal, bold = true })
hi(0, "NonText", { fg = color.medium_gray })
hi(0, "SpecialKey", { fg = color.comment })
hi(0, "Whitespace", { fg = color.medium_gray })
hi(0, "Directory", { fg = color.teal, bold = true })
hi(0, "Title", { fg = color.teal, bold = true })
hi(0, "ErrorMsg", { fg = color.red })
hi(0, "WarningMsg", { fg = color.yellow })
hi(0, "ModeMsg", { fg = color.light_green, bold = true })
hi(0, "MoreMsg", { fg = color.light_green, bold = true })
hi(0, "Question", { fg = color.light_green, bold = true })
hi(0, "QuickFixLine", { bg = color.cursor_line })
hi(0, "WildMenu", { bg = color.yellow, fg = color.background })
hi(0, "IndentBlanklineChar", { fg = color.medium_gray, nocombine = true })
hi(0, "IndentBlanklineContextChar", { fg = color.comment, nocombine = true })
hi(0, "IndentBlanklineContextStart", { sp = color.teal, underline = true })
hi(0, "IndentBlanklineSpaceChar", { fg = color.medium_gray, nocombine = true })
hi(0, "TreesitterContext", { bg = color.cursor_line, italic = true })
-- ── Syntax — default color philosophy, xcodedark hex values ──────────────
-- Comment → teal-gray (default: Cyan)
hi(0, "Comment", { fg = color.comment, italic = true })
-- Constant → purple (default: Magenta)
hi(0, "Constant", { fg = color.purple })
-- String → purple (default: Magenta — strings = constants in default)
hi(0, "String", { fg = color.purple })
hi(0, "Character", { fg = color.purple })
-- Number → light-yellow (default: Magenta, we keep xcode numeric color)
hi(0, "Number", { fg = color.light_yellow })
hi(0, "Boolean", { fg = color.purple })
hi(0, "Float", { fg = color.light_yellow })
-- Identifier/Function → teal/cyan (default: Cyan)
hi(0, "Identifier", { fg = color.teal })
hi(0, "Function", { fg = color.teal })
-- Statement/Keyword → yellow bold (default: Yellow bold)
hi(0, "Statement", { fg = color.yellow, bold = true })
hi(0, "Conditional", { fg = color.yellow, bold = true })
hi(0, "Repeat", { fg = color.yellow, bold = true })
hi(0, "Label", { fg = color.yellow, bold = true })
hi(0, "Operator", { fg = color.light_gray })
hi(0, "Keyword", { fg = color.yellow, bold = true })
hi(0, "Exception", { fg = color.yellow, bold = true })
-- PreProc → pink/magenta (default: Magenta bright)
hi(0, "PreProc", { fg = color.pink })
hi(0, "Include", { fg = color.pink })
hi(0, "Define", { fg = color.pink })
hi(0, "Macro", { fg = color.pink })
-- Type → green bold (default: Green bold)
hi(0, "Type", { fg = color.green, bold = true })
hi(0, "StorageClass",{ fg = color.yellow, bold = true })
hi(0, "Structure", { fg = color.green, bold = true })
hi(0, "Typedef", { fg = color.green, bold = true })
-- Special → light-blue/DarkCyan (default: DarkCyan)
hi(0, "Special", { fg = color.light_blue })
hi(0, "SpecialChar", { fg = color.light_teal })
hi(0, "Delimiter", { fg = color.light_gray })
hi(0, "Debug", { fg = color.red })
hi(0, "Error", { bg = color.red, fg = color.background, bold = true })
hi(0, "Todo", { bg = color.selection, fg = color.yellow, bold = true })
hi(0, "Underlined", { fg = color.teal, underline = true })
hi(0, "Ignore", { fg = color.dark })
hi(0, "Tag", { fg = color.light_yellow })
-- ── Treesitter — respects default's bold/italic conventions ──────────────
hi(0, "TSAnnotation", { fg = color.pink })
hi(0, "TSAttribute", { fg = color.pink })
hi(0, "TSBoolean", { fg = color.purple })
hi(0, "TSCharacter", { fg = color.purple })
hi(0, "TSComment", { fg = color.comment, italic = true })
hi(0, "TSConditional", { fg = color.yellow, bold = true })
hi(0, "TSConstant", { fg = color.purple })
hi(0, "TSConstBuiltin", { fg = color.purple, italic = true })
hi(0, "TSConstantBuiltin",{ fg = color.purple, italic = true })
hi(0, "TSConstMacro", { fg = color.pink })
hi(0, "TSConstructor", { fg = color.light_blue })
hi(0, "TSCurrentScope", { bold = true })
hi(0, "TSDefinition", { sp = color.light_gray, underline = true })
hi(0, "TSDefinitionUsage",{ sp = color.light_gray, underline = true })
hi(0, "TSEmphasis", { fg = color.yellow, italic = true })
hi(0, "TSError", { fg = color.red })
hi(0, "TSException", { fg = color.yellow, bold = true })
hi(0, "TSField", { fg = color.foreground })
hi(0, "TSFloat", { fg = color.light_yellow })
hi(0, "TSFuncBuiltin", { fg = color.light_teal, bold = true })
hi(0, "TSFuncMacro", { fg = color.pink })
hi(0, "TSFunction", { fg = color.teal, bold = true }) -- bold like default Function
hi(0, "TSFunctionCall", { fg = color.teal })
hi(0, "TSMethodCall", { fg = color.teal })
hi(0, "TSInclude", { fg = color.pink })
hi(0, "TSKeyword", { fg = color.yellow, bold = true })
hi(0, "TSKeywordFunction",{ fg = color.yellow, bold = true })
hi(0, "TSKeywordOperator",{ fg = color.yellow, bold = true })
hi(0, "TSLabel", { fg = color.yellow, bold = true })
hi(0, "TSLiteral", { fg = color.purple })
hi(0, "TSMethod", { fg = color.teal, bold = true })
hi(0, "TSNamespace", { fg = color.light_teal })
hi(0, "TSNone", { fg = color.foreground })
hi(0, "TSNumber", { fg = color.light_yellow })
hi(0, "TSOperator", { fg = color.light_gray })
hi(0, "TSParameter", { fg = color.foreground })
hi(0, "TSParameterReference",{ fg = color.foreground })
hi(0, "TSProperty", { fg = color.foreground })
hi(0, "TSPunctBracket", { fg = color.light_gray })
hi(0, "TSPunctDelimiter", { fg = color.light_gray })
hi(0, "TSPunctSpecial", { fg = color.light_teal })
hi(0, "TSRepeat", { fg = color.yellow, bold = true })
hi(0, "TSString", { fg = color.purple }) -- strings=magenta in default
hi(0, "TSStringEscape", { fg = color.light_teal })
hi(0, "TSStringRegex", { fg = color.light_teal })
hi(0, "TSStrong", { bold = true })
hi(0, "TSStrike", { fg = color.dark, strikethrough = true })
hi(0, "TSSymbol", { fg = color.light_green })
hi(0, "TSTag", { fg = color.yellow, bold = true })
hi(0, "TSTagDelimiter", { fg = color.light_gray })
hi(0, "TSText", { fg = color.foreground })
hi(0, "TSTitle", { fg = color.teal, bold = true })
hi(0, "TSType", { fg = color.green, bold = true })
hi(0, "TSTypeBuiltin", { fg = color.green, bold = true, italic = true })
hi(0, "TSTypeDefinition", { fg = color.green, bold = true })
hi(0, "TSURI", { fg = color.teal, underline = true })
hi(0, "TSUnderline", { underline = true })
hi(0, "TSVariable", { fg = color.foreground })
hi(0, "TSVariableBuiltin",{ fg = color.light_teal, italic = true })
-- ── Statement / Identifier overrides ─────────────────────────────────────
hi(0, "Statement", { link = "TSKeyword" })
hi(0, "Comment", { link = "TSComment" })
hi(0, "Number", { link = "TSNumber" })
hi(0, "String", { link = "TSString" })
hi(0, "Identifier", { link = "TSVariable" })
hi(0, "@lsp.type.keyword.go", { link = "TSKeyword" })
hi(0, "@lsp.type.string.go", { link = "TSString" })
hi(0, "@lsp.type.function", { link = "TSFunctionCall" })
hi(0, "@lsp.typemod.function.definition", { link = "TSFunction" })
hi(0, "@lsp.type.method", { link = "TSMethod" })
hi(0, "goBlock", { link = "TSVariable" })
hi(0, "goImportString", { link = "TSString" })
-- ── Diagnostics ───────────────────────────────────────────────────────────
hi(0, "DiagnosticError", { fg = color.red })
hi(0, "DiagnosticWarn", { fg = color.yellow })
hi(0, "DiagnosticInfo", { fg = color.teal })
hi(0, "DiagnosticHint", { fg = color.light_teal })
hi(0, "DiagnosticUnderlineError", { sp = color.red, undercurl = true })
hi(0, "DiagnosticUnderlineWarn", { sp = color.yellow, undercurl = true })
hi(0, "DiagnosticUnderlineInformation",{ sp = color.teal, undercurl = true })
hi(0, "DiagnosticUnderlineHint", { sp = color.light_teal, undercurl = true })
hi(0, "DiagnosticUnderlineWarning", { sp = color.yellow, undercurl = true })
hi(0, "LspDiagnosticsDefaultError", { link = "DiagnosticError" })
hi(0, "LspDiagnosticsDefaultHint", { link = "DiagnosticHint" })
hi(0, "LspDiagnosticsDefaultInformation", { link = "DiagnosticInfo" })
hi(0, "LspDiagnosticsDefaultWarning", { link = "DiagnosticWarn" })
hi(0, "LspDiagnosticsUnderlineError", { link = "DiagnosticUnderlineError" })
hi(0, "LspDiagnosticsUnderlineHint", { link = "DiagnosticUnderlineHint" })
hi(0, "LspDiagnosticsUnderlineInformation",{ link = "DiagnosticUnderlineInformation" })
hi(0, "LspDiagnosticsUnderlineWarning", { link = "DiagnosticUnderlineWarning" })
hi(0, "LspReferenceRead", { sp = color.light_gray, underline = true })
hi(0, "LspReferenceText", { sp = color.light_gray, underline = true })
hi(0, "LspReferenceWrite", { sp = color.light_gray, underline = true })
-- ── nvim-cmp ──────────────────────────────────────────────────────────────
if M.config.opt.integrations.nvim_cmp then
hi(0, "CmpDocumentation", { fg = color.foreground })
hi(0, "CmpDocumentationBorder", { fg = color.comment })
hi(0, "CmpItemAbbr", { fg = color.foreground })
hi(0, "CmpItemAbbrDeprecated", { fg = color.comment, strikethrough = true })
hi(0, "CmpItemAbbrMatch", { fg = color.teal, bold = true })
hi(0, "CmpItemAbbrMatchFuzzy", { fg = color.teal })
hi(0, "CmpItemKindDefault", { fg = color.teal })
hi(0, "CmpItemKindClass", { fg = color.green, bold = true })
hi(0, "CmpItemKindConstant", { fg = color.purple })
hi(0, "CmpItemKindConstructor", { fg = color.light_blue })
hi(0, "CmpItemKindEnum", { fg = color.green, bold = true })
hi(0, "CmpItemKindEnumMember", { fg = color.light_purple })
hi(0, "CmpItemKindEvent", { fg = color.green })
hi(0, "CmpItemKindField", { fg = color.foreground })
hi(0, "CmpItemKindFunction", { fg = color.teal, bold = true })
hi(0, "CmpItemKindInterface", { fg = color.green })
hi(0, "CmpItemKindKeyword", { fg = color.yellow, bold = true })
hi(0, "CmpItemKindMethod", { fg = color.teal, bold = true })
hi(0, "CmpItemKindModule", { fg = color.foreground })
hi(0, "CmpItemKindOperator", { fg = color.light_gray })
hi(0, "CmpItemKindProperty", { fg = color.foreground })
hi(0, "CmpItemKindReference", { fg = color.foreground })
hi(0, "CmpItemKindSnippet", { fg = color.light_gray })
hi(0, "CmpItemKindStruct", { fg = color.green, bold = true })
hi(0, "CmpItemKindTypeParameter",{ fg = color.light_purple })
hi(0, "CmpItemKindUnit", { fg = color.light_yellow })
hi(0, "CmpItemKindValue", { fg = color.purple })
hi(0, "CmpItemKindVariable", { fg = color.foreground })
hi(0, "CmpItemMenu", { fg = color.comment })
end
-- ── DAP ───────────────────────────────────────────────────────────────────
if M.config.opt.integrations.dap_nvim then
hi(0, "DapUIBreakpointsCurrentLine", { bold = true, fg = color.light_green })
hi(0, "DapUIBreakpointsDisabledLine",{ fg = color.comment })
hi(0, "DapUIBreakpointsInfo", { fg = color.light_green })
hi(0, "DapUIBreakpointsPath", { fg = color.light_teal })
hi(0, "DapUIDecoration", { fg = color.light_teal })
hi(0, "DapUIFloatBorder", { fg = color.light_teal })
hi(0, "DapUILineNumber", { fg = color.light_teal })
hi(0, "DapUIModifiedValue", { bold = true, fg = color.light_teal })
hi(0, "DapUIPlayPause", { fg = color.light_green })
hi(0, "DapUIPlayPauseNC", { fg = color.light_green })
hi(0, "DapUIRestart", { fg = color.light_green })
hi(0, "DapUIRestartNC", { fg = color.light_green })
hi(0, "DapUIScope", { fg = color.teal })
hi(0, "DapUISource", { fg = color.light_purple })
hi(0, "DapUIStepBack", { fg = color.teal })
hi(0, "DapUIStepBackNC", { fg = color.teal })
hi(0, "DapUIStepInto", { fg = color.teal })
hi(0, "DapUIStepIntoNC", { fg = color.teal })
hi(0, "DapUIStepOut", { fg = color.teal })
hi(0, "DapUIStepOutNC", { fg = color.teal })
hi(0, "DapUIStepOver", { fg = color.teal })
hi(0, "DapUIStepOverNC", { fg = color.teal })
hi(0, "DapUIStop", { fg = color.red })
hi(0, "DapUIStopNC", { fg = color.red })
hi(0, "DapUIStoppedThread", { fg = color.light_teal })
hi(0, "DapUIThread", { fg = color.light_green })
hi(0, "DapUIType", { fg = color.light_purple })
hi(0, "DapUIUnavailable", { fg = color.comment })
hi(0, "DapUIUnavailableNC", { fg = color.comment })
hi(0, "DapUIWatchesEmpty", { fg = color.red })
hi(0, "DapUIWatchesError", { fg = color.red })
hi(0, "DapUIWatchesValue", { fg = color.light_green })
end
-- ── Git ───────────────────────────────────────────────────────────────────
hi(0, "GitGutterAdd", { fg = color.green })
hi(0, "GitGutterChange", { fg = color.teal })
hi(0, "GitGutterChangeDelete", { fg = color.yellow })
hi(0, "GitGutterDelete", { fg = color.red })
hi(0, "GitSignsCurrentLineBlame", { fg = color.comment, italic = true })
hi(0, "GitSignsStagedAdd", { fg = color.light_green })
hi(0, "GitSignsStagedChange", { fg = color.teal })
hi(0, "GitSignsStagedDelete", { fg = color.red })
hi(0, "gitcommitBranch", { bold = true, fg = color.yellow })
hi(0, "gitcommitComment", { fg = color.comment })
hi(0, "gitcommitDiscarded", { fg = color.comment })
hi(0, "gitcommitDiscardedFile", { bold = true, fg = color.red })
hi(0, "gitcommitDiscardedType", { fg = color.teal })
hi(0, "gitcommitHeader", { fg = color.yellow, bold = true })
hi(0, "gitcommitOverflow", { fg = color.red })
hi(0, "gitcommitSelected", { fg = color.comment })
hi(0, "gitcommitSelectedFile", { bold = true, fg = color.light_green })
hi(0, "gitcommitSelectedType", { fg = color.teal })
hi(0, "gitcommitSummary", { fg = color.light_green })
hi(0, "gitcommitUnmergedFile", { bold = true, fg = color.red })
hi(0, "gitcommitUnmergedType", { fg = color.teal })
hi(0, "gitcommitUntracked", { fg = color.comment })
hi(0, "gitcommitUntrackedFile", { fg = color.light_yellow })
-- ── Notify ────────────────────────────────────────────────────────────────
hi(0, "NotifyDEBUGBody", { link = "Normal" })
hi(0, "NotifyDEBUGBorder", { fg = color.comment })
hi(0, "NotifyDEBUGIcon", { fg = color.comment })
hi(0, "NotifyDEBUGTitle", { fg = color.comment })
hi(0, "NotifyERRORBody", { link = "Normal" })
hi(0, "NotifyERRORBorder", { fg = color.red })
hi(0, "NotifyERRORIcon", { fg = color.red })
hi(0, "NotifyERRORTitle", { fg = color.red })
hi(0, "NotifyINFOBody", { link = "Normal" })
hi(0, "NotifyINFOBorder", { fg = color.light_gray })
hi(0, "NotifyINFOIcon", { fg = color.light_gray })
hi(0, "NotifyINFOTitle", { fg = color.light_gray })
hi(0, "NotifyTRACEBody", { link = "Normal" })
hi(0, "NotifyTRACEBorder", { fg = color.purple })
hi(0, "NotifyTRACEIcon", { fg = color.purple })
hi(0, "NotifyTRACETitle", { fg = color.purple })
hi(0, "NotifyWARNBody", { link = "Normal" })
hi(0, "NotifyWARNBorder", { fg = color.yellow })
hi(0, "NotifyWARNIcon", { fg = color.yellow })
hi(0, "NotifyWARNTitle", { fg = color.yellow })
-- ── Telescope ─────────────────────────────────────────────────────────────
if M.config.opt.integrations.telescope then
hi(0, "TelescopeBorder", { bg = color.dark, fg = color.dark })
hi(0, "TelescopeNormal", { bg = color.dark })
hi(0, "TelescopePreviewLine", { bg = color.cursor_line })
hi(0, "TelescopePreviewTitle", { bg = color.light_green, fg = color.background })
hi(0, "TelescopePromptBorder", { bg = color.medium_gray, fg = color.medium_gray })
hi(0, "TelescopePromptNormal", { bg = color.medium_gray, fg = color.foreground })
hi(0, "TelescopePromptPrefix", { bg = color.medium_gray, fg = color.red })
hi(0, "TelescopePromptTitle", { bg = color.red, fg = color.background })
hi(0, "TelescopeResultsTitle", { bg = color.dark, fg = color.dark })
hi(0, "TelescopeSelection", { bg = color.medium_gray })
end
-- ── Snacks Dashboard ──────────────────────────────────────────────────────
hi(0, "SnacksDashboardHeader", { fg = color.yellow, bold = true })
hi(0, "SnacksDashboardTitle", { fg = color.yellow, bold = true })
hi(0, "SnacksDashboardIcon", { fg = color.teal })
hi(0, "SnacksDashboardDesc", { fg = color.light_gray })
hi(0, "SnacksDashboardFile", { fg = color.light_teal, bold = true })
hi(0, "SnacksDashboardKey", { fg = color.yellow, bold = true })
hi(0, "SnacksDashboardSpecial", { fg = color.light_gray })
hi(0, "SnacksDashboardDir", { fg = color.light_gray })
hi(0, "SnacksDashboardNormal", { fg = color.light_gray })
hi(0, "SnacksDashboardTerminal", { fg = color.light_gray })
hi(0, "SnacksDashboardFooter", { fg = color.comment })
-- ── Neo-Tree ──────────────────────────────────────────────────────────────
hi(0, "NeoTreeFileName", { fg = color.foreground })
hi(0, "NeoTreeDotfile", { fg = color.comment })
hi(0, "NeoTreeDirectoryName", { fg = color.yellow, bold = true })
hi(0, "NeoTreeDirectoryIcon", { fg = color.yellow })
hi(0, "NeoTreeGitModified", { fg = color.yellow })
hi(0, "NeoTreeGitStaged", { fg = color.green })
hi(0, "NeoTreeGitUntracked", { fg = color.purple })
hi(0, "NeoTreeNormal", { fg = color.foreground, bg = color.dark })
hi(0, "NeoTreeNormalNC", { fg = color.foreground, bg = color.dark })
hi(0, "NeoTreeTabActive", { fg = color.foreground, bg = color.dark, bold = true })
hi(0, "NeoTreeTabInactive", { fg = color.comment, bg = color.dark })
hi(0, "NeoTreeTabSeparatorActive", { fg = color.foreground, bg = color.dark })
hi(0, "NeoTreeTabSeparatorInactive", { fg = color.comment, bg = color.dark })
-- ── Copilot ───────────────────────────────────────────────────────────────
hi(0, "CopilotSuggestion", { fg = color.comment })
-- ── Spell ─────────────────────────────────────────────────────────────────
hi(0, "SpellBad", { sp = color.red, undercurl = true })
hi(0, "SpellCap", { sp = color.teal, undercurl = true })
hi(0, "SpellLocal", { sp = color.green, undercurl = true })
hi(0, "SpellRare", { sp = color.yellow, undercurl = true })
-- ── nvim-ts-rainbow ───────────────────────────────────────────────────────
hi(0, "rainbowcol1", { fg = color.foreground })
hi(0, "rainbowcol2", { fg = color.yellow })
hi(0, "rainbowcol3", { fg = color.green })
hi(0, "rainbowcol4", { fg = color.light_purple })
hi(0, "rainbowcol5", { fg = color.teal })
hi(0, "rainbowcol6", { fg = color.pink })
hi(0, "rainbowcol7", { fg = color.light_teal })
-- ── User / StatusLine accents ─────────────────────────────────────────────
hi(0, "User1", { bg = color.selection, fg = color.red })
hi(0, "User2", { bg = color.selection, fg = color.yellow })
hi(0, "User3", { bg = color.selection, fg = color.foreground })
hi(0, "User4", { bg = color.selection, fg = color.teal })
hi(0, "User5", { bg = color.selection, fg = color.light_gray })
hi(0, "User6", { bg = color.dark, fg = color.light_gray })
hi(0, "User7", { bg = color.selection, fg = color.light_gray })
hi(0, "User8", { bg = color.selection, fg = color.background })
hi(0, "User9", { bg = color.selection, fg = color.background })
-- ── Terminal colors ───────────────────────────────────────────────────────
local g = vim.g
g.terminal_color_0 = color.background
g.terminal_color_1 = color.red
g.terminal_color_2 = color.green
g.terminal_color_3 = color.yellow
g.terminal_color_4 = color.teal
g.terminal_color_5 = color.purple
g.terminal_color_6 = color.light_teal
g.terminal_color_7 = color.light_gray
g.terminal_color_8 = color.comment
g.terminal_color_9 = color.pink
g.terminal_color_10 = color.light_green
g.terminal_color_11 = color.light_yellow
g.terminal_color_12 = color.light_blue
g.terminal_color_13 = color.light_purple
g.terminal_color_14 = color.blue
g.terminal_color_15 = color.foreground
end
return M

1
nvim/nvim/build_targets.json
View file

@ -1 +0,0 @@
{"barsic": "cp ~/engine/builddir/pmc2/pmc2-engine bin/.", "build": "meson compile -C builddir pmc2-engine", "test": "meson test -C builddir -v pmc2_tests", "barsic-master": "cp ~/builddir/pmc2/pmc2-engine && make run_alice"}

11
nvim/nvim/init.lua
View file

@ -1,11 +0,0 @@
-- Default my settings
vim.g.mapleader = " "
vim.wo.number = true
vim.wo.relativenumber = true
vim.opt.wrap = false
-- Add basic configs
require("configs.lazy")
require("mappings")
require("options")
require("custom.init")

49
nvim/nvim/lazy-lock.json
View file

@ -1,49 +0,0 @@
{
"LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"cmp-async-path": { "branch": "main", "commit": "98185a91d49ff5dd249aebf2f7456e18063fa2a0" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
"duckytype.nvim": { "branch": "main", "commit": "fa59fbd7cf8407337bfe07d01b361a3449f34743" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"gitsigns.nvim": { "branch": "main", "commit": "25050e4ed39e628282831d4cbecb1850454ce915" },
"gitui.nvim": { "branch": "main", "commit": "686d74e79899af760ed9f5f0ad2bd1bb1c135e26" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"log-highlight.nvim": { "branch": "main", "commit": "b2e00cfd41ca94338265a595f3f3f423d9f9322e" },
"lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
"marks.nvim": { "branch": "master", "commit": "f353e8c08c50f39e99a9ed474172df7eddd89b72" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "0a695750d747db1e7e70bcf0267ef8951c95fc83" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
"mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" },
"mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" },
"mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" },
"neotest": { "branch": "master", "commit": "ad991822b7076b1d940b33a9d6d0d30416d5df81" },
"neotest-gtest": { "branch": "main", "commit": "b66f1d33cbf3b37b9803e6bc7ef47ac60eba86b1" },
"neotest-phpunit": { "branch": "main", "commit": "40e53c4294726a16f34f1a383a94c570553c6d46" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" },
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
"nvim-lspconfig": { "branch": "master", "commit": "ed19590a3a9792901553c388d1aadafce012f80d" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
"nvim-tree.lua": { "branch": "master", "commit": "82f58063d67defc620e1ef8be606fc62a7b5dc1e" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
"nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
"persisted.nvim": { "branch": "main", "commit": "1a8e9dcf277d61105619498b2002c287c50424b8" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"screenkey.nvim": { "branch": "main", "commit": "16390931d847b1d5d77098daccac4e55654ac9e2" },
"snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" },
"telescope.nvim": { "branch": "master", "commit": "7d324792b7943e4aa16ad007212e6acc6f9fe335" },
"vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
}

81
nvim/nvim/lua/configs/bufferline.lua
View file

@ -1,81 +0,0 @@
local bufferline = require('bufferline')
bufferline.setup {
options = {
mode = "buffers", -- set to "tabs" to only show tabpages instead
style_preset = bufferline.style_preset.default,
themable = true,
indicator = {
icon = '▎',
style = 'icon',
},
groups = {
items = {
{
name = 'tornado',
matcher = function(buf)
return (buf.path or ""):lower():match("tornado")
end,
},
{
name = 'gornado',
matcher = function(buf)
return (buf.path or ""):lower():match("gornado")
end,
},
{
name = 'tests',
matcher = function(buf)
return (buf.name or ""):lower():match("*test*%.cpp$")
end,
},
{
name = 'code',
matcher = function(buf)
return (buf.name or ""):lower():match("%.h$")
or (buf.name or ""):lower():match("%.c$")
or (buf.name or ""):lower():match("%.cpp$")
end,
},
},
hidden = false,
},
buffer_close_icon = '󰅖',
modified_icon = '● ',
close_icon = '',
left_trunc_marker = '',
right_trunc_marker = '',
max_name_length = 18,
max_prefix_length = 15,
truncate_names = true,
tab_size = 18,
offsets = {
{
filetype = "NvimTree",
text = "File Explorer",
text_align = "left",
separator = true
}
},
color_icons = true,
get_element_icon = function(element)
local icon, hl = require('nvim-web-devicons').get_icon_by_filetype(element.filetype, { default = false })
return icon, hl
end,
show_buffer_icons = true,
show_buffer_close_icons = true,
show_close_icon = true,
show_tab_indicators = true,
separator_style = "slant",
enforce_regular_tabs = false,
always_show_bufferline = true,
auto_toggle_bufferline = true,
hover = {
enabled = true,
delay = 200,
reveal = {'close'}
},
pick = {
alphabet = "abcdefghijklmopqrstuvwxyzABCDEFGHIJKLMOPQRSTUVWXYZ1234567890",
},
}
}

55
nvim/nvim/lua/configs/cmp.lua
View file

@ -1,55 +0,0 @@
local cmp = require "cmp"
local options = {
completion = { completeopt = "menu,menuone" },
snippet = {
expand = function(args)
require("luasnip").lsp_expand(args.body)
end,
},
mapping = {
["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-n>"] = cmp.mapping.select_next_item(),
["<C-d>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Insert,
select = true,
},
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif require("luasnip").expand_or_jumpable() then
require("luasnip").expand_or_jump()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif require("luasnip").jumpable(-1) then
require("luasnip").jump(-1)
else
fallback()
end
end, { "i", "s" }),
},
sources = {
{ name = "nvim_lsp" },
{ name = "luasnip" },
{ name = "buffer" },
{ name = "nvim_lua" },
{ name = "async_path" },
},
}
return vim.tbl_deep_extend("force", options, {})

14
nvim/nvim/lua/configs/conform.lua
View file

@ -1,14 +0,0 @@
require('conform').setup({
formatters_by_ft = {
lua = { "stylua" },
cpp = { "clang-format" },
go = { "gofmr" },
},
format_on_save = {
-- These options will be passed to conform.format()
timeout_ms = 500,
lsp_fallback = true,
},
notify_on_error = true,
})

53
nvim/nvim/lua/configs/gitsigns.lua
View file

@ -1,53 +0,0 @@
return {
signs = {
add = { text = "▎" },
change = { text = "▎" },
delete = { text = "" },
topdelete = { text = "" },
changedelete = { text = "▎" },
untracked = { text = "▎" },
},
signs_staged = {
add = { text = "▎" },
change = { text = "▎" },
delete = { text = "" },
topdelete = { text = "" },
changedelete = { text = "▎" },
},
on_attach = function(buffer)
local gs = package.loaded.gitsigns
local function map(mode, l, r, desc)
vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true })
end
-- stylua: ignore start
map("n", "]h", function()
if vim.wo.diff then
vim.cmd.normal({ "]c", bang = true })
else
gs.nav_hunk("next")
end
end, "Next Hunk")
map("n", "[h", function()
if vim.wo.diff then
vim.cmd.normal({ "[c", bang = true })
else
gs.nav_hunk("prev")
end
end, "Prev Hunk")
map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
map({ "n", "x" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
map({ "n", "x" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
map("n", "<leader>ghp", gs.preview_hunk_inline, "Preview Hunk Inline")
map("n", "<leader>ghb", function() gs.blame_line({ full = true }) end, "Blame Line")
map("n", "<leader>ghB", function() gs.blame() end, "Blame Buffer")
map("n", "<leader>ghd", gs.diffthis, "Diff This")
map("n", "<leader>ghD", function() gs.diffthis("~") end, "Diff This ~")
map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "GitSigns Select Hunk")
end,
}

26
nvim/nvim/lua/configs/lazy.lua
View file

@ -1,26 +0,0 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ "\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
os.exit(1)
end
end
vim.opt.rtp:prepend(lazypath)
vim.g.mapleader = " "
vim.g.maplocalleader = "\\"
require("lazy").setup({
spec = {
{ import = "plugins" },
},
install = { colorscheme = { "habamax" } },
checker = { enabled = true },
})

55
nvim/nvim/lua/configs/lsp/e-lspconfig.lua
View file

@ -1,55 +0,0 @@
local M = {}
local map = vim.keymap.set
-- export on_attach & capabilities
M.on_attach = function(_, bufnr)
local function opts(desc)
return { buffer = bufnr, desc = "LSP " .. desc }
end
map("n", "gD", vim.lsp.buf.declaration, opts "Go to declaration")
map("n", "gd", vim.lsp.buf.definition, opts "Go to definition")
map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts "Add workspace folder")
map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts "Remove workspace folder")
map("n", "<leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts "List workspace folders")
map("n", "<leader>D", vim.lsp.buf.type_definition, opts "Go to type definition")
end
-- disable semanticTokens
M.on_init = function(client, _)
if vim.fn.has "nvim-0.11" ~= 1 then
if client.supports_method "textDocument/semanticTokens" then
client.server_capabilities.semanticTokensProvider = nil
end
else
if client:supports_method "textDocument/semanticTokens" then
client.server_capabilities.semanticTokensProvider = nil
end
end
end
M.capabilities = vim.lsp.protocol.make_client_capabilities()
M.capabilities.textDocument.completion.completionItem = {
documentationFormat = { "markdown", "plaintext" },
snippetSupport = true,
preselectSupport = true,
insertReplaceSupport = true,
labelDetailsSupport = true,
deprecatedSupport = true,
commitCharactersSupport = true,
tagSupport = { valueSet = { 1 } },
resolveSupport = {
properties = {
"documentation",
"detail",
"additionalTextEdits",
},
},
}
return M

111
nvim/nvim/lua/configs/lsp/lspconfig.lua
View file

@ -1,111 +0,0 @@
local on_attach = require("configs.lsp.e-lspconfig").on_attach
local on_init = require("configs.lsp.e-lspconfig").on_init
local capabilities = require("configs.lsp.e-lspconfig").capabilities
-- C/C++
vim.lsp.config('clangd', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = {
"clangd-22",
"--clang-tidy",
},
filetypes = { "c", "cpp", "h", "hpp", "objc", "objcpp" },
root_markers = { '.git' },
})
vim.lsp.enable('clangd')
-- Go (gopls) lsp server
vim.lsp.config('gopls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'gopls' },
filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' },
root_markers = { 'go.mod', '.git' },
single_file_support = true,
settings = {
gopls = {
completeUnimported = true,
usePlaceholders = true,
analyses = {
unusedparams = true,
},
staticcheck = true,
gofumpt = true,
},
},
})
vim.lsp.enable('gopls')
-- PhP
vim.lsp.config('phpactor', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'phpactor', 'language-server' },
filetypes = { 'php' },
root_markers = { 'composer.json', '.git' },
init_options = {
["language_server_phpstan.enabled"] = false,
["language_server_psalm.enabled"] = false,
}
})
vim.lsp.enable('phpactor')
-- Lua
vim.lsp.config('lua_ls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'lua-language-server' },
filetypes = { 'lua' },
root_markers = { '.luarc.json', '.luarc.jsonc', '.git' },
single_file_support = true,
settings = {
Lua = {
telemetry = { enable = false },
runtime = { version = 'LuaJIT' },
diagnostics = { globals = { 'vim' } },
workspace = {
checkThirdParty = false,
library = {
vim.env.VIMRUNTIME,
vim.fn.stdpath('config'),
},
},
},
}
})
vim.lsp.enable('lua_ls')
-- Bash
vim.lsp.config('bashls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'bash-language-server', 'start' },
filetypes = { 'sh', 'bash' },
root_markers = { '.git' },
single_file_support = true,
})
vim.lsp.enable('bashls')
-- Meson
vim.lsp.config('meson_ls', {
on_attach = on_attach,
on_init = on_init,
capabilities = capabilities,
cmd = { 'mesonlsp' },
filetypes = { 'meson' },
root_markers = { 'meson.build', '.git' },
single_file_support = true,
settings = {}
})
vim.lsp.enable('meson_ls')
-- For all
vim.diagnostic.config({
virtual_text = false,
})

54
nvim/nvim/lua/configs/lualine.lua
View file

@ -1,54 +0,0 @@
require('lualine').setup {
options = {
icons_enabled = true,
theme = 'auto',
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' },
disabled_filetypes = {
statusline = {},
winbar = {},
},
ignore_focus = {},
always_divide_middle = true,
always_show_tabline = true,
globalstatus = false,
refresh = {
statusline = 1000,
tabline = 1000,
winbar = 1000,
refresh_time = 16, -- ~60fps
events = {
'WinEnter',
'BufEnter',
'BufWritePost',
'SessionLoadPost',
'FileChangedShellPost',
'VimResized',
'Filetype',
'CursorMoved',
'CursorMovedI',
'ModeChanged',
},
}
},
sections = {
lualine_a = { 'mode' },
lualine_b = { 'branch', 'diff', 'diagnostics' },
lualine_c = { 'filename' },
lualine_x = { 'fileformat', 'filetype' },
lualine_y = { 'lsp_status' },
lualine_z = { 'location' }
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { 'filename' },
lualine_x = { 'location' },
lualine_y = {},
lualine_z = {}
},
tabline = {},
winbar = {},
inactive_winbar = {},
extensions = {}
}

11
nvim/nvim/lua/configs/luasnip.lua
View file

@ -1,11 +0,0 @@
-- vscode format
require("luasnip.loaders.from_vscode").lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
-- snipmate format
require("luasnip.loaders.from_snipmate").load()
require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
-- lua format
require("luasnip.loaders.from_lua").load()
require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }

94
nvim/nvim/lua/configs/nvim-dap.lua
View file

@ -1,94 +0,0 @@
local M = {}
function M.setup()
local dap = require("dap")
local dapui = require("dapui")
-- Настройка адаптера codelldb для C/C++
dap.adapters.codelldb = {
type = 'server',
port = '${port}',
executable = {
command = vim.fn.stdpath("data") .. '/mason/bin/codelldb',
args = { '--port', '${port}' },
env = {
ASAN_OPTIONS = "ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1",
},
}
}
-- Конфигурации для C/C++
dap.configurations.cpp = {
{
name = "Launch file",
type = "codelldb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = '${workspaceFolder}',
stopOnEntry = false,
args = {},
},
}
-- Используем те же конфигурации для C
dap.configurations.c = dap.configurations.cpp
-- Настройка dap-ui :cite[1]:cite[4]
dapui.setup({
layouts = {
{
elements = {
{ id = "scopes", size = 0.33 },
{ id = "stacks", size = 0.25 },
{ id = "watches", size = 0.25 },
},
size = 0.33,
position = "right",
},
{
elements = {
{ id = "console", size = 0.55 },
},
size = 0.67,
position = "bottom",
},
},
})
-- Автоматическое открытие/закрытие UI :cite[1]:cite[9]
dap.listeners.after.event_initialized["dapui_config"] = function()
dapui.open({})
end
dap.listeners.before.event_terminated["dapui_config"] = function()
dapui.close({})
end
dap.listeners.before.event_exited["dapui_config"] = function()
dapui.close({})
end
-- Цвета на задний фон для debug
vim.api.nvim_set_hl(0, 'DapBreakpoint', { fg = '#993939', bg = '#31353f' })
vim.api.nvim_set_hl(0, 'DapLogPoint', { fg = '#61afef', bg = '#31353f' })
vim.api.nvim_set_hl(0, 'DapStopped', { fg = '#98c379', bg = '#31353f' })
-- Настройка значков для точек останова :cite[1]:cite[10]
vim.fn.sign_define('DapBreakpoint', {
text = '',
texthl = 'DapBreakpoint',
linehl = 'DapBreakpoint',
numhl =
'DapBreakpoint'
})
vim.fn.sign_define('DapBreakpointCondition',
{ text = 'ﳁ', texthl = 'DapBreakpoint', linehl = 'DapBreakpoint', numhl = 'DapBreakpoint' })
vim.fn.sign_define('DapBreakpointRejected',
{ text = '', texthl = 'DapBreakpoint', linehl = 'DapBreakpoint', numhl = 'DapBreakpoint' })
vim.fn.sign_define('DapLogPoint', { text = '', texthl = 'DapLogPoint', linehl = 'DapLogPoint', numhl = 'DapLogPoint' })
vim.fn.sign_define('DapStopped', { text = '', texthl = 'DapStopped', linehl = 'DapStopped', numhl = 'DapStopped' })
vim.fn.sign_define("DapBreakpointRejected", { text = "❌", texthl = "LspDiagnosticsSignHint" })
end
return M

105
nvim/nvim/lua/configs/nvimtree.lua
View file

@ -1,105 +0,0 @@
-- return {
-- filters = { dotfiles = false, git_ignored = false, },
-- disable_netrw = true,
-- hijack_cursor = true,
-- sync_root_with_cwd = true,
-- update_focused_file = {
-- enable = true,
-- update_root = false,
-- },
-- bookmarks = {
-- persist = true,
-- },
-- view = {
-- width = 30,
-- preserve_window_proportions = true,
-- },
-- renderer = {
-- root_folder_label = false,
-- highlight_git = true,
-- indent_markers = { enable = true },
-- icons = {
-- glyphs = {
-- default = "󰈚",
-- folder = {
-- default = "",
-- empty = "",
-- empty_open = "",
-- open = "",
-- symlink = "",
-- },
-- git = { unmerged = "" },
-- },
-- },
-- },
-- }
return {
filters = {
dotfiles = false,
git_ignored = false,
},
disable_netrw = true,
hijack_cursor = true,
sync_root_with_cwd = true,
update_focused_file = {
enable = true,
update_root = false,
},
bookmarks = {
persist = true,
},
git = {
enable = true,
ignore = false,
timeout = 5000,
},
view = {
width = 30,
preserve_window_proportions = true,
},
renderer = {
root_folder_label = false,
highlight_git = "all",
indent_markers = {
enable = true,
},
icons = {
show = {
git = true,
modified = false,
file = true,
folder = true,
folder_arrow = true,
},
glyphs = {
default = "󰈚",
folder = {
default = "",
empty = "",
empty_open = "",
open = "",
symlink = "",
},
git = {
unstaged = "✗",
staged = "✓",
unmerged = "",
renamed = "➜",
untracked = "★",
deleted = "",
ignored = "◌",
},
},
},
},
}

22
nvim/nvim/lua/configs/telescope.lua
View file

@ -1,22 +0,0 @@
require("telescope").setup(){
defaults = {
prompt_prefix = "",
selection_caret = " ",
entry_prefix = " ",
sorting_strategy = "ascending",
layout_config = {
horizontal = {
prompt_position = "top",
preview_width = 0.55,
},
width = 0.87,
height = 0.80,
},
mappings = {
n = { ["q"] = require("telescope.actions").close },
},
},
extensions_list = { "themes", "terms", "noice", "persisted" },
extensions = { "noice", "persisted" },
}

21
nvim/nvim/lua/configs/ufo.lua
View file

@ -1,21 +0,0 @@
vim.o.foldcolumn = '1' -- '0' is not bad
vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
vim.o.foldlevelstart = 99
vim.o.foldenable = true
-- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself
vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
vim.keymap.set('n', 'zK', function()
local winid = require('ufo').peekFoldedLinesUnderCursor()
if not winid then
vim.lsp.buf.hover()
end
end, {desc = "Peek Fold"})
require("ufo").setup({
provider_selector = function(bufnr, filetype, buftype)
return { 'lsp', 'indent' }
end
})

30
nvim/nvim/lua/custom/init.lua
View file

@ -1,30 +0,0 @@
-- ========== Telescope ============= --
require("telescope").load_extension("noice")
require("telescope.themes").get_dropdown()
-- ========== Theme ============= --
require("custom.darcula").setup()
-- ========== Make ============= --
require("custom.make")
-- ========== Formating ============= --
-- vim.api.nvim_create_autocmd("BufWritePre", {
-- pattern = { "*.c", "*.cpp", "*.h", "*.hpp", "*.go" },
-- callback = function()
-- vim.lsp.buf.format()
-- end,
-- })
-- ========== Clipboard ============= --
vim.o.clipboard = "unnamedplus"
vim.api.nvim_create_autocmd("TextYankPost", {
callback = function()
-- vim.highlight.on_yank()
local copy_to_unnamedplus = require("vim.ui.clipboard.osc52").copy("+")
copy_to_unnamedplus(vim.v.event.regcontents)
local copy_to_unnamed = require("vim.ui.clipboard.osc52").copy("*")
copy_to_unnamed(vim.v.event.regcontents)
end,
})

184
nvim/nvim/lua/custom/make.lua
View file

@ -1,184 +0,0 @@
_G.last_make_command = nil
_G.make_terminal_buf = nil
_G.build_targets = {}
local config_file = vim.fn.stdpath('config') .. '/build_targets.json'
-- Загрузка таргетов из файла
local function load_targets()
local ok, data = pcall(vim.fn.readfile, config_file)
if ok and data[1] then
_G.build_targets = vim.fn.json_decode(data[1])
else
_G.build_targets = {}
end
end
-- Сохранение таргетов в файл
local function save_targets()
local data = vim.fn.json_encode(_G.build_targets)
vim.fn.writefile({data}, config_file)
end
-- Загружаем таргеты при старте
load_targets()
local function run_make_command(command)
if _G.make_terminal_buf and vim.api.nvim_buf_is_valid(_G.make_terminal_buf) then
vim.cmd('buffer ' .. _G.make_terminal_buf)
else
vim.cmd('terminal')
_G.make_terminal_buf = vim.api.nvim_get_current_buf()
end
vim.cmd('startinsert')
vim.defer_fn(function()
if vim.b.terminal_job_id then
vim.fn.chansend(vim.b.terminal_job_id, "clear\n")
vim.fn.chansend(vim.b.terminal_job_id, command .. "\n")
end
end, 300)
end
-- Основная команда сборки (оставьте вашу текущую)
vim.api.nvim_create_user_command('Build', function()
vim.ui.input({
prompt = 'Флаги сборки: ',
default = '',
}, function(flags)
if flags == nil then return end
vim.ui.input({
prompt = 'Имя проекта: ',
default = '',
}, function(project_name)
if project_name == nil then return end
local make_cmd = "meson compile" .. flags .. " " .. project_name
_G.last_make_command = make_cmd
run_make_command(make_cmd)
vim.notify("🔨 Сборка запущена: " .. make_cmd)
end)
end)
end, {
desc = "Сборка проекта в терминале"
})
vim.api.nvim_create_user_command('TargetNew', function()
vim.ui.input({
prompt = 'Название таргета: ',
default = '',
}, function(target_name)
if target_name == nil or target_name == '' then return end
vim.ui.input({
prompt = 'Команда сборки для "' .. target_name .. '": ',
default = '',
}, function(build_command)
if build_command == nil or build_command == '' then return end
_G.build_targets[target_name] = build_command
save_targets()
vim.notify("✅ Таргет '" .. target_name .. "' сохранен")
end)
end)
end, {
desc = "Создать новый таргет сборки"
})
-- ПЕРЕПИСАННАЯ команда для выбора таргета с использованием vim.ui.select
vim.api.nvim_create_user_command('Target', function()
local target_count = 0
for _ in pairs(_G.build_targets) do
target_count = target_count + 1
end
if target_count == 0 then
vim.notify("❌ Нет сохраненных таргетов. Используйте :TargetNew", vim.log.levels.ERROR)
return
end
-- Подготавливаем список для vim.ui.select
local targets_list = {}
for name, cmd in pairs(_G.build_targets) do
table.insert(targets_list, {
name = name,
cmd = cmd,
-- Форматируем для красивого отображения
display = string.format("🔨 %s\n 📝 %s", name, cmd)
})
end
-- Сортируем по имени
table.sort(targets_list, function(a, b) return a.name < b.name end)
vim.ui.select(targets_list, {
prompt = '📋 Выберите таргет сборки:',
format_item = function(item)
return item.display
end,
}, function(selected)
if not selected then
vim.notify("❌ Выбор отменен", vim.log.levels.WARN)
return
end
_G.last_make_command = selected.cmd
run_make_command(selected.cmd)
vim.notify("🔨 Запускаю: " .. selected.cmd)
end)
end, {
desc = "Выбрать таргет сборки"
})
-- Команда для просмотра всех таргетов
vim.api.nvim_create_user_command('TargetList', function()
local target_count = 0
for _ in pairs(_G.build_targets) do
target_count = target_count + 1
end
if target_count == 0 then
print("📝 Список таргетов пуст")
return
end
print("📋 Сохраненные таргеты сборки:")
local targets_list = {}
for name, cmd in pairs(_G.build_targets) do
table.insert(targets_list, { name = name, cmd = cmd })
end
table.sort(targets_list, function(a, b) return a.name < b.name end)
for i, target in ipairs(targets_list) do
print(string.format(" %d. %s → %s", i, target.name, target.cmd))
end
end, {
desc = "Показать список всех таргетов"
})
-- Команда для удаления таргета (уже использует vim.ui.select - оставляем как есть)
vim.api.nvim_create_user_command('TargetDelete', function()
local target_count = 0
for _ in pairs(_G.build_targets) do
target_count = target_count + 1
end
if target_count == 0 then
vim.notify("❌ Нет сохраненных таргетов", vim.log.levels.ERROR)
return
end
local targets_list = {}
for name, cmd in pairs(_G.build_targets) do
table.insert(targets_list, name)
end
table.sort(targets_list)
vim.ui.select(targets_list, {
prompt = 'Выберите таргет для удаления:',
}, function(selected)
if not selected then return end
_G.build_targets[selected] = nil
save_targets()
vim.notify("🗑️ Таргет '" .. selected .. "' удален")
end)
end, {
desc = "Удалить таргет сборки"
})
-- Повтор последней сборки (оставьте вашу текущую)
vim.api.nvim_create_user_command('LastBuild', function()
if _G.last_make_command then
run_make_command(_G.last_make_command)
vim.notify("🔁 Повторяю: " .. _G.last_make_command)
else
vim.notify("❌ Нет истории сборок", vim.log.levels.ERROR)
end
end, {
desc = "Повторить последнюю сборку в терминале"
})

234
nvim/nvim/lua/custom/timetracker.lua
View file

@ -1,234 +0,0 @@
local M = {}
local uv = vim.loop
local data_dir = vim.fn.stdpath("data") .. "/time_tracker"
local stats_file = data_dir .. "/stats.json"
local heartbeat_file = data_dir .. "/heartbeat_" .. vim.fn.getpid()
local timer = nil
local last_tick = os.time()
--------------------------------------------------
-- Utils
--------------------------------------------------
local function ensure_dir()
vim.fn.mkdir(data_dir, "p")
end
local function read_stats()
local f = io.open(stats_file, "r")
if not f then return {} end
local content = f:read("*a")
f:close()
return vim.json.decode(content) or {}
end
local function write_stats(data)
local f = io.open(stats_file, "w")
if not f then return end
f:write(vim.json.encode(data))
f:close()
end
local function format_time(seconds)
local h = math.floor(seconds / 3600)
local m = math.floor((seconds % 3600) / 60)
return string.format("%dh %dm", h, m)
end
local function current_filetype()
return vim.bo.filetype ~= "" and vim.bo.filetype or "unknown"
end
--------------------------------------------------
-- Time tracking
--------------------------------------------------
local function update_heartbeat()
local f = io.open(heartbeat_file, "w")
if f then
f:write(os.time())
f:close()
end
end
local function add_time(seconds)
local stats = read_stats()
local date = os.date("%Y-%m-%d")
local ft = current_filetype()
stats[date] = stats[date] or { total = 0, languages = {} }
stats[date].total = stats[date].total + seconds
stats[date].languages[ft] =
(stats[date].languages[ft] or 0) + seconds
write_stats(stats)
end
local function start_timer()
timer = uv.new_timer()
timer:start(0, 5000, vim.schedule_wrap(function()
local now = os.time()
local diff = now - last_tick
last_tick = now
update_heartbeat()
add_time(diff)
end))
end
local function cleanup()
os.remove(heartbeat_file)
end
--------------------------------------------------
-- :TimeToday
--------------------------------------------------
local function show_today()
local stats = read_stats()
local today = os.date("%Y-%m-%d")
local data = stats[today]
if not data then
vim.notify("No activity today 🚀", vim.log.levels.INFO)
return
end
local lines = {}
table.insert(lines, "📅 " .. today)
table.insert(lines, "")
table.insert(lines, "Total: " .. format_time(data.total))
table.insert(lines, "")
table.insert(lines, "Languages:")
for lang, time in pairs(data.languages) do
table.insert(lines, string.format(" %s: %s", lang, format_time(time)))
end
vim.notify(table.concat(lines, "\n"), vim.log.levels.INFO, {
title = "Nvim Time Tracker",
})
end
--------------------------------------------------
-- Heatmap
--------------------------------------------------
local function setup_highlights()
vim.api.nvim_set_hl(0, "TimeHeat0", { fg = "#2d333b" })
vim.api.nvim_set_hl(0, "TimeHeat1", { fg = "#0e4429" })
vim.api.nvim_set_hl(0, "TimeHeat2", { fg = "#006d32" })
vim.api.nvim_set_hl(0, "TimeHeat3", { fg = "#26a641" })
vim.api.nvim_set_hl(0, "TimeHeat4", { fg = "#39d353" })
end
local function get_level(seconds)
if seconds == 0 then return 0 end
if seconds < 1800 then return 1 end
if seconds < 7200 then return 2 end
if seconds < 14400 then return 3 end
return 4
end
local function build_matrix()
local stats = read_stats()
local matrix = {}
for w = 1, 53 do
matrix[w] = {}
for d = 1, 7 do
matrix[w][d] = 0
end
end
local today = os.time()
for i = 0, 364 do
local ts = today - i * 86400
local date = os.date("%Y-%m-%d", ts)
local weekday = tonumber(os.date("%w", ts))
weekday = weekday == 0 and 7 or weekday
local week = math.floor((364 - i) / 7) + 1
if week <= 53 then
matrix[week][weekday] =
stats[date] and stats[date].total or 0
end
end
return matrix
end
local function show_year()
setup_highlights()
local matrix = build_matrix()
local buf = vim.api.nvim_create_buf(false, true)
local lines = {}
table.insert(lines, " 📈 Nvim Activity — Last 365 Days")
table.insert(lines, "")
for day = 1, 7 do
local line = ""
for week = 1, 53 do
line = line .. "██"
end
table.insert(lines, line)
end
vim.api.nvim_buf_set_lines(buf, 0, -1, false, lines)
for day = 1, 7 do
for week = 1, 53 do
local seconds = matrix[week][day]
local level = get_level(seconds)
vim.api.nvim_buf_add_highlight(
buf,
-1,
"TimeHeat" .. level,
day + 1,
(week - 1) * 2,
(week - 1) * 2 + 2
)
end
end
local width = 53 * 2 + 4
local height = 10
local win = vim.api.nvim_open_win(buf, true, {
relative = "editor",
width = width,
height = height,
row = math.floor((vim.o.lines - height) / 2),
col = math.floor((vim.o.columns - width) / 2),
style = "minimal",
border = "rounded",
})
vim.keymap.set("n", "q", function()
vim.api.nvim_win_close(win, true)
end, { buffer = buf })
end
--------------------------------------------------
-- Setup
--------------------------------------------------
function M.setup()
ensure_dir()
start_timer()
vim.api.nvim_create_user_command("TimeToday", show_today, {})
vim.api.nvim_create_user_command("TimeYear", show_year, {})
vim.api.nvim_create_autocmd("VimLeavePre", {
callback = cleanup,
})
end
return M

114
nvim/nvim/lua/mappings.lua
View file

@ -1,114 +0,0 @@
local map = vim.keymap.set
-- ========== Basics =========== --
map("n", ";", ":", { desc = "CMD enter command mode" })
map("i", "jk", "<ESC>")
map("n", "<leader>t", "<cmd>terminal<CR>", { desc = "Create new terminal" })
map("t", "jk", "<C-\\><C-n>")
map("n", "<leader>h", "<C-w>s | <cmd>terminal<CR> | i");
-- ========== Debug =========== --
map('n', '<leader>db', '<cmd>DapToggleBreakpoint<CR>', { desc = 'Toggle breakpoint' })
map('n', '<leader>dr', '<cmd>DapContinue<CR>', { desc = 'Start/continue debug' })
map('n', '<leader>ds', '<cmd>DapStepOver<CR>', { desc = 'Step over' })
map('n', '<leader>di', '<cmd>DapStepInto<CR>', { desc = 'Step into' })
map('n', '<leader>do', '<cmd>DapStepOut<CR>', { desc = 'Step out' })
map('n', '<leader>dq', '<cmd>DapTerminate<CR>', { desc = 'Stop debug' })
map('n', '<leader>du', '<cmd>lua require("dapui").toggle()<CR>', { desc = 'Toggle DAP UI' })
-- ========== LSP =========== --
map('n', '<leader>lo', '<cmd>lua vim.diagnostic.open_float()<CR>',
{ noremap = true, silent = true, desc = 'Open diagnostic' })
map("n", "<leader>ll", '<cmd>lua vim.lsp.buf.code_action()<CR>',
{ noremap = true, silent = true, desc = 'Show complete by lsp' })
map('n', '[l', '<cmd>DapContinue<CR>', { noremap = true, silent = true, desc = 'Go to prev diagnostic' })
map('n', ']l', '<cmd>DapStepOver<CR>', { noremap = true, silent = true, desc = 'Go to next diagnostic' })
map('n', '<leader>lt', '<cmd>DapStepInto<CR>', { noremap = true, silent = true, desc = 'Open toggle' })
map("n", "<leader>ls", vim.diagnostic.setloclist, { desc = "LSP diagnostic loclist" })
map('n', '<leader>lu', function() vim.diagnostic.enable(not vim.diagnostic.is_enabled()) end,
{ desc = "Toggle Diagnostics" })
map("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })
-- ========== Sessions ============= --
map("n", "<leader>ss", "<cmd>:SessionSave<CR>", { noremap = true, silent = true })
map("n", "<leader>sl", "<cmd>:SessionLoad<CR>", { noremap = true, silent = true })
map("n", "<leader>st", "<cmd>:Telescope persisted<CR>", { noremap = true, silent = true })
-- ========== Window moves ============= --
map("n", "<C-h>", "<C-w>h", { desc = "switch window left" })
map("n", "<C-l>", "<C-w>l", { desc = "switch window right" })
map("n", "<C-j>", "<C-w>j", { desc = "switch window down" })
map("n", "<C-k>", "<C-w>k", { desc = "switch window up" })
-- ========== Line moves ============= --
map("i", "<C-b>", "<ESC>^i", { desc = "move beginning of line" })
map("i", "<C-e>", "<End>", { desc = "move end of line" })
map("i", "<C-h>", "<Left>", { desc = "move left" })
map("i", "<C-l>", "<Right>", { desc = "move right" })
map("i", "<C-j>", "<Down>", { desc = "move down" })
map("i", "<C-k>", "<Up>", { desc = "move up" })
-- ========== Comments ============= --
map("n", "<leader>/", "gcc", { desc = "toggle comment", remap = true })
map("v", "<leader>/", "gc", { desc = "toggle comment", remap = true })
-- ========== Nvim-tree ============= --
map("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "nvimtree toggle window" })
map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "nvimtree focus window" })
-- ========== Telescope ============= --
map("n", "<leader>fw", "<cmd>Telescope live_grep<CR>", { desc = "telescope live grep" })
map("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "telescope find buffers" })
map("n", "<leader>fh", "<cmd>Telescope help_tags<CR>", { desc = "telescope help page" })
map("n", "<leader>ma", "<cmd>Telescope marks<CR>", { desc = "telescope find marks" })
map("n", "<leader>fo", "<cmd>Telescope oldfiles<CR>", { desc = "telescope find oldfiles" })
map("n", "<leader>fz", "<cmd>Telescope current_buffer_fuzzy_find<CR>", { desc = "telescope find in current buffer" })
map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" })
map("n", "<leader>gt", "<cmd>Telescope git_status<CR>", { desc = "telescope git status" })
map("n", "<leader>pt", "<cmd>Telescope terms<CR>", { desc = "telescope pick hidden term" })
map("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "telescope find files" })
map("n", "<leader>fa", "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
{ desc = "telescope find all files" })
-- ========== Which-key ============= --
map("n", "<leader>wK", "<cmd>WhichKey <CR>", { desc = "whichkey all keymaps" })
-- ========== Buffers ============= --
map("n", "<leader>x", function()
local bufnr = vim.api.nvim_get_current_buf()
local buftype = vim.api.nvim_buf_get_option(bufnr, 'buftype')
local modified = vim.api.nvim_buf_get_option(bufnr, 'modified')
if buftype == 'terminal' then
vim.cmd('bp | sp | bn | bd!')
return
end
if modified then
vim.notify("Changes not saved")
else
vim.cmd('bp | sp | bn | bd')
end
end, { desc = "Close buffer" })
map("n", "<leader>e", "<cmd>enew<CR>", { desc = "Create buffer" })
map("n", "<tab>", "<cmd>BufferLineCycleNext<CR>", { desc = "Go to next buffer" })
map("n", "<S-tab>", "<cmd>BufferLineCyclePrev<CR>", { desc = "Go to prev buffer" })
map("n", "<leader>bt", "<cmd>BufferLineGroupToggle tests<CR>", { desc = "Toggle 'tests' group" })
map("n", "<leader>bc", "<cmd>BufferLineGroupToggle code<CR>", { desc = "Toggle 'code' group" })
map("n", "<leader>bp", "<cmd>BufferLineGroupToggle tornado<CR>", { desc = "Toggle 'tornado' group" })
map("n", "<leader>bg", "<cmd>BufferLineGroupToggle gornado<CR>", { desc = "Toggle 'gornado' group" })
-- ========== Git ============= --
map("n", "<leader>gb", "<cmd>Gitsigns blame<CR>", { desc = "Open blame for file" })
map("n", "<leader>gl", "<cmd>Gitsigns blame<CR>", { desc = "Open blame for file" })
map("n", "<leader>gco", "<cmd>GitConflictChooseOurs<CR>", { desc = "Select the current changes" })
map("n", "<leader>gct", "<cmd>GitConflictChooseTheirs<CR>", { desc = "Select the incoming changes" })
map("n", "<leader>gcb", "<cmd>GitConflictChooseBoth<CR>", { desc = "Seletct both changes" })
map("n", "<leader>gcn", "<cmd>GitConflictNextConflict<CR>", { desc = "Move to the next conflict" })
map("n", "<leader>gcp", "<cmd>GitConflictPrevConflict<CR>", { desc = "Move to the previous conflict" })
map("n", "<leader>ghn", "<cmd>Gitsigns blame<CR>", { desc = "Show hunk in normal mode" })
map("n", "<leader>ghi", "<cmd>Gitsigns blame<CR>", { desc = "Show hunk inline" })
map("n", "<leader>gd", "<cmd>Gitsigns diffthis<CR>", { desc = "Show diff of buffer" })
map("n", "<leader>gs", "<cmd>Gitsigns stage_buffer<CR>", { desc = "Stage this buffer" })
map("n", "<leader>gu", "<cmd>Gitui<CR>", { desc = "Stage this buffer" })

57
nvim/nvim/lua/options.lua
View file

@ -1,57 +0,0 @@
local opt = vim.opt
local o = vim.o
local g = vim.g
-------------------------------------- options ------------------------------------------
o.laststatus = 3
o.showmode = false
o.splitkeep = "screen"
o.clipboard = "unnamedplus"
o.cursorline = true
o.cursorlineopt = "number"
-- Indenting
o.expandtab = true
o.shiftwidth = 2
o.smartindent = true
o.tabstop = 2
o.softtabstop = 2
opt.fillchars = { eob = " " }
o.ignorecase = true
o.smartcase = true
o.mouse = "a"
-- Numbers
o.number = true
o.numberwidth = 2
o.ruler = false
-- disable nvim intro
opt.shortmess:append "sI"
o.signcolumn = "yes"
o.splitbelow = true
o.splitright = true
o.timeoutlen = 400
o.undofile = true
-- interval for writing swap file to disk, also used by gitsigns
o.updatetime = 250
-- go to previous/next line with h,l,left arrow and right arrow
-- when cursor reaches end/beginning of line
opt.whichwrap:append "<>[]hl"
-- disable some default providers
g.loaded_node_provider = 0
g.loaded_python3_provider = 0
g.loaded_perl_provider = 0
g.loaded_ruby_provider = 0
-- add binaries installed by mason.nvim to path
local is_windows = vim.fn.has "win32" ~= 0
local sep = is_windows and "\\" or "/"
local delim = is_windows and ";" or ":"
vim.env.PATH = table.concat({ vim.fn.stdpath "data", "mason", "bin" }, sep) .. delim .. vim.env.PATH

81
nvim/nvim/lua/plugins/common.lua
View file

@ -1,81 +0,0 @@
return {
-- Dev icons
{
"nvim-tree/nvim-web-devicons",
opts = {},
},
{
'nvim-mini/mini.nvim',
version = '*'
},
-- Screenkey
{
"NStefan002/screenkey.nvim",
lazy = false,
version = "*", -- or branch = "main", to use the latest commit
},
-- Marks
{
"chentoast/marks.nvim",
event = "VeryLazy",
opts = {},
},
-- Git
{
"lewis6991/gitsigns.nvim",
event = { "BufReadPre", "BufNewFile" },
opts = function()
require("configs.gitsigns")
end,
},
{
'akinsho/git-conflict.nvim',
version = "*",
config = true
},
-- Nvim tree
{
"nvim-tree/nvim-tree.lua",
cmd = { "NvimTreeToggle", "NvimTreeFocus" },
opts = function()
return require "configs.nvimtree"
end,
},
-- Pairs
{
"nvim-mini/mini.pairs",
event = { "BufReadPost", "BufNewFile" },
opts = {
modes = { insert = true, command = true, terminal = false },
skip_next = [=[[%w%%%'%[%"%.%`%$]]=],
skip_ts = { "string" },
skip_unbalanced = true,
markdown = true,
},
},
-- Formating
{
"stevearc/conform.nvim",
event = 'BufWritePre',
config = function()
require "configs.conform"
end,
},
-- Yank highlight
{
"machakann/vim-highlightedyank",
event = "VeryLazy",
},
-- Sessions
{
"olimorris/persisted.nvim",
event = "BufReadPre",
opts = {
autostart = true,
autosave = true,
save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"),
use_git_branch = true,
autoload = false,
},
},
}

195
nvim/nvim/lua/plugins/development.lua
View file

@ -1,195 +0,0 @@
return {
-- Nvim lspconfig
{
"neovim/nvim-lspconfig",
event = { "BufReadPre", "BufNewFile" },
config = function()
require("configs.lsp.lspconfig")
end
},
-- Mason
{
"mason-org/mason.nvim",
opts = {}
},
-- Mason lspconfig
{
"mason-org/mason-lspconfig.nvim",
opts = {},
dependencies = {
"mason-org/mason.nvim",
"neovim/nvim-lspconfig",
}
},
-- Nvim complete
{
"hrsh7th/nvim-cmp",
event = "InsertEnter",
dependencies = {
{
"L3MON4D3/LuaSnip",
dependencies = "rafamadriz/friendly-snippets",
opts = { history = true, updateevents = "TextChanged,TextChangedI" },
config = function(_, opts)
require("luasnip").config.set_config(opts)
require "configs.luasnip"
end,
},
{
"windwp/nvim-autopairs",
opts = {
fast_wrap = {},
disable_filetype = { "TelescopePrompt", "vim" },
},
config = function(_, opts)
require("nvim-autopairs").setup(opts)
-- setup cmp for autopairs
local cmp_autopairs = require "nvim-autopairs.completion.cmp"
require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
end,
},
{
"saadparwaiz1/cmp_luasnip",
"hrsh7th/cmp-nvim-lua",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"https://codeberg.org/FelipeLema/cmp-async-path.git"
}
},
opts = function()
return require "configs.cmp"
end,
},
-- Treesitter (syntax)
{
"nvim-treesitter/nvim-treesitter",
branch = "main",
lazy = false,
build = ":TSUpdate",
opts = function()
return require("configs.treesitter")
end,
config = function(_, opts)
require("nvim-treesitter").setup(opts)
vim.api.nvim_create_autocmd("FileType", {
pattern = {
"c",
"cpp",
"go",
"lua",
"python",
"javascript",
"typescript",
"tsx",
"json",
"jsonc",
"vim",
"vimdoc",
"query",
"markdown",
"markdown_inline",
"html",
"xml",
"yaml",
"toml",
"sql",
"php",
"make",
"cmake",
"diff",
"gitcommit",
"gitignore",
},
callback = function(args)
pcall(vim.treesitter.start, args.buf)
vim.bo[args.buf].syntax = "on"
end,
})
end,
},
-- Logs
{
'fei6409/log-highlight.nvim',
event = 'BufReadPre', -- Lazy load the plugin
config = function()
require('log-highlight').setup({
keyword = {
error = 'ERROR',
warning = { 'ALWAYS', 'WARN' },
info = { 'INFO' },
debug = { 'DEBUG' },
pass = {},
},
})
end
},
-- Folders
{
'kevinhwang91/nvim-ufo',
dependencies = 'kevinhwang91/promise-async',
event = "VeryLazy",
config = function()
require("configs.ufo")
end
},
-- Tests
{
"nvim-neotest/neotest",
event = "VeryLazy",
dependencies = {
"nvim-lua/plenary.nvim",
"alfaix/neotest-gtest",
"olimorris/neotest-phpunit",
},
config = function()
require("neotest").setup({
adapters = {
require("neotest-phpunit"),
require("neotest-gtest").setup({}),
},
})
end,
},
-- These are for C/C++ Debbuger
{
"nvim-neotest/nvim-nio",
event = "VeryLazy",
},
{
"mfussenegger/nvim-dap",
event = "VeryLazy",
config = function()
require("configs.nvim-dap").setup()
end
},
{
"rcarriga/nvim-dap-ui",
event = "VeryLazy",
dependencies = "mfussenegger/nvim-dap",
},
{
"jay-babu/mason-nvim-dap.nvim",
event = "VeryLazy",
dependencies = {
"williamboman/mason.nvim",
"mfussenegger/nvim-dap",
},
opts = {
handlers = {}
},
},
{
"theHamsta/nvim-dap-virtual-text",
dependencies = "mfussenegger/nvim-dap",
config = function()
require("nvim-dap-virtual-text").setup()
end,
},
{
'aspeddro/gitui.nvim',
config = function()
require("gitui").setup()
end,
},
}

8
nvim/nvim/lua/plugins/joke.lua
View file

@ -1,8 +0,0 @@
return {
{
'kwakzalver/duckytype.nvim',
config = function()
require('duckytype').setup {}
end
},
}

17
nvim/nvim/lua/plugins/lines.lua
View file

@ -1,17 +0,0 @@
return {
{
'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons' },
config = function()
require("configs.lualine")
end,
},
{
'akinsho/bufferline.nvim',
version = "*",
dependencies = 'nvim-tree/nvim-web-devicons',
config = function()
require("configs.bufferline")
end,
},
}

30
nvim/nvim/lua/plugins/noice.lua
View file

@ -1,30 +0,0 @@
return {
"folke/noice.nvim",
event = "VeryLazy",
opts ={
-- add any options here
},
dependencies = {
"MunifTanjim/nui.nvim",
"rcarriga/nvim-notify",
},
config = {
lsp = {
signature = {
enabled = false,
},
hover = {
enabled = false,
},
override = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true,
},
},
presets = {
long_message_to_split = true, -- long messages will be sent to a split
inc_rename = false, -- enables an input dialog for inc-rename.nvim
lsp_doc_border = false, -- add a border to hover docs and signature help
},
}
}

102
nvim/nvim/lua/plugins/snacks.lua
View file

@ -1,102 +0,0 @@
return {
"folke/snacks.nvim",
priority = 1000,
lazy = false,
---@type snacks.Config
opts = {
bigfile = { enabled = true },
dashboard = {
enabled = true,
width = 60,
row = nil, -- dashboard position. nil for center
col = nil, -- dashboard position. nil for center
pane_gap = 4, -- empty columns between vertical panes
autokeys = "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", -- autokey sequence
-- These settings are used by some built-in sections
preset = {
-- Defaults to a picker that supports `fzf-lua`, `telescope.nvim` and `mini.pick`
---@type fun(cmd:string, opts:table)|nil
pick = nil,
-- Used by the `keys` section to show keymaps.
-- Set your custom keymaps here.
-- When using a function, the `items` argument are the default keymaps.
-- stylua: ignore
---@type snacks.dashboard.Item[]
keys = {
{ icon = "", key = "f", desc = "Find File", action = ":lua Snacks.dashboard.pick('files')" },
{ icon = "", key = "n", desc = "New File", action = ":ene | startinsert" },
{ icon = "", key = "g", desc = "Find Text", action = ":lua Snacks.dashboard.pick('live_grep')" },
{ icon = "", key = "r", desc = "Recent Files", action = ":lua Snacks.dashboard.pick('oldfiles')" },
{ icon = "", key = "c", desc = "Config", action = ":lua Snacks.dashboard.pick('files', {cwd = vim.fn.stdpath('config')})" },
{ icon = "", key = "s", desc = "Restore Session", section = "session" },
{ icon = "󰒲 ", key = "L", desc = "Lazy", action = ":Lazy", enabled = package.loaded.lazy ~= nil },
{ icon = "", key = "q", desc = "Quit", action = ":qa" },
},
-- Used by the `header` section
header = [[
⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⡴⠶⠶⠒⠒⠒⠶⠶⣦⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⣠⡶⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠻⢷⣦⡀⠀⠀⠀⠀⠀
⠀⠀⠀⣠⠞⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣦⡀⠀⠀⠀
⠀⠀⣼⠋⠀⠀⠀⠀⠀⠀⠀⢀⣠⣤⣶⣤⣄⡀⠀⠀⠀⠀⠀⠀⠀⠙⢿⣆⠀⠀
⠀⣼⠃⠀⠀⠀⠀⠀⢀⣤⣾⡿⠟⠉⠀⠈⠙⠿⣷⣤⡀⠀⠀⠀⠀⠀⠈⢻⣆⠀
⢸⡇⠀⠀⠀⠀⠀⣠⣿⡿⠋⠁⠒⠠⡀⠀⢀⠔⠚⠻⣿⣦⠀⠀⠀⠀⠀⠈⢿⡆
⣼⠀⠀⠀⠀⠀⢠⣿⣿⠁⠀⠀⠀⠀⠘⡶⠁⠀⠀⠀⠸⣿⣷⡀⠀⠀⠀⠀⢸⣧
⢿⠀⠀⠀⠀⠀⢸⢻⣿⠀⠀⠀⠙⠀⢠⢇⠀⠘⠁⠀⠀⣿⣿⡇⠀⠀⠀⠀⠀⣿
⢸⡇⠀⠀⠀⠀⢸⠘⣿⣆⠀⠀⢀⠔⠁⠈⢦⡀⠀⠀⣸⣿⡟⡇⠀⠀⠀⠀⢠⡏
⠈⢿⡄⠀⠀⠀⠀⢆⠈⠻⣿⣏⡀⠀⠀⠀⠀⠉⣳⣾⡿⠟⡰⠁⠀⠀⠀⠀⣼⠃
⠀⠘⢿⣄⠀⠀⠀⠀⠣⡀⠈⠛⠿⢦⣄⣤⠶⠿⠛⠉⣀⠜⠁⠀⠀⠀⠀⣼⠏⠀
⠀⠀⠈⠻⣦⣀⠀⠀⠀⠈⠑⠢⠤⢤⣯⣧⠤⠤⠔⠋⠁⠀⠀⠀⠀⣠⡾⠃⠀⠀
⠀⠀⠀⢀⡼⠛⠷⣄⡀⠀⠀⠀⠀⡼⠀⢸⠀⠀⠀⠀⠀⠀⢀⣤⣾⡋⠀⠀⠀⠀
⠀⠀⢠⠞⠀⠀⠀⠈⠉⠓⠶⣤⣄⣀⣀⣈⣀⣀⣤⠤⠶⠚⠉⠁⠀⠹⣆⠀⠀⠀
⠀⢠⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⡆⠀⠀
⠀⣞⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⠀⠀
⣼⠉⠉⠉⠑⡆⠀⠀⠀⠀⠀⠀⠀⠀⢹⠀⠀⠀⠀⠀⠀⠀⠀⢀⡠⠤⠤⢼⡀⠀
⠙⠦⠤⣴⣚⣁⠀⠀⠀⠀⠀⠀⠀⠀⢸⠀⠀⠀⠀⠀⠀⠀⠀⠸⣀⠀⠀⢀⡟⠀
⠀⠀⠀⠀⣿⠀⣈⣉⣉⣀⡀⠀⠀⠒⠛⠒⠒⠒⠒⠒⠒⠒⠒⠒⡏⠉⠉⠁⠀⠀
⠀⠀⠠⠾⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠿⠶⠶⢷⣤⠀⠀]],
},
-- item field formatters
formats = {
icon = function(item)
if item.file and item.icon == "file" or item.icon == "directory" then
return Snacks.dashboard.icon(item.file, item.icon)
end
return { item.icon, width = 2, hl = "icon" }
end,
footer = { "%s", align = "center" },
header = { "%s", align = "center" },
file = function(item, ctx)
local fname = vim.fn.fnamemodify(item.file, ":~")
fname = ctx.width and #fname > ctx.width and vim.fn.pathshorten(fname) or fname
if #fname > ctx.width then
local dir = vim.fn.fnamemodify(fname, ":h")
local file = vim.fn.fnamemodify(fname, ":t")
if dir and file then
file = file:sub(-(ctx.width - #dir - 2))
fname = dir .. "/…" .. file
end
end
local dir, file = fname:match("^(.*)/(.+)$")
return dir and { { dir .. "/", hl = "dir" }, { file, hl = "file" } } or { { fname, hl = "file" } }
end,
},
sections = {
{ section = "header" },
{ section = "keys", gap = 1, padding = 1 },
},
debug = false,
},
explorer = { enabled = false },
indent = { enabled = true },
input = { enabled = true },
picker = { enabled = true },
notifier = { enabled = true },
quickfile = { enabled = true },
scope = { enabled = true },
scroll = { enabled = true },
statuscolumn = { enabled = true },
words = { enabled = true },
},
}

8
nvim/nvim/lua/plugins/telescope.lua
View file

@ -1,8 +0,0 @@
return {
"nvim-telescope/telescope.nvim",
dependencies = { "nvim-treesitter/nvim-treesitter" },
cmd = "Telescope",
configs = function()
return require "configs.telescope"
end,
}

67
nvim/nvim/lua/plugins/whichkey.lua
View file

@ -1,67 +0,0 @@
return {
"folke/which-key.nvim",
event = "VeryLazy",
opts_extend = { "spec" },
opts = {
preset = "helix",
defaults = {},
spec = {
{
mode = { "n", "x" },
{ "<leader><tab>", group = "tabs" },
{ "<leader>c", group = "code" },
{ "<leader>d", group = "debug" },
{ "<leader>dp", group = "profiler" },
{ "<leader>f", group = "file/find" },
{ "<leader>g", group = "git" },
{ "<leader>gh", group = "hunks" },
{ "<leader>q", group = "quit/session" },
{ "<leader>s", group = "search" },
{ "<leader>u", group = "ui" },
{ "<leader>x", group = "diagnostics/quickfix" },
{ "[", group = "prev" },
{ "]", group = "next" },
{ "g", group = "goto" },
{ "gs", group = "surround" },
{ "z", group = "fold" },
{
"<leader>b",
group = "buffer",
expand = function()
return require("which-key.extras").expand.buf()
end,
},
{
"<leader>w",
group = "windows",
proxy = "<c-w>",
expand = function()
return require("which-key.extras").expand.win()
end,
},
-- better descriptions
{ "gx", desc = "Open with system app" },
},
},
},
keys = {
{
"<leader>?",
function()
require("which-key").show({ global = false })
end,
desc = "Buffer Keymaps (which-key)",
},
{
"<c-w><space>",
function()
require("which-key").show({ keys = "<c-w>", loop = true })
end,
desc = "Window Hydra Mode (which-key)",
},
},
config = function(_, opts)
local wk = require("which-key")
wk.setup(opts)
end,
}

6
nvim/nvim/stylua.toml
View file

@ -1,6 +0,0 @@
column_width = 120
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 2
quote_style = "AutoPreferDouble"
call_parentheses = "None"