mirror of
https://github.com/donovanglover/nix-config.git
synced 2025-01-10 16:08:45 +01:00
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:
parent
85ead9e779
commit
13d98c2c9f
@ -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;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,3 +1,8 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (pkgs.nixVersions) nix_2_19;
|
||||||
|
in
|
||||||
{
|
{
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
systemd-boot = {
|
systemd-boot = {
|
||||||
@ -10,6 +15,21 @@
|
|||||||
efi.canTouchEfiVariables = true;
|
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";
|
time.timeZone = "America/New_York";
|
||||||
|
|
||||||
i18n.defaultLocale = "ja_JP.UTF-8";
|
i18n.defaultLocale = "ja_JP.UTF-8";
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
systemd = {
|
|
||||||
extraConfig = "DefaultTimeoutStopSec=10s";
|
|
||||||
services.NetworkManager-wait-online.enable = false;
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user