From 423c2236b776d77c9c25e4212909d49e45a92c1a Mon Sep 17 00:00:00 2001
From: natto1784 <natto@weirdnatto.in>
Date: Sat, 7 May 2022 18:26:41 +0530
Subject: [PATCH] Marisa: go back to linux 5.10

Signed-off-by: natto1784 <natto@weirdnatto.in>
---
 hosts/marisa/.boot.nix.swp | Bin 0 -> 12288 bytes
 hosts/marisa/boot.nix      |   6 +++---
 hosts/marisa/hardware.nix  |   5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 hosts/marisa/.boot.nix.swp

diff --git a/hosts/marisa/.boot.nix.swp b/hosts/marisa/.boot.nix.swp
new file mode 100644
index 0000000000000000000000000000000000000000..6def28ff5dc0e99b7b25f09b8c5d764c9c9472d0
GIT binary patch
literal 12288
zcmYc?2=nw+u+TGNU|?VnU|<m4S)3H3&%&^Wi-DmiKfeSdObF*?R^%5GQpCW(pr4yp
zqMurltPj?ppOIf&QmmhwSd>|usGpRdU!s?nSwVy`qe@0YU^E0s4S~{<G+hf`24f>b
z1CUl_B}D~cp->QW6px0$Xb6mkz-S1JhQMeDjE2By2#kinXb6mu5GW~NWT<CgU|@p!
zR|-lqqR~+9C^Z@aqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFa$#&F@=F)
z3J(K=1TSR%AJ+eW$<M&>oS%W=4nG4!9zO$vJwF4(O+E&OQ+x~z>-iWM>i8HK()kz|
zg7_F1<oFmESos(j&hRoY9OY$TSi{S}u!NU^p_P|`p^%q>A&QrQ!G@QC!HAcEL5r7x
zL7ta^L5de*ry$7QAsB9>P96<`(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC8AyCVppipZK
zAsH0FAl6z-AIb!YgT&O;t)U{${(f$r?(qTcA&yQyuJJyuVXi*G3MNq5)QXa#MCbgx
zw9Iq`TLpD>sBl4INpgmQtwLUDP7chVyu{p81zQEB<c!3;^i<t~^peD+oKz*4bTwG3
zzLr9EYEfQlP5{V+)M5o&g=nxuEleHA^;-H0%E|e8X*rq6CB+KmnI#zt>8W|CMVZOE
zsTCzTnR%rZy2<&ui3KH@Nja%t{UA@J=7DTfuvI82DowRkP=HIMWftX@Cl;l`J))FS
zQjl1bm}^^{5?_#?lM|nxmz-*wp9goXf<jqpQE_H|o`S7{3CwBwT1AP)1xcwzMU?@W
zwh9m*DPVP4K_b{`dZ<o<Iw-xUGzlS-mY7qV3b7(5KQSe>NC9SaW?p7VQHow-Sz=}m
z$Y<W*kn_z?Db0a|oPttCMsj9+L2{;&f>LR5Qhaeqeo<n2DukDjnF3-Y7Aq+z6(nb-
z>LwK>=N6YFDJdwGC7UQI#6m2E#Yb{>VmjE^g6#BSJ#ZigBtit^P2&v>tRdkEQ(lyq
z3ywVnrR4m);{2Rc+me#XU;`aPLsKIIgFFi*6bVOPN0=0<gn^QR5_s`^aYiaQ9^%sy
jGjpJh14)2Gqne>w0hAyz({&U;&eKuQ)6-L^wPFAO+$097

literal 0
HcmV?d00001

diff --git a/hosts/marisa/boot.nix b/hosts/marisa/boot.nix
index 37ef818..7f14123 100755
--- a/hosts/marisa/boot.nix
+++ b/hosts/marisa/boot.nix
@@ -1,9 +1,9 @@
 { config, pkgs, ... }:
 {
   boot = {
-    kernelParams = [ "console=ttyS0,115200n8" "console=tty0" ];
-    #    kernelPackages = pkgs.linuxPackages_rpi4; //this sucks
-    initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "uas" "pcie-brcmstb" ];
+    kernelParams = [ "console=ttyS0,115200n8" "console=ttyAMA0,115200" "console=tty0" "boot.shell_on_fail" ];
+    kernelPackages = pkgs.linuxPackages_5_10; 
+    initrd.availableKernelModules = [ "xhci_pci" "usb_storage" "usbhid" "uas" "pcie-brcmstb" "vc4" ];
     loader = {
       grub.enable = false;
       generic-extlinux-compatible.enable = true;
diff --git a/hosts/marisa/hardware.nix b/hosts/marisa/hardware.nix
index 1d53f20..baea1a3 100755
--- a/hosts/marisa/hardware.nix
+++ b/hosts/marisa/hardware.nix
@@ -5,7 +5,7 @@
 
 {
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+    { device = "/dev/disk/by-label/NIXOS_SD";
       fsType = "ext4";
     };
 
@@ -24,5 +24,6 @@
   ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.firmware = [ pkgs.raspberrypiWirelessFirmware ];
+  #hardware.firmware = [ pkgs.raspberrypiWirelessFirmware ];
+  hardware.enableRedistributableFirmware = true;
 }