Merge branch 'master' of git.dustinswan.com:dustinswan/dotfiles

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 = {
@@ -237,11 +236,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 = {

vim.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" },