Skip to content

Commit fdf32ee

Browse files
committed
feat(catppuccin): clean up
1 parent 0fa0471 commit fdf32ee

File tree

6 files changed

+36
-42
lines changed

6 files changed

+36
-42
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Benchmark 1: nvim +q
1414

1515
`hyperfine 'nvim --clean +q'`
1616

17-
```Benchmark 1: nvim --clean +q
17+
```
18+
Benchmark 1: nvim --clean +q
1819
Time (mean ± σ): 14.2 ms ± 0.5 ms [User: 9.0 ms, System: 4.8 ms]
1920
Range (min … max): 13.3 ms … 15.9 ms 173 runs
2021
```

lua/configs/catppuccin.lua

+1-15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ require('catppuccin').setup({
2121
},
2222
beacon = true,
2323
cmp = true,
24+
fzf = true,
2425
gitsigns = true,
2526
headlines = true,
2627
indent_blankline = { enabled = true, scope_color = 'surface1' },
@@ -51,21 +52,6 @@ require('catppuccin').setup({
5152

5253
IblIndent = { fg = colors.surface0 },
5354
IblScope = { fg = colors.surface2 },
54-
55-
FzfLuaNormal = { link = 'NormalFloat' },
56-
FzfLuaBorder = { link = 'FloatBorder' },
57-
FzfLuaTitle = { link = 'FloatTitle' },
58-
FzfLuaHeaderBind = { fg = colors.yellow },
59-
FzfLuaHeaderText = { fg = colors.peach },
60-
FzfLuaPathColNr = { fg = colors.blue },
61-
FzfLuaPathLineNr = { fg = colors.green },
62-
FzfLuaBufName = { fg = colors.mauve },
63-
FzfLuaBufNr = { fg = colors.yellow },
64-
FzfLuaBufFlagCur = { fg = colors.peach },
65-
FzfLuaBufFlagAlt = { fg = colors.blue },
66-
FzfLuaTabTitle = { fg = colors.sky },
67-
FzfLuaTabMarker = { fg = colors.yellow },
68-
FzfLuaLiveSym = { fg = colors.peach },
6955
}
7056
end,
7157
},

lua/core/autocmds.lua

+14
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,20 @@ augroup('AutoCreateDir', {
176176
},
177177
})
178178

179+
augroup('LazyLoadSpell', {
180+
'BufWinEnter',
181+
{
182+
desc = 'Lazy-load spell check',
183+
callback = function()
184+
vim.opt.spell = true
185+
vim.opt.spellcapcheck = ''
186+
vim.opt.spelllang = 'en,cjk'
187+
vim.opt.spelloptions = 'camel'
188+
vim.opt.spellsuggest = 'best,9'
189+
end,
190+
},
191+
})
192+
179193
augroup('StatusColumn', {
180194
{ 'BufWritePost', 'BufWinEnter' },
181195
{

lua/core/options.lua

+15-19
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,21 @@ if g.has_gui then
7575
})
7676
end
7777

78-
-- Spell check
79-
vim.opt.spell = true
80-
vim.opt.spellcapcheck = ''
81-
vim.opt.spelllang = 'en,cjk'
82-
vim.opt.spelloptions = 'camel'
83-
vim.opt.spellsuggest = 'best,9'
78+
-- Netrw settings
79+
g.netrw_banner = 0
80+
g.netrw_cursor = 5
81+
g.netrw_keepdir = 0
82+
g.netrw_keepj = ''
83+
g.netrw_list_hide = [[\(^\|\s\s\)\zs\.\S\+]]
84+
g.netrw_liststyle = 1
85+
g.netrw_localcopydircmd = 'cp -r'
8486

8587
-- stylua: ignore start
86-
g.loaded_gzip = 1
87-
g.loaded_tar = 1
88-
g.loaded_tarPlugin = 1
89-
g.loaded_zip = 1
90-
g.loaded_zipPlugin = 1
91-
g.loaded_getscript = 1
92-
g.loaded_getscriptPlugin = 1
93-
g.loaded_vimball = 1
94-
g.loaded_vimballPlugin = 1
95-
g.loaded_2html_plugin = 1
96-
g.loaded_logiPat = 1
97-
g.loaded_rrhelper = 1
98-
g.loaded_netrwPlugin = 1
88+
g.loaded_2html_plugin = 0
89+
g.loaded_gzip = 0
90+
g.loaded_tar = 0
91+
g.loaded_tarPlugin = 0
92+
g.loaded_tutor_mode_plugin = 0
93+
g.loaded_zip = 0
94+
g.loaded_zipPlugin = 0
9995
-- stylua: ignore end

lua/modules/colorschemes.lua

-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ return {
22
{
33
'catppuccin/nvim',
44
name = 'catppuccin',
5-
branch = 'feat/term-cursor',
65
config = load_pkg('catppuccin'),
7-
priority = 1000,
86
},
97

108
{ 'folke/tokyonight.nvim' },

package-lock.json

+4-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)