From 86cb768399a65f95ffb4ab5c9486208f5aa7af6f Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Mon, 21 Aug 2023 17:31:22 +0300 Subject: [PATCH] nvim --- .../nvim/after/plugin/catppuccin.lua | 44 --------------- .../dot-config/nvim/after/plugin/gitsigns.lua | 34 ----------- nvim/dot-config/nvim/init.lua | 2 +- nvim/dot-config/nvim/lua/my/keymaps.lua | 35 ++++++++++-- nvim/dot-config/nvim/lua/plugins.lua | 56 ++++++++++++++++++- 5 files changed, 83 insertions(+), 88 deletions(-) delete mode 100644 nvim/dot-config/nvim/after/plugin/catppuccin.lua delete mode 100644 nvim/dot-config/nvim/after/plugin/gitsigns.lua diff --git a/nvim/dot-config/nvim/after/plugin/catppuccin.lua b/nvim/dot-config/nvim/after/plugin/catppuccin.lua deleted file mode 100644 index 00a2ab5..0000000 --- a/nvim/dot-config/nvim/after/plugin/catppuccin.lua +++ /dev/null @@ -1,44 +0,0 @@ -local ok, catppuccin = pcall(require, "catppuccin") -if not ok then - return -end - -catppuccin.setup { - flavour = "mocha", -- latte, frappe, macchiato, mocha - transparent_background = true, - dim_inactive = { - enabled = false, - -- shade = "dark", - -- percentage = 0.15, - }, - integrations = { - cmp = true, - fidget = true, - gitsigns = true, - indent_blankline = { - enabled = true, - colored_indent_levels = false, - }, - mason = true, - native_lsp = { - enabled = true, - virtual_text = { - errors = { "italic" }, - hints = { "italic" }, - warnings = { "italic" }, - information = { "italic" }, - }, - underlines = { - errors = { "underline" }, - hints = { "underline" }, - warnings = { "underline" }, - information = { "underline" }, - }, - }, - telescope = true, - treesitter = true, - treesitter_context = true, - }, -} - -vim.cmd.colorscheme "catppuccin" diff --git a/nvim/dot-config/nvim/after/plugin/gitsigns.lua b/nvim/dot-config/nvim/after/plugin/gitsigns.lua deleted file mode 100644 index cb739ff..0000000 --- a/nvim/dot-config/nvim/after/plugin/gitsigns.lua +++ /dev/null @@ -1,34 +0,0 @@ -local ok, gs = pcall(require, "gitsigns") -if not ok then - return -end - -gs.setup { - current_line_blame = true, - current_line_blame_opts = { - delay = 300, - }, - on_attach = function(bufnr) - local nmap = require("my.utils").nmap - - nmap("]c", function() - if vim.wo.diff then - return "]c" - end - vim.schedule(function() - gs.next_hunk() - end) - return "" - end, "next hunk", bufnr) - - nmap("[c", function() - if vim.wo.diff then - return "[c" - end - vim.schedule(function() - gs.prev_hunk() - end) - return "" - end, "previous hunk", bufnr) - end, -} diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 7cb4276..e584e0d 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -27,7 +27,7 @@ end vim.opt.rtp:prepend(lazypath) require("lazy").setup("plugins") -vim.opt.background = "dark" +-- vim.opt.background = "dark" vim.opt.clipboard = "unnamedplus" vim.opt.colorcolumn = { 100 } vim.opt.completeopt = "menu,menuone,noselect" diff --git a/nvim/dot-config/nvim/lua/my/keymaps.lua b/nvim/dot-config/nvim/lua/my/keymaps.lua index 2980a93..d096ea2 100644 --- a/nvim/dot-config/nvim/lua/my/keymaps.lua +++ b/nvim/dot-config/nvim/lua/my/keymaps.lua @@ -1,3 +1,5 @@ +local M = {} + local resize = require("my.resize").resize local utils = require "my.utils" local nmap, imap, vmap = utils.nmap, utils.imap, utils.vmap @@ -62,7 +64,7 @@ vmap("p", '"_dP') vmap(">", ">gv") vmap("<", "r", vim.lsp.buf.rename, "Rename", bufnr) nmap("cf", vim.lsp.buf.format, "Format document", bufnr) nmap("ca", vim.lsp.buf.code_action, "Code actions", bufnr) @@ -75,7 +77,7 @@ local function lsp_keymaps(client, bufnr) end end -local function telescope_keymaps(fns) +M.telescope_keymaps = function(fns) nmap("", fns.project, "Find project files") nmap("fn", fns.dotfiles, "Dotfiles") nmap("", fns.builtin.git_files, "Find git files") @@ -83,7 +85,28 @@ local function telescope_keymaps(fns) nmap("gs", fns.builtin.git_status, "Git status") end -return { - lsp_keymaps = lsp_keymaps, - telescope_keymaps = telescope_keymaps, -} +M.gitsigns_keymaps = function(bufnr) + local gs = require "gitsigns" + + nmap("]c", function() + if vim.wo.diff then + return "]c" + end + vim.schedule(function() + gs.next_hunk() + end) + return "" + end, "next hunk", bufnr) + + nmap("[c", function() + if vim.wo.diff then + return "[c" + end + vim.schedule(function() + gs.prev_hunk() + end) + return "" + end, "previous hunk", bufnr) +end + +return M diff --git a/nvim/dot-config/nvim/lua/plugins.lua b/nvim/dot-config/nvim/lua/plugins.lua index faa23eb..f572786 100644 --- a/nvim/dot-config/nvim/lua/plugins.lua +++ b/nvim/dot-config/nvim/lua/plugins.lua @@ -3,7 +3,48 @@ return { "catppuccin/nvim", lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins - name = "catppuccin" + name = "catppuccin", + opts = { + flavour = "mocha", -- latte, frappe, macchiato, mocha + transparent_background = false, + dim_inactive = { + enabled = true, + shade = "dark", + percentage = 0.15, + }, + integrations = { + cmp = true, + fidget = true, + gitsigns = true, + indent_blankline = { + enabled = true, + colored_indent_levels = false, + }, + mason = true, + native_lsp = { + enabled = true, + virtual_text = { + errors = { "italic" }, + hints = { "italic" }, + warnings = { "italic" }, + information = { "italic" }, + }, + underlines = { + errors = { "underline" }, + hints = { "underline" }, + warnings = { "underline" }, + information = { "underline" }, + }, + }, + telescope = true, + treesitter = true, + treesitter_context = true, + }, + }, + config = function(_LazyPlugin, opts) + require("catppuccin").setup(opts) + vim.cmd.colorscheme "catppuccin" + end }, { "nvim-telescope/telescope.nvim", @@ -27,7 +68,7 @@ return { "nvim-treesitter/nvim-treesitter-context", "nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/playground", - } + }, }, { "j-hui/fidget.nvim", @@ -82,11 +123,20 @@ return { use_default_keymaps = false, } }, + { + "lewis6991/gitsigns.nvim", + opts = { + current_line_blame = true, + current_line_blame_opts = { + delay = 300, + }, + on_attach = require "my.keymaps".gitsigns_keymaps, + } + }, { "lukas-reineke/lsp-format.nvim", tag = "v2.5.1" }, { "nvim-tree/nvim-web-devicons", lazy = true }, "L3MON4D3/LuaSnip", "hrsh7th/cmp-cmdline", - "lewis6991/gitsigns.nvim", "neovim/nvim-lspconfig", "nvim-lualine/lualine.nvim", "onsails/lspkind.nvim",