Merge pull request #261 from DarkKirb/create-pull-request/patch

Run automatic update

config/installer.nix

@@ -1,17 +1,12 @@
 {
-  lib,
-  pkgs,
   nixpkgs,
   ...
 }: {
   imports = [
     "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-    ../modules/bcachefs.nix
   ];
   networking.wireguard.interfaces."wg0".ips = [
     "fd0d:a262:1fa6:e621:6ec2:1e4e:ce7f:d2af/64"
   ];
-  boot.supportedFilesystems = lib.mkForce ["bcachefs" "vfat"];
-  boot.kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.linux-bcachefs);
   networking.hostId = "8425e349";
 }

config/netboot.nix

@@ -1,17 +1,12 @@
 {
-  lib,
-  pkgs,
   nixpkgs,
   ...
 }: {
   imports = [
     "${nixpkgs}/nixos/modules/installer/netboot/netboot-base.nix"
-    ../modules/bcachefs.nix
   ];
   networking.wireguard.interfaces."wg0".ips = [
     "fd0d:a262:1fa6:e621:6ec2:1e4e:ce7f:d2af/64"
   ];
-  boot.supportedFilesystems = lib.mkForce ["bcachefs" "vfat"];
-  boot.kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.linux-bcachefs);
   networking.hostId = "8425e349";
 }

flake.nix

@@ -65,11 +65,11 @@ rec {
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-config-for-netboot = {
-      url = "github:DarkKirb/nixos-config/6ed9cdc5bd473f0cf4860ff001a11b7ea4b769f4";
+      url = "github:DarkKirb/nixos-config/70a88984c0362fc5dad723173f38e11490f8d34e";
       inputs.nixos-config-for-netboot.follows = "nixos-config-for-netboot";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs";
     nur.url = "github:nix-community/NUR";
     sops-nix = {
       url = "github:Mic92/sops-nix";

modules/bcachefs.nix

@@ -1,82 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  utils,
-  ...
-}:
-with lib; let
-  bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems;
-
-  mountCommand = pkgs.runCommand "mount.bcachefs" {} ''
-    mkdir -p $out/bin
-    cat > $out/bin/mount.bcachefs <<EOF
-    #!/bin/sh
-    exec "/bin/bcachefs" mount "\$@"
-    EOF
-    chmod +x $out/bin/mount.bcachefs
-  '';
-
-  commonFunctions = ''
-    prompt() {
-        local name="$1"
-        printf "enter passphrase for $name: "
-    }
-    tryUnlock() {
-        local name="$1"
-        local path="$2"
-        if bcachefs unlock -c $path > /dev/null 2> /dev/null; then    # test for encryption
-            prompt $name
-            until bcachefs unlock $path 2> /dev/null; do              # repeat until successfully unlocked
-                printf "unlocking failed!\n"
-                prompt $name
-            done
-            printf "unlocking successful.\n"
-        fi
-    }
-  '';
-
-  openCommand = name: fs: let
-    # we need only unlock one device manually, and cannot pass multiple at once
-    # remove this adaptation when bcachefs implements mounting by filesystem uuid
-    # also, implement automatic waiting for the constituent devices when that happens
-    # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671)
-    firstDevice = head (splitString ":" fs.device);
-  in ''
-    tryUnlock ${name} ${firstDevice}
-  '';
-in {
-  config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [
-    {
-      # We do not want to include bachefs in the fsPackages for systemd-initrd
-      # because we provide the unwrapped version of mount.bcachefs
-      # through the extraBin option, which will make it available for use.
-      system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools;
-      environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools;
-
-      # use kernel package with bcachefs support until it's in mainline
-      boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
-    }
-
-    (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {
-      # chacha20 and poly1305 are required only for decryption attempts
-      boot.initrd.availableKernelModules = ["bcachefs" "sha256" "chacha20" "poly1305"];
-
-      boot.initrd.systemd.extraBin = {
-        "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
-        "mount.bcachefs" = "${mountCommand}/bin/mount.bcachefs";
-      };
-
-      boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
-        copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
-        copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs
-      '';
-      boot.initrd.extraUtilsCommandsTest = ''
-        $out/bin/bcachefs version
-      '';
-
-      boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs);
-    })
-  ]);
-  disabledModules = ["tasks/filesystems/bcachefs.nix"];
-}