diff --git a/programs/jj/default.nix b/programs/jj/default.nix index 021c9fa..1947a1e 100644 --- a/programs/jj/default.nix +++ b/programs/jj/default.nix @@ -154,9 +154,7 @@ inputs@{ machine, ... }: "--from" "trunk()" ]; - next = [ "edit" "@+" ]; n = [ "edit" "@+" ]; - prev = [ "edit" "@-" ]; p = [ "edit" "@-" ]; gp = [ "git" "push" ]; diff --git a/programs/nvim/config.lua b/programs/nvim/config.lua index 557b088..8db77ea 100644 --- a/programs/nvim/config.lua +++ b/programs/nvim/config.lua @@ -111,8 +111,8 @@ vim.g.VM_mouse_mappings = 1 vim.g.VM_reselect_first = 1 vim.g.VM_notify_previously_selected = 1 vim.g.VM_theme = "iceblue" -vim.g.VM_maps["Undo"] = 'u' -vim.g.VM_maps["Redo"] = '' +-- vim.g.VM_maps["Undo"] = 'u' +-- vim.g.VM_maps["Redo"] = '' diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix index 915b743..9cc33d0 100644 --- a/programs/nvim/default.nix +++ b/programs/nvim/default.nix @@ -5,11 +5,10 @@ inputs@{ machine, ... }: inherit inputs; requirements = [ "cli" ]; home-config = - { - pkgs, - flakes, - lib, - ... + { pkgs + , flakes + , lib + , ... }: let nvim_mime_types = [ @@ -58,9 +57,11 @@ inputs@{ machine, ... }: }; xdg.mimeApps.associations.added = lib.mergeAttrsList ( - map (mime: { - ${mime} = [ "${desktop-entry-name}.desktop" ]; - }) nvim_mime_types + map + (mime: { + ${mime} = [ "${desktop-entry-name}.desktop" ]; + }) + nvim_mime_types ); imports = [