Skip to content

Commit 3a12391

Browse files
rtuszikrtuszik
committed
update neovim
1 parent 2b07909 commit 3a12391

29 files changed

+439
-385
lines changed

‎config/nvim/.stylua.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
column_width = 100
1+
column_width = 140
22
line_endings = "Unix"
33
indent_type = "Spaces"
44
indent_width = 4

‎config/nvim/README.md

-21
This file was deleted.

‎config/nvim/lazy-lock.json

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"LazyVim": { "branch": "main", "commit": "73f14943bac5830905d715804ca581a91844272a" },
3+
"LuaSnip": { "branch": "master", "commit": "4bf40748f6fe939bdcb69325918535b1c5edea51" },
4+
"SchemaStore.nvim": { "branch": "main", "commit": "78aa3583e7ec75aaa0f9cd3f6d5dfad3a794ffcf" },
5+
"bad-practices.nvim": { "branch": "main", "commit": "5aa787ddc4bad4214dce1c43c4392edf01bddfb8" },
6+
"bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
7+
"catppuccin": { "branch": "main", "commit": "35d8057137af463c9f41f169539e9b190d57d269" },
8+
"chezmoi.nvim": { "branch": "main", "commit": "f5614261b77cb17df72ba2c4fdbc31f7ee42bc6c" },
9+
"chezmoi.vim": { "branch": "main", "commit": "abf37336437867cbd99ce2f8849b717415391cc3" },
10+
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
11+
"cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" },
12+
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
13+
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
14+
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
15+
"codeium": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
16+
"codeium.nvim": { "branch": "main", "commit": "dddaee0d1e9a1d0bcaea66f08a8103b3cdf26604" },
17+
"conform.nvim": { "branch": "master", "commit": "d28ccf945374edd9f1c34a82f6c22261dbd8ab98" },
18+
"cyberdream.nvim": { "branch": "main", "commit": "7e6feb49d2ec47a742215754ec0ecc51eebba55a" },
19+
"dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" },
20+
"data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
21+
"dial.nvim": { "branch": "master", "commit": "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490" },
22+
"dressing.nvim": { "branch": "master", "commit": "c334ac73e031f0dc93d6d91f3658ee75b8be1d3b" },
23+
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
24+
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
25+
"gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
26+
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
27+
"grug-far.nvim": { "branch": "main", "commit": "190c03d54e8976491e6e49acb97087bf4182b079" },
28+
"hardtime.nvim": { "branch": "main", "commit": "027d6f991927a71bd510a7673ae5bb404ca2a1c7" },
29+
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
30+
"indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
31+
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
32+
"lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
33+
"lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" },
34+
"lualine.nvim": { "branch": "master", "commit": "640260d7c2d98779cab89b1e7088ab14ea354a02" },
35+
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
36+
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
37+
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
38+
"mellow.nvim": { "branch": "main", "commit": "434a02d5f7637a24824569426176f37473205053" },
39+
"mini.ai": { "branch": "main", "commit": "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9" },
40+
"mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" },
41+
"mini.hipatterns": { "branch": "main", "commit": "797cbdc893cdcc2f0fbc05a23b4dae238a1fb0ae" },
42+
"mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
43+
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
44+
"mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
45+
"neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
46+
"neotab.nvim": { "branch": "master", "commit": "6c6107dddaa051504e433608f59eca606138269b" },
47+
"no-neck-pain.nvim": { "branch": "main", "commit": "c7efdbd0b739646c58d22fa44f6fffa2973f303e" },
48+
"noice.nvim": { "branch": "main", "commit": "5a78b42bec5e775f2db03bf93f6d1e0f3636306c" },
49+
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
50+
"nvim-ansible": { "branch": "main", "commit": "44dabdaa8a9193b7f564a8408ed6d7107705030a" },
51+
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
52+
"nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" },
53+
"nvim-lspconfig": { "branch": "master", "commit": "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754" },
54+
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
55+
"nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
56+
"nvim-treesitter": { "branch": "master", "commit": "dfd3207ed43a0c572c13acc02bf9d7dc270f4030" },
57+
"nvim-treesitter-context": { "branch": "master", "commit": "a2a334900d3643de585ac5c6140b03403454124f" },
58+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
59+
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
60+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
61+
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
62+
"oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" },
63+
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
64+
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
65+
"precognition.nvim": { "branch": "main", "commit": "0189e8d6f96275a079b2805d68d49414871885cd" },
66+
"rainbow-delimiters.nvim": { "branch": "master", "commit": "e0f9b3efe150724af2d2ed59997d5ece373840e3" },
67+
"sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
68+
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
69+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
70+
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
71+
"themery.nvim": { "branch": "main", "commit": "15c29229e9a25655587462c8c64a62d9aadf0a92" },
72+
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
73+
"toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
74+
"tokyonight.nvim": { "branch": "main", "commit": "52d67cc5d18c30f618897134620c64a11208fcae" },
75+
"trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
76+
"true-zen.nvim": { "branch": "main", "commit": "2b9e210e0d1a735e1fa85ec22190115dffd963aa" },
77+
"ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
78+
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
79+
"venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" },
80+
"vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
81+
"vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
82+
"vim-wakatime": { "branch": "master", "commit": "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1" },
83+
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
84+
}

‎config/nvim/lua/config/lazy.lua

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
22
if not (vim.uv or vim.loop).fs_stat(lazypath) then
3-
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
4-
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
5-
if vim.v.shell_error ~= 0 then
6-
vim.api.nvim_echo({
7-
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
8-
{ out, "WarningMsg" },
9-
{ "\nPress any key to exit..." },
10-
}, true, {})
11-
vim.fn.getchar()
12-
os.exit(1)
13-
end
3+
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
4+
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
5+
if vim.v.shell_error ~= 0 then
6+
vim.api.nvim_echo({
7+
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
8+
{ out, "WarningMsg" },
9+
{ "\nPress any key to exit..." },
10+
}, true, {})
11+
vim.fn.getchar()
12+
os.exit(1)
13+
end
1414
end
1515
vim.opt.rtp:prepend(lazypath)
1616

1717
require("lazy").setup({
18-
spec = {
19-
-- add LazyVim and import its plugins
20-
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
21-
-- import/override with your plugins
22-
{ import = "plugins" },
23-
},
24-
defaults = {
25-
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
26-
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
27-
lazy = false,
28-
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
29-
-- have outdated releases, which may break your Neovim install.
30-
version = false, -- always use the latest git commit
31-
-- version = "*", -- try installing the latest stable version for plugins that support semver
32-
},
33-
install = { colorscheme = { "tokyonight", "habamax" } },
34-
checker = {
35-
enabled = true, -- check for plugin updates periodically
36-
notify = false, -- notify on update
37-
}, -- automatically check for plugin updates
38-
performance = {
39-
rtp = {
40-
-- disable some rtp plugins
41-
disabled_plugins = {
42-
"gzip",
43-
-- "matchit",
44-
-- "matchparen",
45-
-- "netrwPlugin",
46-
"tarPlugin",
47-
"tohtml",
48-
"tutor",
49-
"zipPlugin",
50-
},
51-
},
18+
spec = {
19+
-- add LazyVim and import its plugins
20+
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
21+
-- import/override with your plugins
22+
{ import = "plugins" },
23+
},
24+
defaults = {
25+
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
26+
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
27+
lazy = false,
28+
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
29+
-- have outdated releases, which may break your Neovim install.
30+
version = false, -- always use the latest git commit
31+
-- version = "*", -- try installing the latest stable version for plugins that support semver
32+
},
33+
install = { colorscheme = { "tokyonight", "habamax" } },
34+
checker = {
35+
enabled = true, -- check for plugin updates periodically
36+
notify = false, -- notify on update
37+
}, -- automatically check for plugin updates
38+
performance = {
39+
rtp = {
40+
-- disable some rtp plugins
41+
disabled_plugins = {
42+
"gzip",
43+
-- "matchit",
44+
-- "matchparen",
45+
-- "netrwPlugin",
46+
"tarPlugin",
47+
"tohtml",
48+
"tutor",
49+
"zipPlugin",
50+
},
5251
},
52+
},
5353
})

‎config/nvim/lua/config/options.lua

+5
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@
33
-- Add any additional options here
44
-- -- If no prettier config file is found, the formatter will not be used
55
vim.g.lazyvim_prettier_needs_config = false
6+
vim.opt.conceallevel = 0
7+
vim.opt.tabstop = 4
8+
vim.opt.shiftwidth = 4
9+
vim.opt.softtabstop = 4 -- Number of spaces per tab when editing
10+
vim.opt.smartindent = true

‎config/nvim/lua/plugins/bad-practices.lua

-12
This file was deleted.

‎config/nvim/lua/plugins/cmp.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
dependencies = { "hrsh7th/cmp-emoji", name = "codeium" },
2+
"hrsh7th/nvim-cmp",
3+
dependencies = { "hrsh7th/cmp-emoji", name = "codeium" },
44
}

‎config/nvim/lua/plugins/codeium.lua

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
return {
2-
"Exafunction/codeium.nvim",
3-
dependencies = {
4-
"nvim-lua/plenary.nvim",
5-
"hrsh7th/nvim-cmp",
6-
},
7-
config = function()
8-
require("codeium").setup({})
9-
end,
2+
"Exafunction/codeium.nvim",
3+
dependencies = {
4+
"nvim-lua/plenary.nvim",
5+
"hrsh7th/nvim-cmp",
6+
},
7+
config = function()
8+
require("codeium").setup({})
9+
end,
1010
}

‎config/nvim/lua/plugins/colorscheme.lua

+54-54
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
return {
2-
{ "scottmckendry/cyberdream.nvim", opts = {
3-
transparent = true,
4-
} },
5-
{
6-
"catppuccin/nvim",
7-
lazy = true,
8-
name = "catppuccin",
9-
opts = {
10-
transparent_background = true,
11-
integrations = {
12-
aerial = true,
13-
alpha = true,
14-
cmp = true,
15-
dashboard = true,
16-
flash = true,
17-
grug_far = true,
18-
gitsigns = true,
19-
headlines = true,
20-
illuminate = true,
21-
indent_blankline = { enabled = true },
22-
leap = true,
23-
lsp_trouble = true,
24-
mason = true,
25-
markdown = true,
26-
mini = true,
27-
native_lsp = {
28-
enabled = true,
29-
underlines = {
30-
errors = { "undercurl" },
31-
hints = { "undercurl" },
32-
warnings = { "undercurl" },
33-
information = { "undercurl" },
34-
},
35-
},
36-
navic = { enabled = true, custom_bg = "lualine" },
37-
neotest = true,
38-
neotree = true,
39-
noice = true,
40-
notify = true,
41-
semantic_tokens = true,
42-
telescope = true,
43-
treesitter = true,
44-
treesitter_context = true,
45-
which_key = true,
46-
},
2+
{ "scottmckendry/cyberdream.nvim", opts = {
3+
transparent = true,
4+
} },
5+
{
6+
"catppuccin/nvim",
7+
lazy = true,
8+
name = "catppuccin",
9+
opts = {
10+
transparent_background = true,
11+
integrations = {
12+
aerial = true,
13+
alpha = true,
14+
cmp = true,
15+
dashboard = true,
16+
flash = true,
17+
grug_far = true,
18+
gitsigns = true,
19+
headlines = true,
20+
illuminate = true,
21+
indent_blankline = { enabled = true },
22+
leap = true,
23+
lsp_trouble = true,
24+
mason = true,
25+
markdown = true,
26+
mini = true,
27+
native_lsp = {
28+
enabled = true,
29+
underlines = {
30+
errors = { "undercurl" },
31+
hints = { "undercurl" },
32+
warnings = { "undercurl" },
33+
information = { "undercurl" },
34+
},
4735
},
36+
navic = { enabled = true, custom_bg = "lualine" },
37+
neotest = true,
38+
neotree = true,
39+
noice = true,
40+
notify = true,
41+
semantic_tokens = true,
42+
telescope = true,
43+
treesitter = true,
44+
treesitter_context = true,
45+
which_key = true,
46+
},
4847
},
49-
{
50-
"mellow-theme/mellow.nvim",
51-
},
52-
{ "nyoom-engineering/oxocarbon.nvim" },
53-
{
54-
"LazyVim/LazyVim",
55-
opts = {
56-
colorscheme = "catppuccin",
57-
},
48+
},
49+
{
50+
"mellow-theme/mellow.nvim",
51+
},
52+
{ "nyoom-engineering/oxocarbon.nvim" },
53+
{
54+
"LazyVim/LazyVim",
55+
opts = {
56+
colorscheme = "catppuccin",
5857
},
58+
},
5959
}

‎config/nvim/lua/plugins/conform.lua

+7-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ return {
1111
javascriptreact = { "prettier" },
1212
typescriptreact = { "prettier" },
1313
css = { "prettier" },
14-
html = { "prettier" },
14+
html = { "prettier", "djlint" },
1515
json = { "prettier" },
1616
yaml = { "prettier" },
1717
markdown = { "prettier" },
1818
graphql = { "prettier" },
1919
},
20+
formatters = {
21+
prettier = {
22+
prepend_args = { "--tab-width", "4", "--print-width", "100" },
23+
},
24+
ruff = {},
25+
},
2026
}
2127
return opts
2228
end,

0 commit comments

Comments
 (0)