mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-26 09:20:44 -06:00
Compare commits
2 commits
6efe35770f
...
6930508add
Author | SHA1 | Date | |
---|---|---|---|
6930508add | |||
1e6bce6594 |
2 changed files with 13 additions and 8 deletions
|
@ -7,6 +7,7 @@
|
||||||
modulesPath,
|
modulesPath,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
|
@ -14,8 +15,7 @@
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
"thunderbolt"
|
"thunderbolt"
|
||||||
"nvme"
|
"nvme"
|
||||||
"usb_storage"
|
"usbhid"
|
||||||
"sd_mod"
|
|
||||||
];
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
@ -29,6 +29,10 @@
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/FF65-E2AC";
|
device = "/dev/disk/by-uuid/FF65-E2AC";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
|
options = [
|
||||||
|
"fmask=0022"
|
||||||
|
"dmask=0022"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ { device = "/dev/disk/by-uuid/bd64a1ba-f259-4b64-88cd-5585b9345f5a"; } ];
|
swapDevices = [ { device = "/dev/disk/by-uuid/bd64a1ba-f259-4b64-88cd-5585b9345f5a"; } ];
|
||||||
|
@ -38,6 +42,9 @@
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp0s13f0u3u1.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.vboxnet0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
|
|
@ -231,7 +231,6 @@ func Dry(verbose bool, minimal bool, rest ...string) {
|
||||||
log.Info("no packages in minimal set to build")
|
log.Info("no packages in minimal set to build")
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
|
|
||||||
spinnerMsg = "evaluting for minimal build needs"
|
spinnerMsg = "evaluting for minimal build needs"
|
||||||
} else {
|
} else {
|
||||||
log.Debug("evalutating full nixosConfiguration")
|
log.Debug("evalutating full nixosConfiguration")
|
||||||
|
@ -280,9 +279,6 @@ func NixBuild(nom bool, minimal bool, rest ...string) {
|
||||||
if o.resetCache {
|
if o.resetCache {
|
||||||
cmd.Args = append(cmd.Args, "--narinfo-cache-positive-ttl", "0")
|
cmd.Args = append(cmd.Args, "--narinfo-cache-positive-ttl", "0")
|
||||||
}
|
}
|
||||||
// if o.inCI {
|
|
||||||
// o.ciPreBuild(cmd)
|
|
||||||
// }
|
|
||||||
if minimal {
|
if minimal {
|
||||||
log.Debug("populating args with derivations not already built")
|
log.Debug("populating args with derivations not already built")
|
||||||
drvs := systemPathDrvsToBuild()
|
drvs := systemPathDrvsToBuild()
|
||||||
|
@ -290,9 +286,11 @@ func NixBuild(nom bool, minimal bool, rest ...string) {
|
||||||
log.Info("nothing to build. exiting...")
|
log.Info("nothing to build. exiting...")
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
cmd.Args = append(cmd.Args, drvs...)
|
cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
|
||||||
|
}
|
||||||
|
if !o.inCI {
|
||||||
|
cmd.Args = append(cmd.Args, "--log-format", "multiline")
|
||||||
}
|
}
|
||||||
cmd.Args = append(cmd.Args, "--log-format", "multiline")
|
|
||||||
cmd.Args = append(cmd.Args, rest...)
|
cmd.Args = append(cmd.Args, rest...)
|
||||||
exitWithCommand(cmd)
|
exitWithCommand(cmd)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue