diff options
Diffstat (limited to 'host')
| -rw-r--r-- | host/hardware/automatix.nix | 16 | ||||
| -rw-r--r-- | host/software/server/mail.nix | 10 | ||||
| -rw-r--r-- | host/software/server/website.nix | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/host/hardware/automatix.nix b/host/hardware/automatix.nix index 4b35109..cdf3a9b 100644 --- a/host/hardware/automatix.nix +++ b/host/hardware/automatix.nix @@ -4,11 +4,15 @@ { config, lib, pkgs, ... }: { - imports = - [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ]; + boot.initrd.postDeviceCommands = + '' + # Set the system time from the hardware clock to work around a + # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised + # to the *boot time* of the host). + hwclock -s + ''; + boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -21,5 +25,5 @@ [ { device = "/dev/disk/by-uuid/05f0315c-f5f5-4471-b2ef-6e53b95cb08b"; } ]; - nix.maxJobs = lib.mkDefault 1; + nix.settings.max-jobs = lib.mkDefault 1; } diff --git a/host/software/server/mail.nix b/host/software/server/mail.nix index 37c007b..c58c879 100644 --- a/host/software/server/mail.nix +++ b/host/software/server/mail.nix @@ -1,14 +1,6 @@ { config, pkgs, ... }: { - imports = let - release = "nixos-21.05"; - in [ - (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz"; - }) - ]; - mailserver = { enable = true; fqdn = "mx.kummerlaender.eu"; @@ -17,7 +9,7 @@ loginAccounts = import ./mailusers.nix; # Enable LetsEncrypt - certificateScheme = 3; + certificateScheme = "acme-nginx"; enableImap = true; enableImapSsl = true; diff --git a/host/software/server/website.nix b/host/software/server/website.nix index 8248a0b..b14018b 100644 --- a/host/software/server/website.nix +++ b/host/software/server/website.nix @@ -13,7 +13,6 @@ # `public` generates websites using their custom derivations via `nix-build` services.nginx.virtualHosts = let - default = locations: { inherit locations; addSSL = true; @@ -36,11 +35,13 @@ return ${target}; ''; }; + in { "kummerlaender.eu" = website "overview"; "blog.kummerlaender.eu" = website "blog"; "blip.kummerlaender.eu" = website "blip"; "tree.kummerlaender.eu" = website "tree"; + "static.kummerlaender.eu" = website "static" // { extraConfig = '' add_header Access-Control-Allow-Origin *; @@ -60,5 +61,8 @@ } ''; }; + + "vtd.productions" = website "vtd"; + }; } |