diff --git a/machines/gfdesk/share.nix b/machines/gfdesk/share.nix index 0645aca5..9290b14d 100644 --- a/machines/gfdesk/share.nix +++ b/machines/gfdesk/share.nix @@ -9,7 +9,9 @@ in { enable = true; exports = '' /export ${policyaddrs [ lan4 lan6 ] "ro,fsid=0,no_subtree_check"} - /export/torrent ${policyaddrs [ lan4 lan6 ] "ro,insecure,no_root_squash,sync"} + /export/torrent ${ + policyaddrs [ lan4 lan6 ] "ro,insecure,no_root_squash,sync" + } ''; }; diff --git a/nix/nixos-modules/astral/hw/surface.nix b/nix/nixos-modules/astral/hw/surface.nix index 31388453..f24a37ff 100644 --- a/nix/nixos-modules/astral/hw/surface.nix +++ b/nix/nixos-modules/astral/hw/surface.nix @@ -20,6 +20,6 @@ with lib; { ]; services.touchegg.enable = true; - services.xserver.libinput.enable = true; + services.xserver.libinput.enable = true; }; } diff --git a/nix/nixos-modules/astral/virt/libvirt.nix b/nix/nixos-modules/astral/virt/libvirt.nix index 667304af..3a011ac5 100644 --- a/nix/nixos-modules/astral/virt/libvirt.nix +++ b/nix/nixos-modules/astral/virt/libvirt.nix @@ -25,11 +25,12 @@ with lib; { enable = true; qemu.ovmf = { enable = true; - packages = with pkgs; [ - OVMFFull.fd - # broken as of upgrade to 23.11 - # pkgsCross.aarch64-multiplatform.OVMF.fd - ]; + packages = with pkgs; + [ + OVMFFull.fd + # broken as of upgrade to 23.11 + # pkgsCross.aarch64-multiplatform.OVMF.fd + ]; }; }; diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 33f4a75a..75416170 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -12,7 +12,8 @@ in vendored-images // rec { scan-ci-host-keys = pkgs.callPackage ./scan-ci-host-keys { inherit self; }; ci-import-and-tag-docker = pkgs.callPackage ./ci-import-and-tag-docker { }; - installer-system = pkgs.callPackage ./images/installer-system { inherit self nixpkgs; }; + installer-system = + pkgs.callPackage ./images/installer-system { inherit self nixpkgs; }; installer-iso = installer-system.isoImage; ifd3f-infra-scripts = pkgs.callPackage ./../../scripts { }; diff --git a/nix/pkgs/images/installer-system/configuration.nix b/nix/pkgs/images/installer-system/configuration.nix index d5e38db8..4fdcf9dd 100644 --- a/nix/pkgs/images/installer-system/configuration.nix +++ b/nix/pkgs/images/installer-system/configuration.nix @@ -5,9 +5,7 @@ self: { lib, pkgs, modulesPath, ... }: with lib; { - imports = [ - self.nixosModules.astral - ]; + imports = [ self.nixosModules.astral ]; users.mutableUsers = false;