Skip to content

Commit e753b48

Browse files
author
Thilo Hohlt
authored
Merge pull request #22 from archtika/devel
Update test action
2 parents e8bf6f8 + c4b8388 commit e753b48

File tree

2 files changed

+31
-18
lines changed

2 files changed

+31
-18
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ devel, main ]
66
pull_request:
7-
branches: [ devel, main ]
7+
branches: [ main ]
88

99
jobs:
1010
test:

nix/deploy/prod/hardware-configuration.nix

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,45 @@
11
# Do not modify this file! It was generated by ‘nixos-generate-config’
22
# and may be overwritten by future invocations. Please make changes
33
# to /etc/nixos/configuration.nix instead.
4-
{ config, lib, pkgs, modulesPath, ... }:
4+
{
5+
config,
6+
lib,
7+
pkgs,
8+
modulesPath,
9+
...
10+
}:
511

612
{
7-
imports =
8-
[ (modulesPath + "/profiles/qemu-guest.nix")
9-
];
13+
imports = [
14+
(modulesPath + "/profiles/qemu-guest.nix")
15+
];
1016

11-
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_scsi" "sr_mod" ];
17+
boot.initrd.availableKernelModules = [
18+
"xhci_pci"
19+
"virtio_scsi"
20+
"sr_mod"
21+
];
1222
boot.initrd.kernelModules = [ ];
1323
boot.kernelModules = [ ];
1424
boot.extraModulePackages = [ ];
1525

16-
fileSystems."/" =
17-
{ device = "/dev/disk/by-uuid/ee176add-b854-4434-94f9-59ba519bbdc1";
18-
fsType = "ext4";
19-
};
26+
fileSystems."/" = {
27+
device = "/dev/disk/by-uuid/ee176add-b854-4434-94f9-59ba519bbdc1";
28+
fsType = "ext4";
29+
};
2030

21-
fileSystems."/boot" =
22-
{ device = "/dev/disk/by-uuid/A692-993B";
23-
fsType = "vfat";
24-
options = [ "fmask=0077" "dmask=0077" ];
25-
};
26-
27-
swapDevices =
28-
[ { device = "/dev/disk/by-uuid/d54c93ba-e644-47a9-974d-ed825b88ab8b"; }
31+
fileSystems."/boot" = {
32+
device = "/dev/disk/by-uuid/A692-993B";
33+
fsType = "vfat";
34+
options = [
35+
"fmask=0077"
36+
"dmask=0077"
2937
];
38+
};
39+
40+
swapDevices = [
41+
{ device = "/dev/disk/by-uuid/d54c93ba-e644-47a9-974d-ed825b88ab8b"; }
42+
];
3043

3144
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
3245
# (the default) this is the recommended approach. When using systemd-networkd it's

0 commit comments

Comments
 (0)