Merge #107
107: nixos noninteractive: re-add missing filesystems r=Mic92 a=Mic92 Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
commit
08ff168454
1 changed files with 27 additions and 7 deletions
|
@ -9,27 +9,47 @@
|
|||
];
|
||||
|
||||
# among others, this prevents carrying a stdenv with gcc in the image
|
||||
system.extraDependencies = lib.mkForce [];
|
||||
system.extraDependencies = lib.mkForce [ ];
|
||||
|
||||
# prevents shipping nixpkgs, unnecessary if system is evaluated externally
|
||||
nix.registry = lib.mkForce {};
|
||||
nix.registry = lib.mkForce { };
|
||||
|
||||
# would pull in nano
|
||||
programs.nano.syntaxHighlight = lib.mkForce false;
|
||||
|
||||
# prevents nano, strace
|
||||
environment.defaultPackages = lib.mkForce [
|
||||
pkgs.rsync
|
||||
environment.defaultPackages = lib.mkForce [
|
||||
pkgs.rsync
|
||||
pkgs.parted
|
||||
pkgs.zfs
|
||||
(pkgs.zfs.override {
|
||||
# this overrides saves 10MB
|
||||
samba = pkgs.coreutils;
|
||||
})
|
||||
];
|
||||
|
||||
# zfs support is accidentally disabled by excluding base.nix, re-enable it
|
||||
# we are missing this from base.nix
|
||||
boot.supportedFilesystems = [
|
||||
"btrfs"
|
||||
# probably not needed but does not seem to increase closure size
|
||||
"cifs"
|
||||
"f2fs"
|
||||
## anyone still using this over ext4?
|
||||
#"jfs"
|
||||
"ntfs"
|
||||
## no longer seems to be maintained, anyone still using it?
|
||||
#"reiserfs"
|
||||
"vfat"
|
||||
"xfs"
|
||||
];
|
||||
boot = {
|
||||
kernelModules = [ "zfs" ];
|
||||
extraModulePackages = [ config.boot.kernelPackages.zfs ];
|
||||
extraModulePackages = [
|
||||
config.boot.kernelPackages.zfs
|
||||
];
|
||||
};
|
||||
|
||||
networking.hostId = lib.mkDefault "8425e349";
|
||||
|
||||
# we can drop this after 23.05 has been released, which has this set by default
|
||||
hardware.enableRedistributableFirmware = lib.mkForce false;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue