From 8c16b5d4fc104e4f7e6659e7b1873b58d1fd7a6b Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Fri, 30 Jul 2021 10:29:14 +0200
Subject: [PATCH 1/2] ayame: Fix installation issues

---
 ayame.nix       | 29 ++++++++++++++---------------
 modules/nur.nix |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ayame.nix b/ayame.nix
index 4e30e26..8b6f40c 100644
--- a/ayame.nix
+++ b/ayame.nix
@@ -36,7 +36,7 @@ in {
 
   boot = {
     loader = {
-      efi.canTouchEfiVariables = true;
+      efi.canTouchEfiVariables = false;
       grub = {
         enable = true;
         efiInstallAsRemovable = true;
@@ -70,18 +70,18 @@ in {
     xserver.videoDrivers = [ "modesetting" "fbdev" ];
   };
 
-  systemd.services = {
-    rfkill-workaround = {
-      enable = true;
-      description = "Work around rfkill having the Wifi blocked at boot";
-      before = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = "rfkill unblock all";
-      };
-    };
-  };
+ #systemd.services = {
+ #  rfkill-workaround = {
+ #    enable = true;
+ #    description = "Work around rfkill having the Wifi blocked at boot";
+ #    before = [ "network.target" ];
+ #    wantedBy = [ "multi-user.target" ];
+ #    serviceConfig = {
+ #      Type = "oneshot";
+ #      ExecStart = "rfkill unblock all";
+ #    };
+ #  };
+ #};
   
   fileSystems = {
     "/" = {
@@ -94,7 +94,6 @@ in {
     };
   };
   swapDevices = [
-    # TODO: Replace by UUID
-    { device = "/dev/disk/by-label/swap"; }
+    { device = "/dev/disk/by-uuid/cf3b1e1c-c245-4452-ad49-68ac72369e77"; }
   ];
 }
diff --git a/modules/nur.nix b/modules/nur.nix
index 898c8b9..3db7a19 100644
--- a/modules/nur.nix
+++ b/modules/nur.nix
@@ -2,7 +2,7 @@ pkgs:
 
 import (builtins.fetchTarball {
   url = "https://github.com/nix-community/NUR/archive/master.tar.gz";
-  sha256 = "1p0qa9bs8k0jhkdkyvxfcpi2hz2n8d61c63ps7mavk9z3zgnx20j";
+  sha256 = "0znxac6j1139l777lfjm6y19px5xbdk3jcwcynwbmg5yafn8az0n";
 }) {
   inherit pkgs;
 }

From 0d42b40516c96616a81f587922b643540f8bd360 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Fri, 30 Jul 2021 10:29:39 +0200
Subject: [PATCH 2/2] mobile: Fix clash with power-daemon

---
 modules/hardware/mobile.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hardware/mobile.nix b/modules/hardware/mobile.nix
index 5c34589..f7c7062 100644
--- a/modules/hardware/mobile.nix
+++ b/modules/hardware/mobile.nix
@@ -3,7 +3,7 @@
 # Special options for mobile devices
 {
   # Battery savings
-  services.tlp.enable = true;
+  #services.tlp.enable = true;
 
   # TODO: Maybe move this out of here
   environment.systemPackages = [ pkgs.iio-sensor-proxy ];