diff --git a/.editorconfig b/.editorconfig index a3fb82b..c314662 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,12 +1,11 @@ [*] end_of_line = lf insert_final_newline = true +indent_style = space [*.yaml] -indent_style = space indent_size = 2 [*.lua] -indent_style = space indent_size = 2 diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json deleted file mode 100644 index eabe87d..0000000 --- a/config/nvim/lazy-lock.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "0471ca14cae4fd249a848a30855e8cfb39be9dbc" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, - "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, - "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, - "dashboard-nvim": { "branch": "master", "commit": "e6e33b848f0e2fe5c13f6553c568764555c390a3" }, - "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, - "flash.nvim": { "branch": "main", "commit": "3bdf1304d8d4679fa3ff88abc08ce2a1be859b60" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "39b5b6f48bde0595ce68007ffce408c5d7ac1f79" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "6ca23c15f64e88e3ba26be9795343c4c7f2ee851" }, - "lazydev.nvim": { "branch": "main", "commit": "034282543960cc2292be6a5f2b6da71d126837ad" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, - "mini.icons": { "branch": "main", "commit": "22566a0211ed0588f662ff7425094951be0d77e1" }, - "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "neo-tree.nvim": { "branch": "main", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "noice.nvim": { "branch": "main", "commit": "27b63bdadcdf54bf1a83631266e6bbe099f463f0" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, - "nvim-treesitter": { "branch": "master", "commit": "a8c082b4f5b3b70bde2ffb08cc112dfd7e515fb3" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "persistence.nvim": { "branch": "main", "commit": "b915cbd3d1aee6f09724cef29a75929293fc0a78" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, - "todo-comments.nvim": { "branch": "main", "commit": "0139d7a283907aebb1bd0975573eb80a3269327c" }, - "tokyonight.nvim": { "branch": "main", "commit": "c543214258fb8219d16b6a2f3fb7538182a51c12" }, - "trouble.nvim": { "branch": "main", "commit": "b61cebb638cef1a3fe60542704bc79c4436dfc1a" }, - "ts-comments.nvim": { "branch": "main", "commit": "be4b3311ac981397c003aeaf5e8417040762c54f" }, - "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, - "which-key.nvim": { "branch": "main", "commit": "d26d82ddb91b02447964bf356b9f0b6c96c3aff8" } -} \ No newline at end of file diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index 8ccf15e..7897ae6 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -5,6 +5,6 @@ local opt = vim.opt opt.colorcolumn = "100" opt.list = true --- opt.relativenumber = false +opt.listchars = { lead = "·", tab = "· ", trail = "·" } opt.tabstop = 4 opt.winbar = "%=%m %f" diff --git a/config/nvim/lua/plugins/colorscheme.lua b/config/nvim/lua/plugins/colorscheme.lua index cb2fad7..74dfa56 100644 --- a/config/nvim/lua/plugins/colorscheme.lua +++ b/config/nvim/lua/plugins/colorscheme.lua @@ -25,13 +25,13 @@ return { -- create the highlight groups in the highlight setup hook, so they are reset -- every time the colorscheme changes hooks.register(hooks.type.HIGHLIGHT_SETUP, function() - vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" }) - vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" }) - vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" }) - vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" }) - vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" }) - vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" }) - vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" }) + vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#e78284" }) + vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#e5c890" }) + vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#8caaee" }) + vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#ef9f76" }) + vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#a6d189" }) + vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#ca9ee6" }) + vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#babbf1" }) end) require("ibl").setup({ indent = { highlight = highlight } }) diff --git a/config/nvim/lua/plugins/core.lua b/config/nvim/lua/plugins/core.lua deleted file mode 100644 index a564707..0000000 --- a/config/nvim/lua/plugins/core.lua +++ /dev/null @@ -1 +0,0 @@ -return {} diff --git a/config/nvim/lua/plugins/dashboard.lua b/config/nvim/lua/plugins/dashboard.lua index e48e30f..6cc1646 100644 --- a/config/nvim/lua/plugins/dashboard.lua +++ b/config/nvim/lua/plugins/dashboard.lua @@ -3,7 +3,7 @@ return { "nvimdev/dashboard-nvim", lazy = false, opts = function(_, opts) - local logo = { + local logo = { [[ ]], [[  ]], [[ ████ ██████ █████ ██ ]], diff --git a/config/nvim/lua/plugins/formatter.lua b/config/nvim/lua/plugins/formatter.lua new file mode 100644 index 0000000..a1cf976 --- /dev/null +++ b/config/nvim/lua/plugins/formatter.lua @@ -0,0 +1,10 @@ +return { + { + "stevearc/conform.nvim", + opts = { + formatters_by_ft = { + json = { "prettier" }, + }, + }, + }, +} diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua index f7379dd..a144a03 100644 --- a/config/nvim/lua/plugins/neo-tree.lua +++ b/config/nvim/lua/plugins/neo-tree.lua @@ -3,7 +3,6 @@ return { opts = { filesystem = { filtered_items = { - -- visible = true, hide_dotfiles = false, hide_gitignored = true, never_show = { ".git" },