diff --git a/after/ftplugin/markdown.lua b/after/ftplugin/markdown.lua index c3dcaef..70459ca 100644 --- a/after/ftplugin/markdown.lua +++ b/after/ftplugin/markdown.lua @@ -1,4 +1,3 @@ - local set = vim.opt_local set.textwidth = 80 diff --git a/init.lua b/init.lua index 1145424..bb401cf 100644 --- a/init.lua +++ b/init.lua @@ -2,3 +2,4 @@ require("themenacesauce.core") require("themenacesauce.lazy") require("current-theme") + diff --git a/lazy-lock.json b/lazy-lock.json index c2ee85f..096bcf1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,59 +1,59 @@ { - "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "auto-session": { "branch": "main", "commit": "62437532b38495551410b3f377bcf4aaac574ebe" }, + "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" }, + "auto-session": { "branch": "main", "commit": "6cde3874a9283c2db55627acca5f28e4fa402320" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, - "folkeTokyonight": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, + "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, + "folkeTokyonight": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "fzy-lua-native": { "branch": "master", "commit": "9d720745d5c2fb563c0d86c17d77612a3519c506" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, - "gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" }, + "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" }, + "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" }, "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, "img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" }, - "incline.nvim": { "branch": "main", "commit": "8b54c59bcb23366645ae10edca6edfb9d3a0853e" }, - "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, + "incline.nvim": { "branch": "main", "commit": "debd628e9395f7a9da57bdc31ce75ca6b40a880b" }, + "kanagawa.nvim": { "branch": "master", "commit": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" }, + "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4068c3ebd4cb335b25239e5ea35c22ee6007962" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.comment": { "branch": "main", "commit": "597d32ed2c9fbfbf9a250bec7c6b9035f71214f5" }, - "mini.files": { "branch": "main", "commit": "b4796e09eb103f9f2d1e00aa2dab3753b879b17b" }, - "mini.nvim": { "branch": "main", "commit": "59f09943573c5348ca6c88393fa09ce3b66a7818" }, - "mini.splitjoin": { "branch": "main", "commit": "8112e794cbb022b9d4b7af60b64e9896930f1697" }, - "mini.surround": { "branch": "main", "commit": "d205d1741d1fcc1f3117b4e839bf00f74ad72fa2" }, - "mini.trailspace": { "branch": "main", "commit": "27acb69562a4742256ab3e4b0127391fcb49dbb3" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, + "mini.comment": { "branch": "main", "commit": "27a29d6b949b9497f80a0a03421e89fed71d8c37" }, + "mini.files": { "branch": "main", "commit": "d08e8da87be8bf07d09245294821706afcca31cd" }, + "mini.nvim": { "branch": "main", "commit": "9459d7f41ae77d909579dab0aea2bdd3210fac9f" }, + "mini.splitjoin": { "branch": "main", "commit": "9301717c7612ccb72e89629df89416585dd54c9b" }, + "mini.surround": { "branch": "main", "commit": "8d5d0c5aa92449368ac251e85451d79d8f69d296" }, + "mini.trailspace": { "branch": "main", "commit": "82c4fb7d4336f8824ca6c97068932886b56326d0" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, - "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "85a5e83cd4daa258cf95c3204e277991d6fbe747" }, + "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, + "nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "72a05f62c52241bc7441c820eb53946f92b2e6a4" }, "nvim-emmet": { "branch": "main", "commit": "cde4fb2968704aae5c18b7f8a9bc2508767bb78d" }, - "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, + "nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" }, - "nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" }, - "nvim-treesitter": { "branch": "main", "commit": "e5f65e31a5ec0e8526b2311ff8c7aaea4a581c82" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, + "nvim-lspconfig": { "branch": "master", "commit": "d5b6e3db4c17b0146f63a2fc47e2027a754b2cb1" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6141a40173c6efa98242dc951ed4b6f892c97027" }, "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" }, - "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, - "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "nvim-web-devicons": { "branch": "master", "commit": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f" }, + "oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" }, - "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, + "render-markdown.nvim": { "branch": "main", "commit": "f422cb5c6855f150e2ddcfaf44e7157b98b34f6a" }, + "rose-pine": { "branch": "main", "commit": "ff483051a47e27d84bdef47703538df1ed9f4a47" }, "showkeys": { "branch": "main", "commit": "cb0a50296f11f1e585acffba8c253b9e8afc1f84" }, - "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "f0c2f0ba0bd56108d53c9bfae4bb28ff6c67bbdb" }, + "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" }, + "solarized-osaka.nvim": { "branch": "main", "commit": "f675d9a5c58f3b0d6158d665a623f81a62e7bdaf" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" }, "telescope-themes": { "branch": "main", "commit": "65721365bd7a04a6c9679e76b6387b60320fd5f3" }, - "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, + "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" }, diff --git a/lua/themenacesauce/core/keymaps.lua b/lua/themenacesauce/core/keymaps.lua index 45b702f..870b43f 100644 --- a/lua/themenacesauce/core/keymaps.lua +++ b/lua/themenacesauce/core/keymaps.lua @@ -3,6 +3,17 @@ local opts = { noremap = true, silent = true } vim.g.mapleader = " " vim.g.maplocalleader = " " + +-- alternative delete word +vim.keymap.set("i", '', "", { noremap = true, silent = true, desc = "Backspace word" }) + +vim.api.nvim_create_autocmd("InsertEnter", { + callback = function() + vim.keymap.set("i", "", "", + { buffer = true, noremap = true, silent = true, desc = "Force backspace word" }) + end, +}) + vim.keymap.set("v", "J", ":m '>+1gv=gv", { desc = "moves lines down in visual selection" }) vim.keymap.set("v", "K", ":m '<-2gv=gv", { desc = "moves lines up in visual selection" }) @@ -48,7 +59,10 @@ M.general = { -- ctrl c as escape cuz Im lazy to reach up to the esc key vim.keymap.set("i", "", "") + +-- clear highlighting vim.keymap.set("n", "", ":nohl", { desc = "Clear search hl", silent = true }) + -- format without prettier using the built in vim.keymap.set("n", "f", vim.lsp.buf.format) diff --git a/lua/themenacesauce/core/options.lua b/lua/themenacesauce/core/options.lua index 066b2bd..634ac55 100644 --- a/lua/themenacesauce/core/options.lua +++ b/lua/themenacesauce/core/options.lua @@ -1,5 +1,6 @@ vim.cmd("let g:netrw_banner = 0") +vim.opt.termguicolors = true -- sets Vim Option Numberlines to true and then enables relative numberline. vim.opt.nu = true vim.opt.relativenumber = true @@ -25,7 +26,7 @@ vim.opt.smartcase = true vim.opt.scrolloff = 8 vim.opt.signcolumn = "yes" -vim.opt.backspace = {"start", "eol", "indent" } +vim.opt.backspace = { "start", "eol", "indent" } vim.opt.splitright = true vim.opt.splitbelow = true @@ -36,12 +37,11 @@ vim.opt.updatetime = 50 vim.opt.colorcolumn = "80" -- lets you copy text from NVim into others apps. --- vim.opt.clipboard:append("unnamedplus") +vim.opt.clipboard = "unnamedplus" -- highlights the files you search for. vim.opt.hlsearch = true -vim.opt.mouse = "a" -- mouse support for all vim modes +vim.opt.mouse = "a" -- mouse support for all vim modes vim.g.editorconfig = true -- consistent coding styles across editors - diff --git a/lua/themenacesauce/plugins/colorizer.lua b/lua/themenacesauce/plugins/colorizer.lua new file mode 100644 index 0000000..29fdda4 --- /dev/null +++ b/lua/themenacesauce/plugins/colorizer.lua @@ -0,0 +1,52 @@ +return { + { + "NvChad/nvim-colorizer.lua", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + opts = {}, + config = function() + local colorizer = require("colorizer") + + colorizer.setup({ + user_commands = true, + options = { + parsers = { + hex = { + enable = true, + rrggbb = true, + rgb = true, + rgba = true, + rrggbbaa = true, + }, + css = true, + -- tailwind completions setup in nvim cmp + tailwind = { + enable = true, + lsp = true, + update_names = true, + }, + } + }, + filetypes = { + "html", + "css", + "javascript", + "typescript", + "javascriptreact", + "typescriptreact", + "vue", + "svelte", + "astro", + + toml = { + parsers = { + hex = { + enable = true, + }, + names = false, + }, + }, + }, + }) + end, + }, +} diff --git a/lua/themenacesauce/plugins/snacks.lua b/lua/themenacesauce/plugins/snacks.lua index ddb13bb..6bd74cb 100644 --- a/lua/themenacesauce/plugins/snacks.lua +++ b/lua/themenacesauce/plugins/snacks.lua @@ -137,7 +137,7 @@ return { { section = "terminal", cmd = "ascii-image-converter ~/Pictures/imagesForLinux/Pfp.png -C -c", - random = 15, + random = 28, pane = 2, indent = 15, height = 30, diff --git a/lua/themenacesauce/plugins/vim-maximizer.lua b/lua/themenacesauce/plugins/vim-maximizer.lua index a56626c..1622907 100644 --- a/lua/themenacesauce/plugins/vim-maximizer.lua +++ b/lua/themenacesauce/plugins/vim-maximizer.lua @@ -1,6 +1,6 @@ return { - "szw/vim-maximizer", - keys = { - { "sm", "MaximizeToggle", desc = "Maximize/minimize a split" }, - }, + "szw/vim-maximizer", + keys = { + { "sm", "MaximizerToggle", desc = "Maximize/minimize a split" }, + }, }