From 9b2c4071725aff41c44d722f057bd4c000754a00 Mon Sep 17 00:00:00 2001 From: Guust Taillieu Date: Sat, 4 Oct 2025 10:14:07 +0200 Subject: [PATCH] fixed issue with oil, added after package --- init.lua | 18 ++++++ lazy-lock.json | 52 ++++++++---------- lazyvim.json | 9 +++ lua/custom/after/transparency.lua | 45 +++++++++++++++ lua/custom/plugins/color-picker.lua | 17 ++++++ lua/custom/plugins/noice.lua | 14 +---- lua/custom/plugins/oil.lua | 1 + lua/kickstart/plugins/colorscheme.lua | 79 --------------------------- lua/kickstart/plugins/format.lua | 22 ++++---- lua/kickstart/plugins/theme.lua | 1 + 10 files changed, 127 insertions(+), 131 deletions(-) create mode 100644 lazyvim.json create mode 100644 lua/custom/after/transparency.lua create mode 100644 lua/custom/plugins/color-picker.lua delete mode 100644 lua/kickstart/plugins/colorscheme.lua create mode 120000 lua/kickstart/plugins/theme.lua diff --git a/init.lua b/init.lua index d1fba00d..5d7418ee 100644 --- a/init.lua +++ b/init.lua @@ -209,6 +209,22 @@ vim.keymap.set('n', 'yp', function() print('file:', path) end) +-- Copy all content of the current buffer +vim.keymap.set('n', 'ya', function() + vim.fn.setreg('+', vim.api.nvim_buf_get_lines(0, 0, -1, false)) + vim.notify 'Copied all content of the current buffer' +end) + +-- Delete all content of the current buffer +vim.keymap.set('n', 'da', function() + vim.api.nvim_buf_set_lines(0, 0, -1, false, {}) +end) + +-- Select all content of the current buffer +vim.keymap.set('n', 'sa', function() + vim.api.nvim_feedkeys('ggVG', 'n', false) +end) + -- Basic autocommands local augroup = vim.api.nvim_create_augroup('UserConfig', {}) @@ -526,5 +542,7 @@ require('lazy').setup({ }, }) +require 'custom.after.transparency' + -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index 41ba1f57..3e6b9322 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,53 +1,47 @@ { + "LazyVim": { "branch": "main", "commit": "b9d38f692015fecaa72d55282b74a3d601e4c9fa" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "blink.cmp": { "branch": "main", "commit": "4e9edba1b1cef1585cc65e54287229e5d34e4df8" }, - "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "04bfa5f35706410376bf7618a01fcf44e3f35b59" }, - "fidget.nvim": { "branch": "main", "commit": "a837f0653ab0f07b9efb1870372a60a031208ac1" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "conform.nvim": { "branch": "master", "commit": "c64cc754ace603e185ab30113aaef174187eacf8" }, + "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" }, + "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, + "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "0069a71538020a77a19f4f8d5e89f066e264a6dc" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "mason.nvim": { "branch": "main", "commit": "a83eabdc8c49c0c93bf5bb162fa3b57404a9d095" }, + "matteblack.nvim": { "branch": "main", "commit": "3bfd406f3b2e41eb3458fe735e06447c08b67d03" }, + "mini.nvim": { "branch": "main", "commit": "126ce3328c78399dcff58272f6f540a373b62a75" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-dap": { "branch": "master", "commit": "f777d1d20ed50c2f312e286892c062d9c2f1c6fe" }, + "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" }, - "nvim-lspconfig": { "branch": "master", "commit": "d64ea08d8033543a61af35f2f23cac0f0d05f7b4" }, + "nvim-lint": { "branch": "master", "commit": "335a6044be16d7701001059cba9baa36fbeef422" }, + "nvim-lspconfig": { "branch": "master", "commit": "db8fef885009fdec0daeff3e5dda92e1f539611e" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" }, + "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" }, + "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "oil-git-status.nvim": { "branch": "main", "commit": "4b5cf53842c17a09420919e655a6a559da3112d7" }, - "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, + "oil.nvim": { "branch": "master", "commit": "919e155fdf38e9148cdb5304faaaf53c20d703ea" }, + "oklch-color-picker.nvim": { "branch": "master", "commit": "ae318113cd7d0e4988b6b059327c2778911f1187" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "f64efd33a51ea89bdb847fb3aaf716e96b83ba1a" }, + "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "29315861711f11daf75e1cf0953ab92ec1a3e69f" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" } } diff --git a/lazyvim.json b/lazyvim.json new file mode 100644 index 00000000..dc3e179d --- /dev/null +++ b/lazyvim.json @@ -0,0 +1,9 @@ +{ + "extras": [ + + ], + "news": { + "NEWS.md": "11866" + }, + "version": 8 +} \ No newline at end of file diff --git a/lua/custom/after/transparency.lua b/lua/custom/after/transparency.lua new file mode 100644 index 00000000..d0090f07 --- /dev/null +++ b/lua/custom/after/transparency.lua @@ -0,0 +1,45 @@ +-- transparent background +vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "Pmenu", { bg = "none" }) +vim.api.nvim_set_hl(0, "Terminal", { bg = "none" }) +vim.api.nvim_set_hl(0, "EndOfBuffer", { bg = "none" }) +vim.api.nvim_set_hl(0, "FoldColumn", { bg = "none" }) +vim.api.nvim_set_hl(0, "Folded", { bg = "none" }) +vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) +vim.api.nvim_set_hl(0, "WhichKeyFloat", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopeBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopePromptBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopePromptTitle", { bg = "none" }) + +-- transparent background for neotree +vim.api.nvim_set_hl(0, "NeoTreeNormal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeNormalNC", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeVertSplit", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeWinSeparator", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeEndOfBuffer", { bg = "none" }) + +-- transparent background for nvim-tree +vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NvimTreeVertSplit", { bg = "none" }) +vim.api.nvim_set_hl(0, "NvimTreeEndOfBuffer", { bg = "none" }) + +-- transparent notify background +vim.api.nvim_set_hl(0, "NotifyINFOBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyERRORBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyWARNBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyTRACEBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyDEBUGBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyINFOTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyERRORTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyWARNTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyTRACETitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyDEBUGTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyINFOBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyERRORBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyWARNBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyTRACEBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyDEBUGBorder", { bg = "none" }) diff --git a/lua/custom/plugins/color-picker.lua b/lua/custom/plugins/color-picker.lua new file mode 100644 index 00000000..b7ebe7f1 --- /dev/null +++ b/lua/custom/plugins/color-picker.lua @@ -0,0 +1,17 @@ +return { + 'eero-lehtinen/oklch-color-picker.nvim', + event = 'VeryLazy', + version = '*', + keys = { + -- One handed keymap recommended, you will be using the mouse + { + 'v', + function() + require('oklch-color-picker').pick_under_cursor() + end, + desc = 'Color pick under cursor', + }, + }, + ---@type oklch.Opts + opts = {}, +} diff --git a/lua/custom/plugins/noice.lua b/lua/custom/plugins/noice.lua index 7e3de12f..8dcdbc65 100644 --- a/lua/custom/plugins/noice.lua +++ b/lua/custom/plugins/noice.lua @@ -1,18 +1,8 @@ return { -- lazy.nvim { - 'folke/noice.nvim', + 'rcarriga/nvim-notify', event = 'VeryLazy', - opts = { - -- add any options here - }, - dependencies = { - -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries - 'MunifTanjim/nui.nvim', - -- OPTIONAL: - -- `nvim-notify` is only needed, if you want to use the notification view. - -- If not available, we use `mini` as the fallback - 'rcarriga/nvim-notify', - }, + opts = {}, }, } diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua index 6a2d7d02..bdbedd8d 100644 --- a/lua/custom/plugins/oil.lua +++ b/lua/custom/plugins/oil.lua @@ -24,6 +24,7 @@ return { [''] = { 'actions.select', opts = { vertical = true } }, [''] = { 'actions.select', opts = { horizontal = true } }, [''] = { 'actions.select', opts = { tab = true } }, + [''] = false, }, view_options = { show_hidden = true, diff --git a/lua/kickstart/plugins/colorscheme.lua b/lua/kickstart/plugins/colorscheme.lua deleted file mode 100644 index eaf0b391..00000000 --- a/lua/kickstart/plugins/colorscheme.lua +++ /dev/null @@ -1,79 +0,0 @@ -return { -- You can easily change to a different colorscheme. - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - { - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - transparent = true, - styles = { - sidebars = 'transparent', - floats = 'transparent', - comments = { italic = false }, -- Disable italics in comments - }, - } - - -- Load the colorscheme here. - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - -- vim.cmd.colorscheme 'tokyonight-night' - end, - }, - { - 'catppuccin/nvim', - name = 'catppuccin', - priority = 1000, - config = function() - require('catppuccin').setup { - flavour = 'mocha', -- latte, frappe, macchiato, mocha - background = { -- :h background - light = 'latte', - dark = 'mocha', - }, - transparent_background = true, -- disables setting the background color. - float = { - transparent = true, -- enable transparent floating windows - solid = false, -- use solid styling for floating windows, see |winborder| - }, - show_end_of_buffer = false, -- shows the '~' characters after the end of buffers - term_colors = true, -- sets terminal colors (e.g. `g:terminal_color_0`) - dim_inactive = { - enabled = false, -- dims the background color of inactive window - shade = 'dark', - percentage = 0.15, -- percentage of the shade to apply to the inactive window - }, - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = { 'italic' }, -- Change the style of comments - conditionals = { 'italic' }, - loops = {}, - functions = { 'italic' }, - keywords = { 'bold' }, - strings = {}, - variables = {}, - numbers = {}, - booleans = { 'bold' }, - properties = {}, - types = { 'italic' }, - operators = {}, - -- miscs = {}, -- Uncomment to turn off hard-coded styles - }, - default_integrations = true, - auto_integrations = false, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - treesitter = true, - notify = true, - mini = { - enabled = true, - indentscope_color = '', - }, - -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations) - }, - } - - vim.cmd.colorscheme 'catppuccin' - end, - }, -} diff --git a/lua/kickstart/plugins/format.lua b/lua/kickstart/plugins/format.lua index 3a8d8c72..8487dadf 100644 --- a/lua/kickstart/plugins/format.lua +++ b/lua/kickstart/plugins/format.lua @@ -30,18 +30,18 @@ return { -- Autoformat end, formatters_by_ft = { lua = { 'stylua' }, - svelte = { { 'prettierd', 'prettier', stop_after_first = true } }, - astro = { { 'prettierd', 'prettier', stop_after_first = true } }, - javascript = { { 'prettierd', 'prettier', stop_after_first = true } }, - typescript = { { 'prettierd', 'prettier', stop_after_first = true } }, - javascriptreact = { { 'prettierd', 'prettier', stop_after_first = true } }, - typescriptreact = { { 'prettierd', 'prettier', stop_after_first = true } }, - json = { { 'prettierd', 'prettier', stop_after_first = true } }, - graphql = { { 'prettierd', 'prettier', stop_after_first = true } }, + svelte = { 'prettierd', 'prettier', stop_after_first = true }, + astro = { 'prettierd', 'prettier', stop_after_first = true }, + javascript = { 'prettierd', 'prettier', stop_after_first = true }, + typescript = { 'prettierd', 'prettier', stop_after_first = true }, + javascriptreact = { 'prettierd', 'prettier', stop_after_first = true }, + typescriptreact = { 'prettierd', 'prettier', stop_after_first = true }, + json = { 'prettierd', 'prettier', stop_after_first = true }, + graphql = { 'prettierd', 'prettier', stop_after_first = true }, java = { 'google-java-format' }, kotlin = { 'ktlint' }, ruby = { 'standardrb' }, - markdown = { { 'prettierd', 'prettier', stop_after_first = true } }, + markdown = { 'prettierd', 'prettier', stop_after_first = true }, erb = { 'htmlbeautifier' }, html = { 'htmlbeautifier' }, bash = { 'beautysh' }, @@ -49,8 +49,8 @@ return { -- Autoformat rust = { 'rustfmt' }, yaml = { 'yamlfix' }, toml = { 'taplo' }, - css = { { 'prettierd', 'prettier', stop_after_first = true } }, - scss = { { 'prettierd', 'prettier', stop_after_first = true } }, + css = { 'prettierd', 'prettier', stop_after_first = true }, + scss = { 'prettierd', 'prettier', stop_after_first = true }, sh = { 'shellcheck' }, go = { 'gofmt', 'goimports', 'goimports_reviser' }, xml = { 'xmllint' }, diff --git a/lua/kickstart/plugins/theme.lua b/lua/kickstart/plugins/theme.lua new file mode 120000 index 00000000..8e7216a9 --- /dev/null +++ b/lua/kickstart/plugins/theme.lua @@ -0,0 +1 @@ +/home/gustavo/.config/omarchy/current/theme/neovim.lua \ No newline at end of file