refactor(nix): extract common system configs into reusable modules
Create 6 new NixOS modules to reduce duplication across system configs: - hardware/wooting: Wooting keyboard udev rules and Bluetooth compat - services/nginx-base: Common nginx server settings - services/acme-base: ACME certificate defaults - services/xremap: Key remapping with sensible defaults - system/no-sleep: Disable sleep/suspend/hibernate targets - system/kernel-tweaks: PM freeze timeout and zram configuration Update system configuration files to use these new modules. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
ea849f2488
commit
4622c52d5b
21 changed files with 310 additions and 218 deletions
41
modules/nixos/services/acme-base/default.nix
Normal file
41
modules/nixos/services/acme-base/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.metacfg;
|
||||
let
|
||||
cfg = config.metacfg.services.acmeBase;
|
||||
in
|
||||
{
|
||||
options.metacfg.services.acmeBase = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable ACME with common settings.";
|
||||
email = mkOption {
|
||||
type = types.str;
|
||||
default = "harald@hoyer.xyz";
|
||||
description = "Registration email for ACME.";
|
||||
};
|
||||
dnsProvider = mkOption {
|
||||
type = types.str;
|
||||
default = "cloudflare";
|
||||
description = "DNS provider for ACME DNS-01 challenge.";
|
||||
};
|
||||
credentialsFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = "Path to the credentials file for the DNS provider.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults = {
|
||||
email = cfg.email;
|
||||
dnsProvider = cfg.dnsProvider;
|
||||
credentialsFile = mkIf (cfg.credentialsFile != null) cfg.credentialsFile;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
42
modules/nixos/services/nginx-base/default.nix
Normal file
42
modules/nixos/services/nginx-base/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.metacfg;
|
||||
let
|
||||
cfg = config.metacfg.services.nginxBase;
|
||||
in
|
||||
{
|
||||
options.metacfg.services.nginxBase = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable nginx with common settings.";
|
||||
clientMaxBodySize = mkOption {
|
||||
type = types.str;
|
||||
default = "1000M";
|
||||
description = "Maximum allowed size of the client request body.";
|
||||
};
|
||||
enableAcmeGroup = mkBoolOpt true "Add nginx user to acme group.";
|
||||
enableVcombinedLog = mkBoolOpt true "Enable vcombined log format.";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.nginx.extraGroups = mkIf cfg.enableAcmeGroup [ "acme" ];
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
clientMaxBodySize = cfg.clientMaxBodySize;
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
appendHttpConfig = mkIf cfg.enableVcombinedLog ''
|
||||
log_format vcombined '$host:$server_port '
|
||||
'$remote_addr - $remote_user [$time_local] '
|
||||
'"$request" $status $body_bytes_sent '
|
||||
'"$http_referer" "$http_user_agent"';
|
||||
access_log /var/log/nginx/access.log vcombined;
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
44
modules/nixos/services/xremap/default.nix
Normal file
44
modules/nixos/services/xremap/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.metacfg;
|
||||
let
|
||||
cfg = config.metacfg.services.xremap;
|
||||
in
|
||||
{
|
||||
options.metacfg.services.xremap = with types; {
|
||||
enable = mkBoolOpt false "Whether or not to enable xremap key remapping.";
|
||||
userName = mkOption {
|
||||
type = types.str;
|
||||
default = "harald";
|
||||
description = "User to run xremap as.";
|
||||
};
|
||||
withGnome = mkBoolOpt true "Enable GNOME support.";
|
||||
deviceNames = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = "List of device names to remap.";
|
||||
};
|
||||
config = mkOption {
|
||||
type = types.attrs;
|
||||
default = { };
|
||||
description = "Xremap configuration.";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
services.xremap = {
|
||||
enable = cfg.enable;
|
||||
userName = mkIf cfg.enable cfg.userName;
|
||||
serviceMode = mkIf cfg.enable "user";
|
||||
withGnome = mkIf cfg.enable cfg.withGnome;
|
||||
deviceNames = mkIf cfg.enable cfg.deviceNames;
|
||||
config = mkIf cfg.enable cfg.config;
|
||||
};
|
||||
|
||||
users.users.${cfg.userName}.extraGroups = mkIf cfg.enable [ "input" ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue