Move several options to a ‘defaults’ file

This commit is contained in:
fruchti 2023-02-26 19:59:32 +01:00
parent eb112a9654
commit 214aadd33d
4 changed files with 15 additions and 8 deletions

View file

@ -1,6 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./defaults.nix
./xkb ./xkb
./neovim.nix ./neovim.nix
./packages.nix ./packages.nix

14
base/defaults.nix Normal file
View file

@ -0,0 +1,14 @@
{ lib, ... }:
with lib;
{
i18n.defaultLocale = mkDefault "en_GB.UTF-8";
console.keyMap = mkDefault "de";
services.openssh.enable = mkDefault true;
services.openssh.passwordAuthentication = mkDefault false;
nix.gc = mkDefault {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
};
}

View file

@ -2,9 +2,7 @@
{ {
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_GB.UTF-8";
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
keyMap = "de";
}; };
} }

View file

@ -88,12 +88,6 @@ in
system.autoUpgrade.sendEmail = true; system.autoUpgrade.sendEmail = true;
# systemd.services.nixos-upgrade.onFailure = lib.mkIf config.system.autoUpgrade.enable [ "status-email@%n.service" ]; # systemd.services.nixos-upgrade.onFailure = lib.mkIf config.system.autoUpgrade.enable [ "status-email@%n.service" ];
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
};
services.btrfsScrub = { services.btrfsScrub = {
enable = true; enable = true;
paths = { paths = {