Unverified Commit 7ca65eee authored by Linus Heckemann's avatar Linus Heckemann Committed by GitHub
Browse files

Merge pull request #219354 from Izorkin/update-profiles-base 

nixos/profiles: optimize base and minimal profiles
parents c08c0798 bb5370b8

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services.



- To reduce closure size in `nixos/modules/installer/netboot/netboot-minimal.nix` profile disabled load linux firmwares, pre-installing the complete stdenv and `networking.wireless` service.



- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.



- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's

nixos/modules/installer/netboot/netboot-minimal.nix

+3 −0
Original line number Diff line number Diff line
@@ -9,4 +9,7 @@ 
  ];



  documentation.man.enable = lib.mkOverride 500 true;

  hardware.enableRedistributableFirmware = lib.mkOverride 70 false;

  system.extraDependencies = lib.mkOverride 70 [];

  networking.wireless.enable = lib.mkOverride 500 false;

}

nixos/modules/profiles/base.nix

+3 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
    pkgs.ddrescue

    pkgs.ccrypt

    pkgs.cryptsetup # needed for dm-crypt volumes

    pkgs.mkpasswd # for generating password files



    # Some text editors.

    (pkgs.vim.customize {
@@ -32,7 +31,6 @@ 
    pkgs.fuse

    pkgs.fuse3

    pkgs.sshfs-fuse

    pkgs.rsync

    pkgs.socat

    pkgs.screen

    pkgs.tcpdump
@@ -45,22 +43,14 @@ 
    pkgs.usbutils

    pkgs.nvme-cli



    # Tools to create / manipulate filesystems.

    pkgs.ntfsprogs # for resizing NTFS partitions

    pkgs.dosfstools

    pkgs.mtools

    pkgs.xfsprogs.bin

    pkgs.jfsutils

    pkgs.f2fs-tools



    # Some compression/archiver tools.

    pkgs.unzip

    pkgs.zip

  ];



  # Include support for various filesystems.

  # Include support for various filesystems and tools to create / manipulate them.

  boot.supportedFilesystems =

    [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++

    [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++

    lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";



  # Configure host id for ZFS to work

nixos/modules/tasks/filesystems/vfat.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ in 
{

  config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) {



    system.fsPackages = [ pkgs.dosfstools ];

    system.fsPackages = [ pkgs.dosfstools pkgs.mtools ];



    boot.initrd.kernelModules = mkIf inInitrd [ "vfat" "nls_cp437" "nls_iso8859-1" ];