From 96b96b3c412478377d5689685266e1f70f108a16 Mon Sep 17 00:00:00 2001
From: undrpaidtekmnky <bfoster@overmorrowtechsolutions.ca>
Date: Wed, 4 Dec 2024 01:38:02 -0700
Subject: [PATCH] Merge Branches

---
 lazy-lock.json                 |  7 ++++
 lua/plugins/lualine-nvim.lua   |  4 ++
 lua/plugins/macrothis-nvim.lua | 76 ++++++++++++++++++++++++++++++++++
 lua/plugins/mini-nvim.lua      |  4 ++
 4 files changed, 91 insertions(+)
 create mode 100644 lua/plugins/lualine-nvim.lua
 create mode 100644 lua/plugins/macrothis-nvim.lua
 create mode 100644 lua/plugins/mini-nvim.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index bb04f1f..ae65c9d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -17,11 +17,14 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
   "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
   "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "macrothis.nvim": { "branch": "main", "commit": "3fe6af86ce9eb509737f7955007c58dec96eb02b" },
   "mason-conform.nvim": { "branch": "main", "commit": "abce2be529f3b4b336c56d0ba6336a9144e0fee6" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
   "mason-nvim-lint": { "branch": "main", "commit": "910dadb99cb2bf0d5176026c7a4ab1861c4e561f" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "menu": { "branch": "main", "commit": "657bfc91382c0928453d9a4d0a10ec92db5de2bb" },
+  "mini.nvim": { "branch": "main", "commit": "64e95aa77587d04f97a5579b2106a82a08a7d968" },
   "mini.pick": { "branch": "main", "commit": "75e9a0a7808aa772ca5e31d479ffd0280ab6bf74" },
   "minty": { "branch": "main", "commit": "6dce9f097667862537823d515a0250ce58faab05" },
   "neogit": { "branch": "master", "commit": "446197d90d179d579fa9c6970d4f98d494a2090b" },
@@ -30,7 +33,11 @@
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
   "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
   "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" },
+<<<<<<< HEAD
   "nvim-lspconfig": { "branch": "master", "commit": "f59eba2ec08edda0e09ecf34ec29ad10a429e48d" },
+=======
+  "nvim-lspconfig": { "branch": "master", "commit": "627905ef6aabd99b31f369c33cd802a73144479c" },
+>>>>>>> refs/remotes/origin/master
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" },
   "nvim-treesitter": { "branch": "master", "commit": "69170c93149ddb71a22bd954514806395c430c02" },
diff --git a/lua/plugins/lualine-nvim.lua b/lua/plugins/lualine-nvim.lua
new file mode 100644
index 0000000..7c6877b
--- /dev/null
+++ b/lua/plugins/lualine-nvim.lua
@@ -0,0 +1,4 @@
+return {
+    "nvim-lualine/lualine.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+}
diff --git a/lua/plugins/macrothis-nvim.lua b/lua/plugins/macrothis-nvim.lua
new file mode 100644
index 0000000..d3e7328
--- /dev/null
+++ b/lua/plugins/macrothis-nvim.lua
@@ -0,0 +1,76 @@
+return {
+    "desdic/macrothis.nvim",
+    opts = {},
+    keys = {
+        {
+            "<Leader>kkd",
+            function()
+                require("macrothis").delete()
+            end,
+            desc = "delete",
+        },
+        {
+            "<Leader>kke",
+            function()
+                require("macrothis").edit()
+            end,
+            desc = "edit",
+        },
+        {
+            "<Leader>kkl",
+            function()
+                require("macrothis").load()
+            end,
+            desc = "load",
+        },
+        {
+            "<Leader>kkn",
+            function()
+                require("macrothis").rename()
+            end,
+            desc = "rename",
+        },
+        {
+            "<Leader>kkq",
+            function()
+                require("macrothis").quickfix()
+            end,
+            desc = "run macro on all files in quickfix",
+        },
+        {
+            "<Leader>kkr",
+            function()
+                require("macrothis").run()
+            end,
+            desc = "run macro",
+        },
+        {
+            "<Leader>kks",
+            function()
+                require("macrothis").save()
+            end,
+            desc = "save",
+        },
+        {
+            "<Leader>kkx",
+            function()
+                require("macrothis").register()
+            end,
+            desc = "edit register",
+        },
+        {
+            "<Leader>kkp",
+            function()
+                require("macrothis").copy_register_printable()
+            end,
+            desc = "Copy register as printable",
+        },
+        {
+            "<Leader>kkm",
+            function()
+                require("macrothis").copy_macro_printable()
+            end,
+            desc = "Copy macro as printable",
+        },
+    },
+}
diff --git a/lua/plugins/mini-nvim.lua b/lua/plugins/mini-nvim.lua
new file mode 100644
index 0000000..b1c8da1
--- /dev/null
+++ b/lua/plugins/mini-nvim.lua
@@ -0,0 +1,4 @@
+return {
+    "echasnovski/mini.nvim",
+    version = "*",
+}