emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #107

Browse source 
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:
bors[bot] 2023-06-11 05:38:17 +00:00 committed by GitHub
commit 08ff168454
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
nix/noninteractive.nix
View file

@ -9,10 +9,10 @@
]; ];
# among others, this prevents carrying a stdenv with gcc in the image # 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 # prevents shipping nixpkgs, unnecessary if system is evaluated externally
nix.registry = lib.mkForce {}; nix.registry = lib.mkForce { };
# would pull in nano # would pull in nano
programs.nano.syntaxHighlight = lib.mkForce false; programs.nano.syntaxHighlight = lib.mkForce false;
@ -21,15 +21,35 @@
environment.defaultPackages = lib.mkForce [ environment.defaultPackages = lib.mkForce [
pkgs.rsync pkgs.rsync
pkgs.parted 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 = { boot = {
kernelModules = [ "zfs" ]; 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 # we can drop this after 23.05 has been released, which has this set by default
hardware.enableRedistributableFirmware = lib.mkForce false; hardware.enableRedistributableFirmware = lib.mkForce false;
} }