daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-20 02:57:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:6930508add54338d56d98547bf1f2c408cb610b1
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:6efe35770fa92cbb6293cf56afc5f53af09046a2
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

No commits in common. "6930508add54338d56d98547bf1f2c408cb610b1" and "6efe35770fa92cbb6293cf56afc5f53af09046a2" have entirely different histories.
6930508add ... 6efe35770f

2 changed files with 8 additions and 13 deletions
Show stats Expand all files Collapse all files

11
hosts/othalan/hardware-configuration.nix
View file

@ -7,7 +7,6 @@
modulesPath, modulesPath,
... ...
}: }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@ -15,7 +14,8 @@
"xhci_pci" "xhci_pci"
"thunderbolt" "thunderbolt"
"nvme" "nvme"
"usbhid" "usb_storage"
"sd_mod"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
@ -29,10 +29,6 @@
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"; } ];
@ -42,9 +38,6 @@
# 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";

8
pkgs/oizys/internal/oizys/main.go
View file

@ -231,6 +231,7 @@ 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")
@ -279,6 +280,9 @@ 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()
@ -286,11 +290,9 @@ 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, append(drvs, "--no-link")...) cmd.Args = append(cmd.Args, drvs...)
} }
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)
} }