xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support specifying the user configuration with KAKOUNE_CONFIG_DIR

Browse Source 
Fixes #3072
Closes #3081
This commit is contained in:
Maxime Coste 2019-10-10 20:26:27 +11:00
parent f2fa260929
commit 081595fa2f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/kak.1
View File

@ -148,10 +148,11 @@ one or more \fIfile\fRs to edit
.PP .PP
At startup, if \fB\-n\fR is not specified, Kakoune will try to source the file At startup, if \fB\-n\fR is not specified, Kakoune will try to source the file
\fI../share/kak/kakrc\fR relative to the kak binary. This kak file will then \fI../share/kak/kakrc\fR relative to the kak binary. This kak file will then
try to recursively source any files in \fI$XDG_CONFIG_HOME/kak/autoload\fR try to recursively source any files in \fI$KAKOUNE_CONFIG_DIR/autoload\fR
(with \fI$XDG_CONFIG_HOME\fR defaulting to \fI$HOME/.config\fR, and falling back (with \fI$KAKOUNE_CONFIG_DIR\fR defaulting to \fI$XDG_CONFIG_HOME/kak\fR
to \fI../share/kak/autoload\fR if that autoload directory does not exist), if \fI$XDG_CONFIG_HOME\fR is set, \fI$HOME/.config/kak\fR if it is not,
and finally \fI$XDG_CONFIG_HOME/kak/kakrc\fR. and falling back to \fI../share/kak/autoload\fR if that autoload directory
does not exist), and finally \fI$XDG_CONFIG_HOME/kak/kakrc\fR.
That leads to the following behaviour: by default, with no user autoload That leads to the following behaviour: by default, with no user autoload
directory, the system wide autoload directory is used, once the user wants directory, the system wide autoload directory is used, once the user wants
@ -189,6 +190,16 @@ kak \-f "ggO// kak: tabstop=8<esc>" *.c
.RE .RE
.fi .fi
.SH ENVIRONMENT
.TP
.BR KAKOUNE_POSIX_SHELL
Overrides the posix shell binary path to use for \fI%sh{...}\fR expansion.
.TP
.BR KAKOUNE_CONFIG_DIR
Overrides the location of the directory containing kakoune user configuration.
.SH FILES .SH FILES
If not started with the \fB\-n\fR switch, Kakoune will source the \fI../share/kak/kakrc\fR file relative to the kak binary, If not started with the \fB\-n\fR switch, Kakoune will source the \fI../share/kak/kakrc\fR file relative to the kak binary,

7
src/main.cc
View File

@ -123,10 +123,11 @@ String runtime_directory()
String config_directory() String config_directory()
{ {
StringView config_home = getenv("XDG_CONFIG_HOME"); if (StringView kak_cfg_dir = getenv("KAKOUNE_CONFIG_DIR"); not kak_cfg_dir.empty())
if (config_home.empty()) return kak_cfg_dir.str();
if (StringView xdg_cfg_home = getenv("XDG_CONFIG_HOME"); not xdg_cfg_home.empty())
return format("{}/kak", xdg_cfg_home);
return format("{}/.config/kak", homedir()); return format("{}/.config/kak", homedir());
return format("{}/kak", config_home);
} }
static const EnvVarDesc builtin_env_vars[] = { { static const EnvVarDesc builtin_env_vars[] = { {