More correct dfu-util flash script + rearranged personal devices

1 files changed, 14 insertions, 10 deletions

diff --git a/overlays/default.nix b/overlays/default.nix
index 3a6d3bb..bc46ee2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,15 +1,19 @@
 final: prev: {
-  qmk_firmware = prev.callPackage ../pkgs/qmk_firmware.nix {};
+  # qmk_firmware = prev.callPackage ../pkgs/qmk_firmware.nix {};
 
-  qmk_firmware-modelf = final.qmk_firmware.overrideAttrs {
-    version = "model_f_labs";
+  qmk_firmware = prev.fetchFromGitHub {
+    owner = "qmk";
+    repo = "qmk_firmware";
+    fetchSubmodules = true;
+    rev = "0.30.5";
+    hash = "sha256-TdStj8Hf5seH/5SMDqG7B3JLXHCvlL58AJlRqydaNJ0=";
+  };
 
-    src = prev.fetchFromGitHub {
-      owner = "matthew-wolf-n4mtt";
-      repo = "qmk_firmware";
-      fetchSubmodules = true;
-      rev = "93734d1";
-      hash = "sha256-E5zVcfELcFTqJspAyQmnD2qGRzFw4Y48Ce5c9FHl7Bk=";
-    };
+  qmk_firmware-modelf = prev.fetchFromGitHub {
+    owner = "matthew-wolf-n4mtt";
+    repo = "qmk_firmware";
+    fetchSubmodules = true;
+    rev = "93734d1";
+    hash = "sha256-E5zVcfELcFTqJspAyQmnD2qGRzFw4Y48Ce5c9FHl7Bk=";
   };
 }