packages/zapzap: cleanup

common/packages.nix

@@ -25,6 +25,7 @@
       git
       gnupg
       gptfdisk
+      hcxdumptool
       hdparm
       htop-vim
       interception-tools

home/home.nix

@@ -52,6 +52,14 @@ with lib; {
       };
     };
 
+    tmux = {
+      enable = true;
+      clock24 = true;
+      keyMode = "vi";
+      terminal = "screen-256color";
+      plugins = with pkgs.tmuxPlugins; [ sysstat net-speed gruvbox ];
+    };
+
     mpv = {
       enable = true;
       config = {

home/zsh.nix

@@ -86,7 +86,6 @@
       setopt c_bases
       setopt completeinword
       setopt completealiases
-      setopt extendedglob
       setopt notify
 
       #

nixy/configuration.nix

@@ -173,7 +173,7 @@
     };
 
     xserver = {
-      enable = false;
+      enable = true;
       dpi = 144;
       libinput.enable = true;
       desktopManager.xterm.enable = false;
@@ -195,6 +195,9 @@
         ATTR{idVendor}=="1443", MODE:="666"
         ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", MODE:="666"
 
+	#Arduino UNO r4
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", MODE:="0666"
+
 	#ST-Link
 
       '';

packages/stm32cubemx/default.nix

@@ -1,32 +1,32 @@
-{
-  fdupes,
-  buildFHSEnv,
-  fetchzip,
-  icoutils,
-  imagemagick,
-  jdk21,
-  lib,
-  makeDesktopItem,
-  makeWrapper,
-  stdenv,
-}: let
+{ fdupes
+, buildFHSEnv
+, fetchzip
+, icoutils
+, imagemagick
+, jdk17
+, lib
+, makeDesktopItem
+, stdenvNoCC
+}:
+
+let
   iconame = "STM32CubeMX";
-  pkg = stdenv.mkDerivation rec {
+  package = stdenvNoCC.mkDerivation rec {
     pname = "stm32cubemx";
     version = "6.10.0";
 
     src = fetchzip {
       url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip";
-      sha256 = "1qydwbfj1286h3ys3js6fy5rkni5njsarn502rid11rv6gxrz507";
+      sha256 = "sha256-B5Sf+zM7h9BiFqDYrLS0JdqZi3dGy6H9gAaJIN3izeM=";
       stripRoot = false;
     };
 
-    nativeBuildInputs = [fdupes icoutils imagemagick makeWrapper];
+    nativeBuildInputs = [ fdupes icoutils imagemagick ];
     desktopItem = makeDesktopItem {
       name = "STM32CubeMX";
       exec = "stm32cubemx";
       desktopName = "STM32CubeMX";
-      categories = ["Development"];
+      categories = [ "Development" ];
       icon = "stm32cubemx";
       comment = meta.description;
       terminal = false;
@@ -37,15 +37,15 @@
       ];
     };
 
-    installPhase = ''
+    buildCommand = ''
       mkdir -p $out/{bin,opt/STM32CubeMX,share/applications}
 
       cp -r $src/MX/. $out/opt/STM32CubeMX/
       chmod +rx $out/opt/STM32CubeMX/STM32CubeMX
 
       cat << EOF > $out/bin/${pname}
-      #!${stdenv.shell}
-      ${jdk21}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX
+      #!${stdenvNoCC.shell}
+      ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX
       EOF
       chmod +x $out/bin/${pname}
 
@@ -76,16 +76,16 @@
         step-by-step process.
       '';
       homepage = "https://www.st.com/en/development-tools/stm32cubemx.html";
-      sourceProvenance = with sourceTypes; [binaryBytecode];
+      sourceProvenance = with sourceTypes; [ binaryBytecode ];
       license = licenses.unfree;
-      maintainers = with maintainers; [angaz wucke13];
+      maintainers = with maintainers; [ angaz wucke13 ];
       platforms = platforms.all;
     };
   };
-in
+  in
   buildFHSEnv {
-    inherit (pkg) pname meta;
-    runScript = "${pkg.outPath}/bin/stm32cubemx";
+    inherit (package) pname meta;
+    runScript = "${package.outPath}/bin/stm32cubemx";
     targetPkgs = pkgs:
       with pkgs; [
         alsa-lib
@@ -112,4 +112,4 @@ in
         xorg.libXfixes
         xorg.libXrandr
       ];
-  }
+}

packages/zapzap/default.nix

@@ -1,15 +1,19 @@
-{pkgs}:
-pkgs.python3Packages.buildPythonPackage {
+{ fetchurl
+, makeWrapper
+, python3Packages
+, qt6
+}:
+
+python3Packages.buildPythonPackage rec {
   name = "zapzap";
-  src = pkgs.fetchFromGitHub {
-    owner = "zapzap-linux";
-    repo = "zapzap";
-    rev = "5de4a4015128c164af3c964ecbe5b6358d98b521";
-    hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc=";
+  version = "5.1-2";
+  src = fetchurl {
+    url = "https://github.com/zapzap-linux/zapzap/archive/refs/tags/${version}.tar.gz";
+    hash = "sha256-r5NhdXQ4Tl/wFrD1+sxFS10Z3lAcHcax5bi43Qa3ZI0=";
   };
   dontWrapQtApps = true;
-  propagatedBuildInputs = with pkgs.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg];
-  nativeBuildInputs = with pkgs; [qt6.wrapQtAppsHook makeWrapper];
+  propagatedBuildInputs = with python3Packages; [ pyqt6-webengine qt6.qtwayland qt6.qtsvg ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook makeWrapper ];
   env = {
     HOME = "/tmp";
   };