tweaks to vim paste and git

hosts/common.nix

@@ -72,6 +72,7 @@
     home-manager.useUserPackages = true;
 
     # Allow specified unfree packages (identified elsewhere)
+    # Retrieves package object based on string name
     nixpkgs.config.allowUnfreePredicate = pkg:
       builtins.elem (lib.getName pkg) config.unfreePackages;
 

modules/neovim/lua/keybinds.lua

@@ -75,3 +75,4 @@ key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
 key("n", "Y", "y$") --- Copy to end of line
 key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
 key("v", "D", "y'>gp") --- Duplicate selected
+key("x", "<Leader>p", '"_dP') --- Paste but keep register

modules/shell/git.nix

@@ -67,6 +67,9 @@ in {
         cdg = "cd (git rev-parse --show-toplevel)";
       };
 
+      # Required for fish commands
+      home.packages = with pkgs; [ fish fzf bat ];
+
       programs.fish.functions = lib.mkIf (builtins.elem pkgs.fzf home-packages
         && builtins.elem pkgs.bat home-packages) {
           git = { body = builtins.readFile ./fish/functions/git.fish; };