Skip to content

Commit 4bc8257

Browse files
tthayertthayer
committed
Updates
1 parent 67d9612 commit 4bc8257

File tree

6 files changed

+266
-0
lines changed

6 files changed

+266
-0
lines changed

‎colors/256_noir.vim‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
" Vim color file
2+
" Name: 256_noir.vim
3+
" Maintainer: Andreas van Cranenburgh <[email protected]>
4+
" Homepage: https://github.com/andreasvc/vim-256noir/
5+
6+
" Basically: dark background, numerals & errors red,
7+
" rest different shades of gray.
8+
"
9+
" colors 232--250 are shades of gray, from dark to light;
10+
" 16=black, 255=white, 196=red, 88=darkred.
11+
12+
highlight clear
13+
set background=dark
14+
if version > 580
15+
" no guarantees for version 5.8 and below, but this makes it stop
16+
" complaining
17+
if exists("syntax_on")
18+
syntax reset
19+
endif
20+
endif
21+
let g:colors_name = "256_noir"
22+
23+
if has("gui_running") || &t_Co == 256
24+
hi Normal cterm=NONE ctermfg=250 ctermbg=16 gui=NONE guifg=#bcbcbc guibg=#000000
25+
hi Keyword cterm=NONE ctermfg=255 ctermbg=16 gui=NONE guifg=#eeeeee guibg=#000000
26+
hi Constant cterm=NONE ctermfg=252 ctermbg=16 gui=NONE guifg=#d0d0d0 guibg=#000000
27+
hi String cterm=NONE ctermfg=245 ctermbg=16 gui=NONE guifg=#8a8a8a guibg=#000000
28+
hi Comment cterm=NONE ctermfg=240 ctermbg=16 gui=NONE guifg=#585858 guibg=#000000
29+
hi Number cterm=NONE ctermfg=196 ctermbg=16 gui=NONE guifg=#ff0000 guibg=#000000
30+
hi Error cterm=NONE ctermfg=255 ctermbg=88 gui=NONE guifg=#eeeeee guibg=#870000
31+
hi ErrorMsg cterm=NONE ctermfg=255 ctermbg=124 gui=NONE guifg=#eeeeee guibg=#af0000
32+
hi Search cterm=NONE ctermfg=245 ctermbg=236 gui=NONE guifg=#8a8a8a guibg=#303030
33+
hi IncSearch cterm=reverse ctermfg=255 ctermbg=245 gui=reverse guifg=#eeeeee guibg=#8a8a8a
34+
hi DiffChange cterm=NONE ctermfg=160 ctermbg=255 gui=NONE guifg=#d70000 guibg=#eeeeee
35+
hi DiffText cterm=bold ctermfg=250 ctermbg=196 gui=bold guifg=#bcbcbc guibg=#ff0000
36+
hi SignColumn cterm=NONE ctermfg=124 ctermbg=240 gui=NONE guifg=#af0000 guibg=#585858
37+
hi SpellBad cterm=undercurl ctermfg=255 ctermbg=88 gui=undercurl guifg=#eeeeee guibg=#870000
38+
hi SpellCap cterm=NONE ctermfg=255 ctermbg=124 gui=NONE guifg=#eeeeee guibg=#af0000
39+
hi SpellRare cterm=NONE ctermfg=124 ctermbg=16 gui=NONE guifg=#af0000 guibg=#000000
40+
hi WildMenu cterm=NONE ctermfg=240 ctermbg=255 gui=NONE guifg=#585858 guibg=#eeeeee
41+
hi Pmenu cterm=NONE ctermfg=255 ctermbg=240 gui=NONE guifg=#eeeeee guibg=#585858
42+
hi PmenuThumb cterm=NONE ctermfg=232 ctermbg=240 gui=NONE guifg=#080808 guibg=#585858
43+
hi SpecialKey cterm=NONE ctermfg=16 ctermbg=255 gui=NONE guifg=#000000 guibg=#eeeeee
44+
hi MatchParen cterm=NONE ctermfg=16 ctermbg=240 gui=NONE guifg=#000000 guibg=#585858
45+
hi CursorLine cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212
46+
hi StatusLine cterm=bold,reverse ctermfg=245 ctermbg=16 gui=bold,reverse guifg=#8a8a8a guibg=#000000
47+
hi StatusLineNC cterm=reverse ctermfg=236 ctermbg=16 gui=reverse guifg=#303030 guibg=#000000
48+
hi Visual cterm=reverse ctermfg=250 ctermbg=16 gui=reverse guifg=#bcbcbc guibg=#000000
49+
hi TermCursor cterm=reverse ctermfg=NONE ctermbg=NONE gui=reverse guifg=NONE guibg=NONE
50+
else
51+
hi Normal cterm=NONE ctermfg=Gray ctermbg=Black
52+
hi Keyword cterm=NONE ctermfg=White ctermbg=Black
53+
hi Constant cterm=NONE ctermfg=Gray ctermbg=Black
54+
hi String cterm=NONE ctermfg=Gray ctermbg=Black
55+
hi Comment cterm=NONE ctermfg=DarkGray ctermbg=Black
56+
hi Number cterm=NONE ctermfg=Red ctermbg=Black
57+
hi Error cterm=NONE ctermfg=White ctermbg=DarkRed
58+
hi ErrorMsg cterm=NONE ctermfg=White ctermbg=Red
59+
hi Search cterm=NONE ctermfg=Gray ctermbg=DarkGray
60+
hi IncSearch cterm=reverse ctermfg=White ctermbg=Gray
61+
hi DiffChange cterm=NONE ctermfg=Red ctermbg=White
62+
hi DiffText cterm=bold ctermfg=Gray ctermbg=Red
63+
hi SignColumn cterm=NONE ctermfg=Red ctermbg=DarkGray
64+
hi SpellBad cterm=undercurl ctermfg=White ctermbg=DarkRed
65+
hi SpellCap cterm=NONE ctermfg=White ctermbg=Red
66+
hi SpellRare cterm=NONE ctermfg=Red ctermbg=Black
67+
hi WildMenu cterm=NONE ctermfg=DarkGray ctermbg=White
68+
hi Pmenu cterm=NONE ctermfg=White ctermbg=DarkGray
69+
hi PmenuThumb cterm=NONE ctermfg=Black ctermbg=DarkGray
70+
hi SpecialKey cterm=NONE ctermfg=Black ctermbg=White
71+
hi MatchParen cterm=NONE ctermfg=Black ctermbg=DarkGray
72+
hi CursorLine cterm=NONE ctermfg=NONE ctermbg=Black
73+
hi StatusLine cterm=bold,reverse ctermfg=Gray ctermbg=Black
74+
hi StatusLineNC cterm=reverse ctermfg=DarkGray ctermbg=Black
75+
hi Visual cterm=reverse ctermfg=Gray ctermbg=Black
76+
hi TermCursor cterm=reverse ctermfg=NONE ctermbg=NONE
77+
endif
78+
highlight! link Boolean Normal
79+
highlight! link Delimiter Normal
80+
highlight! link Identifier Normal
81+
highlight! link Title Normal
82+
highlight! link Debug Normal
83+
highlight! link Exception Normal
84+
highlight! link FoldColumn Normal
85+
highlight! link Macro Normal
86+
highlight! link ModeMsg Normal
87+
highlight! link MoreMsg Normal
88+
highlight! link Question Normal
89+
highlight! link Conditional Keyword
90+
highlight! link Statement Keyword
91+
highlight! link Operator Keyword
92+
highlight! link Structure Keyword
93+
highlight! link Function Keyword
94+
highlight! link Include Keyword
95+
highlight! link Type Keyword
96+
highlight! link Typedef Keyword
97+
highlight! link Todo Keyword
98+
highlight! link Label Keyword
99+
highlight! link Define Keyword
100+
highlight! link DiffAdd Keyword
101+
highlight! link diffAdded Keyword
102+
highlight! link diffCommon Keyword
103+
highlight! link Directory Keyword
104+
highlight! link PreCondit Keyword
105+
highlight! link PreProc Keyword
106+
highlight! link Repeat Keyword
107+
highlight! link Special Keyword
108+
highlight! link SpecialChar Keyword
109+
highlight! link StorageClass Keyword
110+
highlight! link SpecialComment String
111+
highlight! link CursorLineNr String
112+
highlight! link Character Number
113+
highlight! link Float Number
114+
highlight! link Tag Number
115+
highlight! link Folded Number
116+
highlight! link WarningMsg Number
117+
highlight! link iCursor SpecialKey
118+
highlight! link SpellLocal SpellCap
119+
highlight! link LineNr Comment
120+
highlight! link NonText Comment
121+
highlight! link DiffDelete Comment
122+
highlight! link diffRemoved Comment
123+
highlight! link PmenuSbar Visual
124+
highlight! link PmenuSel Visual
125+
highlight! link VisualNOS Visual
126+
highlight! link VertSplit Visual
127+
highlight! link Cursor StatusLine
128+
highlight! link Underlined SpellRare
129+
highlight! link rstEmphasis SpellRare
130+
highlight! link diffChanged DiffChange

‎lazy-lock.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3+
"LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
4+
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
5+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
6+
"copilot.vim": { "branch": "release", "commit": "1a284014d2e0baf367706a94b2a9ee5fd56fd457" },
7+
"fidget.nvim": { "branch": "main", "commit": "60404ba67044c6ab01894dd5bf77bd64ea5e09aa" },
8+
"friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" },
9+
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
10+
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
11+
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
12+
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
13+
"mason-lspconfig.nvim": { "branch": "main", "commit": "7897c45e8f0f7fefe3b3ee00d8e89dc67a113e25" },
14+
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
15+
"neodev.nvim": { "branch": "main", "commit": "bbe17de89345ce40725e721d347c596dc4a02b32" },
16+
"nvim-autopairs": { "branch": "master", "commit": "90f824d37c0cb079d2764927e73af77faa9ba0ef" },
17+
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
18+
"nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
19+
"nvim-lspconfig": { "branch": "master", "commit": "1699ce10c3aaf861cfa0c1303fcd19d2ed93e7ad" },
20+
"nvim-surround": { "branch": "main", "commit": "8f2af76134f37058dc4c27a24bc5f86c9cae76dc" },
21+
"nvim-treesitter": { "branch": "master", "commit": "6bd108a6f10aa01b854c3c673b6d9d61662a8c93" },
22+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
23+
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
24+
"onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
25+
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
26+
"promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
27+
"sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
28+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
29+
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
30+
"vim-256noir": { "branch": "master", "commit": "e8668a18a4a90272c1cae87e655f8bddc5ac3665" },
31+
"vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" },
32+
"vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" },
33+
"vim-helm": { "branch": "master", "commit": "86cc6766db60b8cc5731068d0c2111dee1f2b328" },
34+
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
35+
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
36+
"vim-terraform": { "branch": "master", "commit": "21f756b933cd11ac5990a6046fdc7c4e2a6c0aee" },
37+
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
38+
"yaml.nvim": { "branch": "main", "commit": "77aa8812e652acc44ae16fd1dbeb5a952db937e0" }
39+
}

‎lua/custom/plugins/256-noir.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
return {
2+
'andreasvc/vim-256noir'
3+
}

‎lua/custom/plugins/copilot.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
return {
2+
'github/copilot.vim',
3+
init = function()
4+
vim.g.copilot_no_tab_map = true
5+
vim.g.copilot_assume_mapped = true
6+
end,
7+
config = function()
8+
vim.keymap.set('i', '<C-e>', [[copilot#Accept("\<CR>")]], {
9+
silent = true,
10+
expr = true,
11+
script = true,
12+
replace_keycodes = false,
13+
})
14+
end,
15+
}

‎lua/custom/plugins/nvim-ufa.lua‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
return {
2+
"kevinhwang91/nvim-ufo",
3+
dependencies = "kevinhwang91/promise-async",
4+
event = "VimEnter", -- needed for folds to load in time and comments closed
5+
keys = {
6+
-- stylua: ignore start
7+
{ "zm", function() require("ufo").closeAllFolds() end, desc = "󱃄 Close All Folds" },
8+
{ "zr", function() require("ufo").openFoldsExceptKinds { "comment", "imports" } end, desc = "󱃄 Open All Regular Folds" },
9+
{ "zR", function() require("ufo").openFoldsExceptKinds {} end, desc = "󱃄 Open All Folds" },
10+
{ "z1", function() require("ufo").closeFoldsWith(1) end, desc = "󱃄 Close L1 Folds" },
11+
{ "z2", function() require("ufo").closeFoldsWith(2) end, desc = "󱃄 Close L2 Folds" },
12+
{ "z3", function() require("ufo").closeFoldsWith(3) end, desc = "󱃄 Close L3 Folds" },
13+
{ "z4", function() require("ufo").closeFoldsWith(4) end, desc = "󱃄 Close L4 Folds" },
14+
-- stylua: ignore end
15+
},
16+
init = function()
17+
-- INFO fold commands usually change the foldlevel, which fixes folds, e.g.
18+
-- auto-closing them after leaving insert mode, however ufo does not seem to
19+
-- have equivalents for zr and zm because there is no saved fold level.
20+
-- Consequently, the vim-internal fold levels need to be disabled by setting
21+
-- them to 99
22+
vim.opt.foldlevel = 99
23+
vim.opt.foldlevelstart = 99
24+
end,
25+
opts = {
26+
provider_selector = function(_, ft, _)
27+
-- INFO some filetypes only allow indent, some only LSP, some only
28+
-- treesitter. However, ufo only accepts two kinds as priority,
29+
-- therefore making this function necessary :/
30+
local lspWithOutFolding = { "markdown", "sh", "css", "html", "python" }
31+
if vim.tbl_contains(lspWithOutFolding, ft) then return { "treesitter", "indent" } end
32+
return { "lsp", "indent" }
33+
end,
34+
-- when opening the buffer, close these fold kinds
35+
-- use `:UfoInspect` to get available fold kinds from the LSP
36+
close_fold_kinds_for_ft = {
37+
default = { "imports", "comment" },
38+
},
39+
open_fold_hl_timeout = 800,
40+
fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
41+
local hlgroup = "NonText"
42+
local newVirtText = {}
43+
local suffix = "" .. tostring(endLnum - lnum)
44+
local sufWidth = vim.fn.strdisplaywidth(suffix)
45+
local targetWidth = width - sufWidth
46+
local curWidth = 0
47+
for _, chunk in ipairs(virtText) do
48+
local chunkText = chunk[1]
49+
local chunkWidth = vim.fn.strdisplaywidth(chunkText)
50+
if targetWidth > curWidth + chunkWidth then
51+
table.insert(newVirtText, chunk)
52+
else
53+
chunkText = truncate(chunkText, targetWidth - curWidth)
54+
local hlGroup = chunk[2]
55+
table.insert(newVirtText, { chunkText, hlGroup })
56+
chunkWidth = vim.fn.strdisplaywidth(chunkText)
57+
if curWidth + chunkWidth < targetWidth then
58+
suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
59+
end
60+
break
61+
end
62+
curWidth = curWidth + chunkWidth
63+
end
64+
table.insert(newVirtText, { suffix, hlgroup })
65+
return newVirtText
66+
end,
67+
},
68+
}

‎lua/custom/plugins/sort.lua‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
return {
2+
'sQVe/sort.nvim',
3+
4+
-- Optional setup for overriding defaults.
5+
config = function()
6+
require("sort").setup({
7+
-- Input configuration here.
8+
-- Refer to the configuration section below for options.
9+
})
10+
end
11+
}

0 commit comments

Comments
 (0)