From e833c13c177288b2a7b9168a784e0e6562c025b6 Mon Sep 17 00:00:00 2001 From: Emile Date: Thu, 19 Sep 2024 10:48:16 +0200 Subject: big format using nixfmt --- nix/hosts/mail/configuration.nix | 17 +++++------------ nix/hosts/mail/hardware-configuration.nix | 29 ++++++++++++++++++++--------- nix/hosts/mail/mail.nix | 11 ++++++----- 3 files changed, 31 insertions(+), 26 deletions(-) (limited to 'nix/hosts/mail') diff --git a/nix/hosts/mail/configuration.nix b/nix/hosts/mail/configuration.nix index 564025c..d2a9c8b 100644 --- a/nix/hosts/mail/configuration.nix +++ b/nix/hosts/mail/configuration.nix @@ -5,11 +5,11 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./mail.nix - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ./mail.nix + ]; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; @@ -46,9 +46,6 @@ # Enable the X11 windowing system. # services.xserver.enable = true; - - - # Configure keymap in X11 # services.xserver.layout = "us"; # services.xserver.xkbOptions = "eurosign:e"; @@ -104,9 +101,6 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "21.11"; # Did you read the comment? - - - boot.loader.grub.devices = [ "/dev/sda" ]; # Initial empty root password for easy login: @@ -123,4 +117,3 @@ security.acme.acceptTerms = true; security.acme.certs."mail.emile.space".email = "security@emile.space"; } - diff --git a/nix/hosts/mail/hardware-configuration.nix b/nix/hosts/mail/hardware-configuration.nix index 2653297..1ede4cd 100644 --- a/nix/hosts/mail/hardware-configuration.nix +++ b/nix/hosts/mail/hardware-configuration.nix @@ -1,22 +1,33 @@ # 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 = [ "ata_piix" "virtio_pci" "virtio_scsi" "xhci_pci" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ + "ata_piix" + "virtio_pci" + "virtio_scsi" + "xhci_pci" + "sd_mod" + "sr_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/eccc47d3-7cee-4af5-822a-4ae0b302cb10"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/eccc47d3-7cee-4af5-822a-4ae0b302cb10"; + fsType = "ext4"; + }; swapDevices = [ ]; diff --git a/nix/hosts/mail/mail.nix b/nix/hosts/mail/mail.nix index 4224e04..9c15e66 100644 --- a/nix/hosts/mail/mail.nix +++ b/nix/hosts/mail/mail.nix @@ -1,7 +1,8 @@ { ... }: let release = "nixos-23.05"; -in { +in +{ imports = [ (builtins.fetchTarball { # Pick a commit from the branch you are interested in @@ -19,10 +20,10 @@ in { # A list of all login accounts. To create the password hashes, use # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2 loginAccounts = { - "mail@emile.space" = { - hashedPasswordFile = "/etc/nixos/keys/mail"; - aliases = ["@emile.space"]; - }; + "mail@emile.space" = { + hashedPasswordFile = "/etc/nixos/keys/mail"; + aliases = [ "@emile.space" ]; + }; }; localDnsResolver = false; -- cgit 1.4.1