Changes for plugins as well as adding some to nvim. Changed the gitconfig so now it signs commits with the gpg key

2023-09-12 13:41:45 +02:00 · 2023-09-12 13:41:45 +02:00 · c8ae4279df
commit c8ae4279df
parent 6785775ddf
7 changed files with 94 additions and 21 deletions
--- a/.config/fish/variables.fish
+++ b/.config/fish/variables.fish
@ -34,6 +34,7 @@ set -xg EDITOR nvim
 set -xg VISUAL $EDITOR
 set -xg SUDO_EDITOR $EDITOR

+set -xg GPG_TTY (tty)
 set -xg LANG es_ES.UTF-8
 set -xg LC_ALL es_ES.UTF-8

--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@ -1,13 +1,13 @@
 {
  "LazyVim": { "branch": "main", "commit": "a72a84972d85e5bbc6b9d60a0983b37efef21b8a" },
  "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "c0874b9eb5e9aecd27e122ebfe7490516ac02bd3" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "1709539a95c37dd2ed3a85b9b424f45d74775236" },
  "alpha-nvim": { "branch": "main", "commit": "712dc1dccd4fd515ef8bd126b3718f79d3e23b0d" },
  "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
  "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
  "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
  "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" },
-  "catppuccin": { "branch": "main", "commit": "a937d546f4783a1ff67f84043d2d7871ad4ecd83" },
+  "catppuccin": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
@ -16,14 +16,15 @@
  "compiler.nvim": { "branch": "main", "commit": "7c8bb1faf3adf7a77f0fc28aad4adc6a846f7979" },
  "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
  "copilot.lua": { "branch": "master", "commit": "2c942f33ba5c621c906e625e00a1bb504b65e2f0" },
-  "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" },
+  "crates.nvim": { "branch": "main", "commit": "db629b5cfb2aa8de9e44efb795657297ee95ca91" },
  "dial.nvim": { "branch": "master", "commit": "611cf5e84f655c96318b803785f89e3146d8e48f" },
  "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" },
  "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
  "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" },
  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
-  "gitsigns.nvim": { "branch": "main", "commit": "fef5d90953f0a730483b44745fae5938ba8227f8" },
+  "gitsigns.nvim": { "branch": "main", "commit": "907ae8636016aab2f283576fc60d46ca3427e579" },
  "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" },
+  "hardtime.nvim": { "branch": "main", "commit": "370dea43c353c57bd2c9c985f43812b0634adb7b" },
  "highlight-undo.nvim": { "branch": "main", "commit": "d9e674a2eb4d95ee16cd477d47eab7ddc586e336" },
  "hydra.nvim": { "branch": "master", "commit": "ceb1fb7e3b4916676674e8a4253deea5a19ab01f" },
  "import-cost.nvim": { "branch": "main", "commit": "d2c93deee35fa4042fde28719ddcbad664544fcf" },
@ -31,9 +32,9 @@
  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "20fd7f50f34b59031a7c3bbc2c207f4f60037628" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "01b4b6724ebcf5b43fc021486f6a260f1d09311e" },
  "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" },
-  "mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" },
+  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
  "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
  "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" },
  "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" },
@ -43,13 +44,13 @@
  "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
  "multicursors.nvim": { "branch": "main", "commit": "1c97c10778804b9a57465663bc7082b751b5db4f" },
  "neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" },
-  "neoconf.nvim": { "branch": "main", "commit": "4a344462d45a08e81b19aa3d63d2bfe06404eec0" },
-  "neodev.nvim": { "branch": "main", "commit": "f0e574687aa51c513017155f003e8e8950ec6ff4" },
+  "neoconf.nvim": { "branch": "main", "commit": "ebd2f07743796e6bcd3c147f02a22ede2c69b33a" },
+  "neodev.nvim": { "branch": "main", "commit": "1c796d3240c1fe6f0e1228fc7ef2ae4cef31dfea" },
  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
  "neotest": { "branch": "master", "commit": "1e67a504d03def3a6a1125d934cb511680f72555" },
  "neotest-go": { "branch": "main", "commit": "1a15e1136db43775214a3e7a598f8930c29c94b7" },
  "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" },
-  "neotest-rust": { "branch": "main", "commit": "dd49d0de3a4ccde0c8ce99dbae9e7b04bcdbfc85" },
+  "neotest-rust": { "branch": "main", "commit": "a9cd2ed69d6930a33bd97765fee49b0e13d7d7d0" },
  "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" },
  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
@ -60,23 +61,23 @@
  "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
  "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d177ad277a638f262edb73c75ffe33e377b95dc5" },
+  "nvim-lspconfig": { "branch": "master", "commit": "360a895125ac4f39df6aa8f763635eff07e69fff" },
  "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" },
  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
  "nvim-numbertoggle": { "branch": "main", "commit": "50fef7e421a27294e834084625ad0dd8cffee72c" },
  "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
  "nvim-scrollview": { "branch": "main", "commit": "b0737d036cfbb39e066d144702197eda0a4b6cf1" },
-  "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" },
-  "nvim-treesitter": { "branch": "master", "commit": "96a50241987531fdb8a516998b72c19f563ccd6c" },
+  "nvim-spectre": { "branch": "master", "commit": "657e012ff05d4eaddbdea646f6479b8023b4bcee" },
+  "nvim-treesitter": { "branch": "master", "commit": "0ba881b7a2af0e24962e4522cf15ebd642261a90" },
  "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
  "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "ecdeb4e2a4af34fc873bbfbf1f4c4e447e632255" },
-  "overseer.nvim": { "branch": "master", "commit": "c6ec203ddbdfe352e54cbc577f5db911dbb7db55" },
+  "nvim-web-devicons": { "branch": "master", "commit": "925e2aa30dc9fe9332060199c19f132ec0f3d493" },
+  "overseer.nvim": { "branch": "master", "commit": "ed67e917b9dbb431b435d7380f0c4c94e767b229" },
  "package-info.nvim": { "branch": "master", "commit": "4d98c8cc90d970d87c472c04bf7ca712336cc753" },
  "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
-  "plenary.nvim": { "branch": "master", "commit": "0232372b906f275f76ac42029eba25eaf95e76b9" },
+  "plenary.nvim": { "branch": "master", "commit": "4cd4c29e39dd02efd906f98c03d2879237f50956" },
  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
  "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
  "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" },
@ -99,11 +100,11 @@
  "venv-selector.nvim": { "branch": "main", "commit": "14d6e866070f759e9014a8053954f835294f56f9" },
  "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" },
  "vim-floaterm": { "branch": "master", "commit": "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd" },
-  "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" },
+  "vim-illuminate": { "branch": "master", "commit": "8c910b2f84ae6acd9b4b17330bb94dd783c0c11a" },
  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
  "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" },
  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
  "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" },
-  "yanky.nvim": { "branch": "main", "commit": "ef70e4e44095a17ab8611cb6630b727ccee0a271" },
+  "yanky.nvim": { "branch": "main", "commit": "4c85d8d6808d9859e72f8bd6c25302199e6a5eac" },
  "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" }
 }
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@ -84,7 +84,7 @@ map(
 map("n", "<A-Left>", "FloatermPrev<CR>", { desc = "Previous Terminal" })
 map("n", "<A-Right>", "FloatermNext<CR>", { desc = "Next Terminal" })
 map("n", "<c-Return>", ":FloatermToggle<CR>", { desc = "Toggle Terminal" })
-map("n", "<c-/>", ":FloatermToggle<CR>", { desc = "Toggle Terminal" })
+map("t", "<C-Return>", "<C-\\><C-n><C-\\><C-n>:FloatermToggle<CR>", { desc = "Toggle Terminal", nowait = true })

 vim.keymap.set("n", "<leader>gU", vim.cmd.UndotreeToggle, { noremap = true, silent = true, desc = "Toggle Undotree" })

--- a/.config/nvim/lua/plugins/hardtime.lua.bak
+++ b/.config/nvim/lua/plugins/hardtime.lua.bak
@ -3,7 +3,37 @@ return {
        "m4xshen/hardtime.nvim",
        dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" },
        opts = {
-            disabled_filetypes = { "qf", "netrw", "NvimTree", "lazy", "mason", "oil", "nerd-tree" },
+            disabled_filetypes = {
+                "qf",
+                "netrw",
+                "NvimTree",
+                "lazy",
+                "mason",
+                "oil",
+                "neo-tree",
+                "floaterm",
+                "symbols-outline",
+                "vim-be-good",
+            },
+            disable_mouse = false,
+            restricted_keys = {
+                ["h"] = { "n", "x" },
+                ["j"] = { "n", "x" },
+                ["-"] = { "n", "x" },
+                ["+"] = { "n", "x" },
+                ["gj"] = { "n", "x" },
+                ["gk"] = { "n", "x" },
+                ["<CR>"] = { "n", "x" },
+                ["<C-M>"] = { "n", "x" },
+                ["<C-N>"] = { "n", "x" },
+                ["<C-P>"] = { "n", "x" },
+            },
+            disabled_keys = {
+                ["<Up>"] = { "n" },
+                ["<Down>"] = { "n" },
+                ["<Left>"] = { "n" },
+                ["<Right>"] = { "n" },
+            },
        },
    },
 }
--- a/.config/nvim/lua/plugins/multicursor.lua
+++ b/.config/nvim/lua/plugins/multicursor.lua
@ -14,5 +14,6 @@ return {
                desc = "Create a selection for selected text or word under the cursor",
            },
        },
+        config = true,
    },
 }
--- a/.config/nvim/lua/plugins/toggleterm.lua.bak
+++ b/.config/nvim/lua/plugins/toggleterm.lua.bak
@ -0,0 +1,38 @@
+return {
+    {
+        "akinsho/nvim-toggleterm.lua",
+        cmd = "ToggleTerm",
+        opts = {
+            -- size can be a number or function which is passed the current terminal
+            size = 20,
+            open_mapping = [[<c-return>]],
+            hide_numbers = true, -- hide the number column in toggleterm buffers
+            shade_filetypes = {},
+            start_in_insert = true,
+            insert_mappings = true, -- whether or not the open mapping applies in insert mode
+            persist_size = true,
+            persist_mode = true, -- if set to true (default) the previous terminal mode will be remembered
+            direction = "float",
+            close_on_exit = true, -- close the terminal window when the process exits
+            shell = "/bin/fish", -- change the default shell
+            auto_scroll = true, -- automatically scroll to the bottom on terminal output
+            -- This field is only relevant if direction is set to 'float'
+            float_opts = {
+                -- The border key is *almost* the same as 'nvim_win_open'
+                -- see :h nvim_win_open for details on borders however
+                -- the 'curved' border is a custom border type
+                -- not natively supported but implemented in this plugin.
+                -- border = 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
+                border = "curved",
+                -- width = <value>,
+                -- height = <value>,
+                winblend = 3,
+                highlights = { border = "Normal", background = "Normal" },
+            },
+        },
+        keys = {
+            { "<c-Return>", "<cmd>ToggleTerm<CR>", mode = "n", desc = "Toggle terminal" },
+            { "<c-Return>", "<C-\\><C-n><C-\\><C-n>:FloatermToggle<CR>", mode = "t", desc = "Toggle terminal" },
+        },
+    },
+}
--- a/.gitconfig
+++ b/.gitconfig
@ -1,7 +1,7 @@
 [user]
    name = Sergio Laín
 	email = sergiolain11@gmail.com
-	signingkey = .ssh/id_ed25519.pub
+	signingKey = 14C9B8080681777B
 [safe]
 	directory = Repos/
 [credential "https://github.com"]
@ -29,5 +29,7 @@
    blame = diff-so-fancy | less --tabs=4 -RFX
 [diff]
    colorMoved = default
+[commit]
+	gpgsign = true
 [gpg]
-	format = ssh
+	program = /sbin/gpg