From 6368b95dcd082f7e23cb7bb23c559c6e89ab623e Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 17 Dec 2019 18:00:31 -0700 Subject: [PATCH] develop#kakoune: fix binary conflict --- profiles/develop/default.nix | 4 ++-- profiles/develop/kakoune/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/profiles/develop/default.nix b/profiles/develop/default.nix index 840456f0..b7751eb4 100644 --- a/profiles/develop/default.nix +++ b/profiles/develop/default.nix @@ -14,8 +14,8 @@ PAGER = "less"; LESS = "-iFJMRWX -z-4 -x4"; LESSOPEN = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; - EDITOR = "kak"; - VISUAL = "kak"; + EDITOR = "k"; + VISUAL = "k"; }; environment.systemPackages = with pkgs; [ diff --git a/profiles/develop/kakoune/default.nix b/profiles/develop/kakoune/default.nix index 097561d9..338aa9c6 100644 --- a/profiles/develop/kakoune/default.nix +++ b/profiles/develop/kakoune/default.nix @@ -29,7 +29,7 @@ ]; }; - kakoune-config = super.writeShellScriptBin "kak" '' + kakoune-config = super.writeShellScriptBin "k" '' XDG_CONFIG_HOME=/etc/xdg ${self.kakoune}/bin/kak "$@" '';