diff --git a/flake.nix b/flake.nix
index cdbf385..c75e4fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,8 @@
};
- outputs = inputs:
+ outputs =
+ inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
imports = [
./modules/flake/parts.nix
diff --git a/modules/flake/lib.nix b/modules/flake/lib.nix
index c928009..5d1a1a7 100644
--- a/modules/flake/lib.nix
+++ b/modules/flake/lib.nix
@@ -8,33 +8,39 @@ let
hasDotfilesHome = builtins.pathExists dotfilesHome;
in
{
- mkHost = {
- nixpkgs,
- disko,
- lolcat,
- nixosModules,
- hostModules ? [ ],
- }:
+ mkHost =
+ {
+ nixpkgs,
+ disko,
+ lolcat,
+ nixosModules,
+ hostModules ? [ ],
+ }:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
- inputs = inputs // { "lolcat++" = lolcat; };
+ inputs = inputs // {
+ "lolcat++" = lolcat;
+ };
inherit nixosModules;
};
modules = [ disko.nixosModules.disko ] ++ hostModules;
};
- mkDesktopHost = {
- nixpkgs,
- disko,
- lolcat,
- nixosModules,
- hostModules ? [ ],
- }:
+ mkDesktopHost =
+ {
+ nixpkgs,
+ disko,
+ lolcat,
+ nixosModules,
+ hostModules ? [ ],
+ }:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
- inputs = inputs // { "lolcat++" = lolcat; };
+ inputs = inputs // {
+ "lolcat++" = lolcat;
+ };
inherit nixosModules;
};
modules = [
@@ -55,6 +61,7 @@ in
programs.home-manager.enable = true;
};
}
- ] ++ hostModules;
+ ]
+ ++ hostModules;
};
}
diff --git a/modules/hosts/default.nix b/modules/hosts/default.nix
index e8f0415..1fffd54 100644
--- a/modules/hosts/default.nix
+++ b/modules/hosts/default.nix
@@ -1,2 +1 @@
-args:
-(import ./hermes args) // (import ./kronos args)
+args: (import ./hermes args) // (import ./kronos args)
diff --git a/modules/hosts/hermes/hardware.nix b/modules/hosts/hermes/hardware.nix
index 46c3264..92f3b65 100644
--- a/modules/hosts/hermes/hardware.nix
+++ b/modules/hosts/hermes/hardware.nix
@@ -1,14 +1,27 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+ ...
+}:
{
- imports =
- [ (modulesPath + "/profiles/qemu-guest.nix")
- ];
+ imports = [
+ (modulesPath + "/profiles/qemu-guest.nix")
+ ];
- boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+ boot.initrd.availableKernelModules = [
+ "ahci"
+ "xhci_pci"
+ "virtio_pci"
+ "virtio_scsi"
+ "sd_mod"
+ "sr_mod"
+ ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
diff --git a/modules/nixos/luks-initrd-ssh-unlock.nix b/modules/nixos/luks-initrd-ssh-unlock.nix
index bf8a96b..abaa4f4 100644
--- a/modules/nixos/luks-initrd-ssh-unlock.nix
+++ b/modules/nixos/luks-initrd-ssh-unlock.nix
@@ -44,7 +44,10 @@ in
};
system.activationScripts.initrdSshHostKey = {
- deps = [ "users" "groups" ];
+ deps = [
+ "users"
+ "groups"
+ ];
text = ''
install -d -m 700 "$(dirname "${cfg.hostKeyPath}")"
if [ ! -f "${cfg.hostKeyPath}" ]; then
diff --git a/modules/nixos/mail-server/autodiscover.nix b/modules/nixos/mail-server/autodiscover.nix
index a744eb3..b03c1d5 100644
--- a/modules/nixos/mail-server/autodiscover.nix
+++ b/modules/nixos/mail-server/autodiscover.nix
@@ -7,7 +7,8 @@
let
radicaleHostFor = domain: "cal.${domain}";
- mkThunderbirdAutoconfig = domain:
+ mkThunderbirdAutoconfig =
+ domain:
pkgs.writeText "autoconfig-${domain}.xml" ''
@@ -47,7 +48,8 @@ let
'';
- mkOutlookAutodiscover = domain:
+ mkOutlookAutodiscover =
+ domain:
pkgs.writeText "autodiscover-${domain}.xml" ''
@@ -80,40 +82,39 @@ let
'';
- mailDiscoveryVirtualHosts =
- lib.listToAttrs (
- lib.concatMap (
- domain:
- let
- autoconfigXml = mkThunderbirdAutoconfig domain;
- autodiscoverXml = mkOutlookAutodiscover domain;
- in
- [
- {
- name = "autoconfig.${domain}";
- value = {
- enableACME = true;
- forceSSL = true;
- locations."= /mail/config-v1.1.xml".extraConfig = ''
- default_type application/xml;
- alias ${autoconfigXml};
- '';
- };
- }
- {
- name = "autodiscover.${domain}";
- value = {
- enableACME = true;
- forceSSL = true;
- locations."= /autodiscover/autodiscover.xml".extraConfig = ''
- default_type application/xml;
- alias ${autodiscoverXml};
- '';
- };
- }
- ]
- ) config.mailserver.domains
- );
+ mailDiscoveryVirtualHosts = lib.listToAttrs (
+ lib.concatMap (
+ domain:
+ let
+ autoconfigXml = mkThunderbirdAutoconfig domain;
+ autodiscoverXml = mkOutlookAutodiscover domain;
+ in
+ [
+ {
+ name = "autoconfig.${domain}";
+ value = {
+ enableACME = true;
+ forceSSL = true;
+ locations."= /mail/config-v1.1.xml".extraConfig = ''
+ default_type application/xml;
+ alias ${autoconfigXml};
+ '';
+ };
+ }
+ {
+ name = "autodiscover.${domain}";
+ value = {
+ enableACME = true;
+ forceSSL = true;
+ locations."= /autodiscover/autodiscover.xml".extraConfig = ''
+ default_type application/xml;
+ alias ${autodiscoverXml};
+ '';
+ };
+ }
+ ]
+ ) config.mailserver.domains
+ );
in
{
services.nginx.virtualHosts = mailDiscoveryVirtualHosts // {
diff --git a/modules/nixos/mail-server/default.nix b/modules/nixos/mail-server/default.nix
index 2d5f49b..9062519 100644
--- a/modules/nixos/mail-server/default.nix
+++ b/modules/nixos/mail-server/default.nix
@@ -1,5 +1,8 @@
{
- networking.firewall.allowedTCPPorts = [ 80 443 ];
+ networking.firewall.allowedTCPPorts = [
+ 80
+ 443
+ ];
security.acme = {
acceptTerms = true;
diff --git a/modules/nixos/mail-server/mobileconfig.nix b/modules/nixos/mail-server/mobileconfig.nix
index f14b37f..dda6bce 100644
--- a/modules/nixos/mail-server/mobileconfig.nix
+++ b/modules/nixos/mail-server/mobileconfig.nix
@@ -60,14 +60,21 @@ lib.mkIf hasMailDiscoveryConfig (
wantedBy = [ "multi-user.target" ];
serviceConfig = {
DynamicUser = true;
- ExecStart = lib.concatStringsSep " " [
- "${pkgs.python3}/bin/python3"
- "${generatorScript}"
- "--domain" domain
- "--mail-host" cfg.fqdn
- "--radicale-host" radicaleHost
- "--port" (toString mobileconfigPort)
- ] + defaultUsernameArg + accountArgs;
+ ExecStart =
+ lib.concatStringsSep " " [
+ "${pkgs.python3}/bin/python3"
+ "${generatorScript}"
+ "--domain"
+ domain
+ "--mail-host"
+ cfg.fqdn
+ "--radicale-host"
+ radicaleHost
+ "--port"
+ (toString mobileconfigPort)
+ ]
+ + defaultUsernameArg
+ + accountArgs;
NoNewPrivileges = true;
PrivateTmp = true;
ProtectHome = true;
diff --git a/modules/nixos/mail-server/roundcube.nix b/modules/nixos/mail-server/roundcube.nix
index 86be188..a37c64a 100644
--- a/modules/nixos/mail-server/roundcube.nix
+++ b/modules/nixos/mail-server/roundcube.nix
@@ -18,7 +18,7 @@
];
dicts = with pkgs.aspellDicts; [
# https://search.nixos.org/packages?query=aspellDicts
- en
+ en
sv
];
maxAttachmentSize = config.mailserver.messageSizeLimit / 1024 / 1024;
diff --git a/modules/nixos/packages/lua.nix b/modules/nixos/packages/lua.nix
index 8a5330e..cb73d1a 100644
--- a/modules/nixos/packages/lua.nix
+++ b/modules/nixos/packages/lua.nix
@@ -3,5 +3,6 @@
environment.systemPackages = with pkgs; [
lua-language-server
stylua
+ tree-sitter
];
}