Skip to content

Commit

Permalink
nixfmt
Browse files Browse the repository at this point in the history
ifd3f committed Mar 23, 2024
1 parent c7e94f2 commit 787b883
Showing 5 changed files with 13 additions and 11 deletions.
4 changes: 3 additions & 1 deletion machines/gfdesk/share.nix
Original file line number Diff line number Diff line change
@@ -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"
}
'';
};

2 changes: 1 addition & 1 deletion nix/nixos-modules/astral/hw/surface.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ with lib; {
];

services.touchegg.enable = true;
services.xserver.libinput.enable = true;
services.xserver.libinput.enable = true;
};
}
11 changes: 6 additions & 5 deletions nix/nixos-modules/astral/virt/libvirt.nix
Original file line number Diff line number Diff line change
@@ -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
];
};
};

3 changes: 2 additions & 1 deletion nix/pkgs/default.nix
Original file line number Diff line number Diff line change
@@ -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 { };
4 changes: 1 addition & 3 deletions nix/pkgs/images/installer-system/configuration.nix
Original file line number Diff line number Diff line change
@@ -5,9 +5,7 @@
self:
{ lib, pkgs, modulesPath, ... }:
with lib; {
imports = [
self.nixosModules.astral
];
imports = [ self.nixosModules.astral ];

users.mutableUsers = false;

0 comments on commit 787b883

Please sign in to comment.