wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 21:51:50 +02:00
Code Activity

Read per-user settings from ~/.config/nix/nix.conf

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-20 14:58:16 +02:00
parent 562585e901
commit f05d5f89ff
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
8 changed files with 70 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libutil/config.cc
View file

@ -9,6 +9,7 @@ void Config::set(const std::string & name, const std::string & value)
if (i == _settings.end())
throw UsageError("unknown setting '%s'", name);
i->second.setting->set(value);
i->second.setting->overriden = true;
}
void Config::addSetting(AbstractSetting * setting)
@ -22,6 +23,7 @@ void Config::addSetting(AbstractSetting * setting)
auto i = initials.find(setting->name);
if (i != initials.end()) {
setting->set(i->second);
setting->overriden = true;
initials.erase(i);
set = true;
}
@ -34,6 +36,7 @@ void Config::addSetting(AbstractSetting * setting)
alias, setting->name);
else {
setting->set(i->second);
setting->overriden = true;
initials.erase(i);
set = true;
}
@ -47,11 +50,11 @@ void Config::warnUnknownSettings()
warn("unknown setting '%s'", i.first);
}
StringMap Config::getSettings()
StringMap Config::getSettings(bool overridenOnly)
{
StringMap res;
for (auto & opt : _settings)
if (!opt.second.isAlias)
if (!opt.second.isAlias && (!overridenOnly || opt.second.setting->overriden))
res.emplace(opt.first, opt.second.setting->to_string());
return res;
}
@ -94,6 +97,12 @@ void Config::applyConfigFile(const Path & path, bool fatal)
} catch (SysError &) { }
}
void Config::resetOverriden()
{
for (auto & s : _settings)
s.second.setting->overriden = false;
}
AbstractSetting::AbstractSetting(
const std::string & name,
const std::string & description,