diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2015-07-18 23:32:48 +0100 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2015-07-18 23:32:48 +0100 |
| commit | c0f14fe69584bf9e2c8ef8aefacbd820e55ed7a7 (patch) | |
| tree | 82fe09828fba4c6200accf0b0572f58dfb73f460 /share | |
| parent | d4525f70943d8720173d47b50c3b5d0ae3e88e75 (diff) | |
| parent | af5386d8bda1103fcee7b7aaa6ea8ab68b101ff5 (diff) | |
Merge remote-tracking branch 'ekie/load_color_userspace'
Diffstat (limited to 'share')
| -rw-r--r-- | share/kak/kakrc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/share/kak/kakrc b/share/kak/kakrc index beccc284..3e91e3d5 100644 --- a/share/kak/kakrc +++ b/share/kak/kakrc @@ -34,14 +34,20 @@ def -shell-params -docstring "colorscheme <name>: enable named colorscheme" \ -shell-completion %{ prefix=${1:0:${kak_pos_in_token}} ( - for col in ${kak_runtime}/colors/*.kak; do + localconfdir=${XDG_CONFIG_HOME:-${HOME}/.config}/kak + for col in ${kak_runtime}/colors/*.kak ${localconfdir}/colors/*.kak; do expr $(basename "${col}" .kak) : "^\(${prefix}.*\)$" done - ) | grep -v '^$' + ) | sort -u | grep -v '^$' } \ colorscheme %{ %sh{ + localconfdir=${XDG_CONFIG_HOME:-${HOME}/.config}/kak if [ $# -eq 1 ]; then - echo "source '${kak_runtime}/colors/$1.kak'" + if [ -f "${localconfdir}/colors/$1.kak" ];then + echo "source '${localconfdir}/colors/$1.kak'" + else + echo "source '${kak_runtime}/colors/$1.kak'" + fi else echo -color Error 'Usage: colorscheme <scheme name>' fi @@ -60,12 +66,7 @@ def -shell-params -docstring "colorscheme <name>: enable named colorscheme" \ done } - if [ -n "${XDG_CONFIG_HOME}" ]; then - localconfdir="${XDG_CONFIG_HOME}/kak" - else - localconfdir="$HOME/.config/kak" - fi - + localconfdir=${XDG_CONFIG_HOME:-${HOME}/.config}/kak if [ -d "${localconfdir}/autoload" ]; then autoload ${localconfdir}/autoload elif [ -d "${kak_runtime}/autoload" ]; then |