add udev rules for MCH2022 badge and Flipper Zero, switch back to gnome3 pinentry

3 files changed, 15 insertions, 2 deletions

diff --git a/flake.nix b/flake.nix
index 2b540e1..c4ae1e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,6 @@
     {
       nixosConfigurations = {
         microwave = nixpkgs-unstable.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
           system = "x86_64-linux";
           modules = [
             sops-nix.nixosModules.sops
diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix
index 9ae9c2d..35f9856 100644
--- a/hosts/microwave/configuration.nix
+++ b/hosts/microwave/configuration.nix
@@ -90,6 +90,20 @@
 
 
   programs.steam.enable = true;
+
+  services.udev.extraRules = ''
+      # MCH2022 Badge
+      SUBSYSTEM=="usb", ATTR{idVendor}=="16d0", ATTR{idProduct}=="0f9a", MODE="0666"
+
+      #Flipper Zero serial port
+      SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess"
+      #Flipper Zero DFU
+      SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess"
+      #Flipper ESP32s2 BlackMagic
+      SUBSYSTEMS=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="40??", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess"
+  '';
+
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 7384220..8323721 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -143,5 +143,5 @@
       wayland = true;
     };
   };
-  programs.gnupg.agent.pinentryFlavor = "curses";
+  programs.gnupg.agent.pinentryFlavor = "gnome3";
 }