meta: Merge nix and systemd modules with system

These are simple enough configurations that have benefits across many
different systems.
This commit is contained in:
Donovan Glover 2024-04-03 08:05:28 -04:00
parent 85ead9e779
commit 13d98c2c9f
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 20 additions and 19 deletions

View File

@ -1,13 +0,0 @@
{ pkgs, ... }:
{
nix = {
package = with pkgs.nixVersions; nix_2_19;
settings = {
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
auto-optimise-store = true;
warn-dirty = false;
};
};
}

View File

@ -1,3 +1,8 @@
{ pkgs, ... }:
let
inherit (pkgs.nixVersions) nix_2_19;
in
{
boot.loader = {
systemd-boot = {
@ -10,6 +15,21 @@
efi.canTouchEfiVariables = true;
};
systemd = {
extraConfig = "DefaultTimeoutStopSec=10s";
services.NetworkManager-wait-online.enable = false;
};
nix = {
package = nix_2_19;
settings = {
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
auto-optimise-store = true;
warn-dirty = false;
};
};
time.timeZone = "America/New_York";
i18n.defaultLocale = "ja_JP.UTF-8";

View File

@ -1,6 +0,0 @@
{
systemd = {
extraConfig = "DefaultTimeoutStopSec=10s";
services.NetworkManager-wait-online.enable = false;
};
}