From 0976950b758bc9f898c28b7eec8e5de0d4b141f8 Mon Sep 17 00:00:00 2001
From: bad <badatnames@tutanota.com>
Date: Sun, 3 Oct 2021 01:40:40 +0200
Subject: [PATCH] Tesco reinstall

---
 hosts/teapot.nix |  1 +
 hosts/tesco.nix  | 39 +++++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/hosts/teapot.nix b/hosts/teapot.nix
index b708b58..12275e9 100644
--- a/hosts/teapot.nix
+++ b/hosts/teapot.nix
@@ -18,6 +18,7 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+
   fileSystems."/" =
     {
       device = "/dev/disk/by-uuid/75b8df4a-8839-40cd-92ad-dc83007199f4";
diff --git a/hosts/tesco.nix b/hosts/tesco.nix
index 6c59628..2286384 100644
--- a/hosts/tesco.nix
+++ b/hosts/tesco.nix
@@ -1,4 +1,4 @@
-{ suites, modulesPath, ... }@inputs:
+{ suites, modulesPath, pkgs, ... }@inputs:
 {
   imports = suites.desktop ++ [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -8,10 +8,19 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.09"; # Did you read the comment?
+  system.stateVersion = "21.05"; # Did you read the comment?
+
+  
+  boot.loader.grub = {
+    enable = true;
+    version = 2;
+    device = "nodev";
+    efiSupport = true;
+    enableCryptodisk = true;
+    gfxmodeEfi = "1024x768";
+  };
+  boot.loader.efi.efiSysMountPoint = "/boot";
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.kernelParams = [ "boot.shell_on_fail=1" "shell_on_fail=1" "shell_on_fail" "boot.shell_on_fail" ];
@@ -22,27 +31,25 @@
 
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+
   boot.extraModulePackages = [ ];
 
+  boot.supportedFilesystems = ["bcachefs"];
+  boot.initrd.supportedFilesystems = ["bcachefs"];
+
   fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/71831856-336e-43b5-9ed8-a657939f95a9";
-      fsType = "ext4";
+    { device = "/dev/sda2:/dev/sdb1";
+      fsType = "bcachefs";
     };
 
   fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/3B73-1D5D";
+    { device = "/dev/disk/by-uuid/1367-B5C7";
       fsType = "vfat";
     };
 
-  fileSystems."/home/mae" =
-    {
-      device = "/dev/disk/by-uuid/d7e91b96-f7e1-4feb-84d4-4e024746d73e";
-      fsType = "btrfs";
-    };
-
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/99d35be0-8935-4cec-bf58-4f666db922f0"; }];
+    [ { device = "/dev/disk/by-uuid/48286351-d82d-40aa-b4ed-14b742b31ea0"; }
+      { device = "/dev/disk/by-uuid/8da30234-1932-4ec2-bb30-6ab268c669ee"; }
+    ];
 
 }