diff --git a/hosts/common.nix b/hosts/common.nix index a886392..e50cd98 100644 --- a/hosts/common.nix +++ b/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; diff --git a/modules/neovim/lua/keybinds.lua b/modules/neovim/lua/keybinds.lua index ea8f6c2..e405bd1 100644 --- a/modules/neovim/lua/keybinds.lua +++ b/modules/neovim/lua/keybinds.lua @@ -75,3 +75,4 @@ key("n", "", ":noh", { silent = true }) --- Clear search in VimWiki key("n", "Y", "y$") --- Copy to end of line key("v", "", "y:%s/+//gc") --- Substitute selected key("v", "D", "y'>gp") --- Duplicate selected +key("x", "p", '"_dP') --- Paste but keep register diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 4e77837..4b402c3 100644 --- a/modules/shell/git.nix +++ b/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; };