diff --git a/lazy-lock.json b/lazy-lock.json index a44d952..e0e3ed8 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,9 +9,9 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "floatty.nvim": { "branch": "main", "commit": "4867cdaa58316cfb663523c164b33b520b1b954a" }, "flutter-tools.nvim": { "branch": "main", "commit": "65b7399804315a1160933b64292d3c5330aa4e9f" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fugit2.nvim": { "branch": "main", "commit": "48ceeb550a517e8fd28de4f72a313940a4777a71" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -19,11 +19,9 @@ "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" }, "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "b0caeef0d835fbe19df6ad71dbc4345eaaea649c" }, - "nvim-tinygit": { "branch": "main", "commit": "a8832a2a889e82efe59b7af569795dc0ae657a5a" }, "nvim-tree.lua": { "branch": "master", "commit": "f0e9951778802526b14c934f7bf746e1e0ae5ed0" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, diff --git a/lua/mappings.lua b/lua/mappings.lua index ff29df1..9f10cc4 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,4 +1,5 @@ require "nvchad.mappings" +local term = require("floatty").setup {} local map = vim.keymap.set @@ -8,4 +9,13 @@ map("n", ";", ":", { desc = "CMD enter command mode" }) -- i then j&k to escape map("i", "jk", "") +-- see code actions map("n", "a", "Lspsaga code_action", { desc = "Display code actions" }) + +-- toogle terminal +map("n", "", function() + term.toggle() +end) +map("t", "", function() + term.toggle() +end) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 3353628..38b3772 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -53,62 +53,6 @@ return { "nvim-treesitter/nvim-treesitter", -- optional "nvim-tree/nvim-web-devicons", -- optional }, - - -- beautiful git - { - "SuperBo/fugit2.nvim", - build = false, - opts = { - width = 100, - }, - dependencies = { - "MunifTanjim/nui.nvim", - "nvim-tree/nvim-web-devicons", - "nvim-lua/plenary.nvim", - { - "chrisgrieser/nvim-tinygit", -- optional: for Github PR view - dependencies = { "stevearc/dressing.nvim" }, - }, - }, - cmd = { "Fugit2", "Fugit2Diff", "Fugit2Graph" }, - keys = { - { "F", mode = "n", "Fugit2" }, - }, - }, }, - - -- Beautiful indent helpers - -- { - -- "lukas-reineke/indent-blankline.nvim", - -- version = false, - -- config = function(_, opts) - -- local highlight = { - -- "RainbowRed", - -- "RainbowYellow", - -- "RainbowBlue", - -- "RainbowOrange", - -- "RainbowGreen", - -- "RainbowViolet", - -- "RainbowCyan", - -- } - -- - -- local hooks = require "ibl.hooks" - -- -- 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" }) - -- end) - -- - -- require("ibl").setup { - -- indent = { highlight = highlight }, - -- scope = { enabled = true, show_start = true, highlight = highlight }, - -- } - -- end, - -- }, + { "ingur/floatty.nvim" }, }