From 40abda7ae93cdd247a860ad9741e36bea869c371 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 29 Feb 2024 09:02:36 -0600
Subject: [PATCH] Fix flake check issues

---
 flake.nix                              |  2 ++
 modules/home-manager/ewwbar.nix        |  3 +--
 modules/nixos/ewwbar.nix               |  2 +-
 modules/nixos/pipewire-low-latency.nix | 26 +++++++++---------
 nixos/default.nix                      |  8 +++---
 nixos/foxtrot.nix                      | 37 --------------------------
 6 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/flake.nix b/flake.nix
index d04a383..e06c3e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+
     # I have this as a separate input so I don't rebuild the font every time I
     # want to upgrade nixpkgs
     nixpkgsForIosevka.url = "github:nixos/nixpkgs?rev=5863c27340ba4de8f83e7e3c023b9599c3cb3c80";
diff --git a/modules/home-manager/ewwbar.nix b/modules/home-manager/ewwbar.nix
index 29612f4..cd0aef1 100644
--- a/modules/home-manager/ewwbar.nix
+++ b/modules/home-manager/ewwbar.nix
@@ -1,7 +1,6 @@
-{pkgs, ...}: {
+{...}: {
   programs.eww = {
     enable = true;
-    package = pkgs.eww-wayland;
     configDir = ./eww;
   };
 }
diff --git a/modules/nixos/ewwbar.nix b/modules/nixos/ewwbar.nix
index 7f044f8..cd26cf9 100644
--- a/modules/nixos/ewwbar.nix
+++ b/modules/nixos/ewwbar.nix
@@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [eww-wayland];
+  environment.systemPackages = [pkgs.eww];
 }
diff --git a/modules/nixos/pipewire-low-latency.nix b/modules/nixos/pipewire-low-latency.nix
index e10ab5e..ea54996 100644
--- a/modules/nixos/pipewire-low-latency.nix
+++ b/modules/nixos/pipewire-low-latency.nix
@@ -1,16 +1,16 @@
-{...}: {
-  environment.etc = {
-    "pipewire/pipewire.conf.d/92-low-latency.conf".text = ''
-      context.properties = {
-        default.clock.rate = 48000
-        default.clock.quantum = 128
-        default.clock.min-quantum = 128
-        default.clock.max-quantum = 128
-      }
+{
+  services.pipewire.extraConfig = {
+    # "pipewire/pipewire.conf.d/92-low-latency.conf".text = ''
+    #   context.properties = {
+    #     default.clock.rate = 48000
+    #     default.clock.quantum = 128
+    #     default.clock.min-quantum = 128
+    #     default.clock.max-quantum = 128
+    #   }
 
-      jack.properties = {
-        node.latency = 128/48000
-      }
-    '';
+    #   jack.properties = {
+    #     node.latency = 128/48000
+    #   }
+    # '';
   };
 }
diff --git a/nixos/default.nix b/nixos/default.nix
index b6027a4..d897038 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -35,8 +35,8 @@
     system = "x86_64-linux";
     modules = [./thinker.nix];
   };
-  htpifour = {
-    system = "aarch64-linux";
-    modules = [./htpifour.nix];
-  };
+  # htpifour = {
+  #   system = "aarch64-linux";
+  #   modules = [./htpifour.nix];
+  # };
 }
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 2ce15f7..e7d7c1f 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -95,43 +95,6 @@ in {
 
   # use updated ppd for framework 13:
   # source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev
-  nixpkgs.overlays = [
-    (
-      final: prev: {
-        power-profiles-daemon = prev.power-profiles-daemon.overrideAttrs (
-          old: {
-            version = "0.13-1";
-
-            patches =
-              (old.patches or [])
-              ++ [
-                (prev.fetchpatch {
-                  url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/127.patch";
-                  sha256 = "sha256-jnq5yJvWQHOlZ78SE/4/HqiQfF25YHQH/T4wwDVRHR0=";
-                })
-                (prev.fetchpatch {
-                  url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/128.patch";
-                  sha256 = "sha256-YD9wn9IQlCp02r4lmwRnx9Eur2VVP1JfC/Bm8hlzF3Q=";
-                })
-                (prev.fetchpatch {
-                  url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/129.patch";
-                  sha256 = "sha256-9T+I3BAUW3u4LldF85ctE0/PLu9u+KBN4maoL653WJU=";
-                })
-              ];
-
-            # explicitly fetching the source to make sure we're patching over 0.13 (this isn't strictly needed):
-            src = prev.fetchFromGitLab {
-              domain = "gitlab.freedesktop.org";
-              owner = "hadess";
-              repo = "power-profiles-daemon";
-              rev = "0.13";
-              sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE=";
-            };
-          }
-        );
-      }
-    )
-  ];
 
   swapDevices = [
     # TODO: move this to disko?