diff options
author | Kenny Ballou <kballou@devnulllabs.io> | 2020-05-14 00:34:00 -0600 |
---|---|---|
committer | Kenny Ballou <kballou@devnulllabs.io> | 2020-05-14 00:41:04 -0600 |
commit | aed469cfec71246de775b82c72f28825045d737f (patch) | |
tree | 7e6ee5dd36fddaceba935853d91d3dc1c41499a2 /phenex | |
parent | a197c85fed06afcb90a5daf77b2b9c15c988608c (diff) | |
download | cfg.nix-aed469cfec71246de775b82c72f28825045d737f.tar.gz cfg.nix-aed469cfec71246de775b82c72f28825045d737f.tar.xz |
move gnupg and mtr configuration into `programs`
The configurations for these applications was done in the root file for
each machine. This led to issues where each machine had different
behaviour, specifically, when it came to changes in GnuPG were
introduced after upgrading to 20.03. By moving these common
configurations into a separate file, each machine can be sure to have
similar configurations.
Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
Diffstat (limited to 'phenex')
-rw-r--r-- | phenex/configuration.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phenex/configuration.nix b/phenex/configuration.nix index d774ab0..bd5fe0c 100644 --- a/phenex/configuration.nix +++ b/phenex/configuration.nix @@ -34,6 +34,8 @@ ../system/users.nix ../system/wireshark.nix ../system/yubikey-gpg.nix + ../programs/mtr.nix + ../programs/gnupg.nix ]; # Use the GRUB 2 boot loader. @@ -50,11 +52,6 @@ networking.hostName = "phenex"; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - programs.mtr.enable = true; - programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; - # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you |