From c9430d3b5e09e671294f8689028d9ce3b55bbc0b Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Tue, 7 Feb 2023 15:18:46 -0500
Subject: [PATCH 1/2] Adding marks and bbq to nvim

---
 init.lua | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/init.lua b/init.lua
index f2ea703..c0bf9d6 100644
--- a/init.lua
+++ b/init.lua
@@ -303,6 +303,25 @@ require('packer').startup(function(use)
     end
   })
 
+  use({
+    "chentoast/marks.nvim",
+    config = function()
+      require("marks").setup()
+    end
+  })
+
+  use({
+    "utilyre/barbecue.nvim",
+    tag = "*",
+    requires = {
+      "SmiteshP/nvim-navic",
+      "nvim-tree/nvim-web-devicons",
+    },
+    config = function()
+      require("barbecue").setup()
+    end,
+  })
+
   if packer_bootstrap then
     require('packer').sync()
   end
@@ -367,7 +386,7 @@ wk.register({
       f = { "<CMD>SearchReplaceSingleBufferCFile<CR>", "file" },
       b = {
         name = "MultiBuffer",
-        s = { "<CMD>SearchReplaceMultiBufferSelections<CR>","selction list" },
+        s = { "<CMD>SearchReplaceMultiBufferSelections<CR>", "selction list" },
         o = { "<CMD>SearchReplaceMultiBufferOpen<CR>", "open" },
         w = { "<CMD>SearchReplaceMultiBufferCWord<CR>", "word" },
         W = { "<CMD>SearchReplaceMultiBufferCWORD<CR>", "WORD" },

From 89d34c7be90b7a6b91de0bec7296e6f37a54fa40 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Thu, 9 Feb 2023 14:45:08 -0500
Subject: [PATCH 2/2] Using the new extraluaconfig stuff for neovim in
 home-manager

---
 home-cli.nix        | 7 +------
 init.lua => vim.lua | 0
 2 files changed, 1 insertion(+), 6 deletions(-)
 rename init.lua => vim.lua (100%)

diff --git a/home-cli.nix b/home-cli.nix
index 5ce3029..a9bc0a2 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -16,7 +16,6 @@ in
     ghc haskell-language-server hlint haskellPackages.hoogle
     lua53Packages.luarocks
     ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es
-    fontconfig iosevka iosevka-bin
   ];
 
   home.sessionVariables = {
@@ -234,11 +233,7 @@ in
     withNodeJs = true;
     withPython3 = true;
     withRuby = true;
-  };
-
-  home.file.nvim = {
-    target = ".config/nvim/init.lua";
-    source = ./init.lua;
+    extraLuaConfig = builtins.readFile ./vim.lua;
   };
 
   programs.bat = {
diff --git a/init.lua b/vim.lua
similarity index 100%
rename from init.lua
rename to vim.lua