more shanigans

pkgs/afk-cmds.nix

@@ -13,17 +13,7 @@
   libappindicator-gtk3,
   atk,
   fetchFromGitHub,
-}:
-rustPlatform.buildRustPackage rec {
-  name = "afk-cmds";
-
-  src = fetchFromGitHub {
-    owner = "Gerg-L";
-    repo = "afk-cmds";
-    rev = "b345d5a038a86c6ca31d3bd8800ac759da912a22";
-    sha256 = "sha256-yleq8bg3ZnilbYTNXRteBALiJ/fIXOxXxqf966OokqQ=";
-  };
-
+}: let
   buildInputs = [
     libX11
     libXScrnSaver
@@ -35,17 +25,29 @@ rustPlatform.buildRustPackage rec {
     libappindicator-gtk3
     atk
   ];
+in
+  rustPlatform.buildRustPackage {
+    name = "afk-cmds";
 
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook
-  ];
+    src = fetchFromGitHub {
+      owner = "Gerg-L";
+      repo = "afk-cmds";
+      rev = "b345d5a038a86c6ca31d3bd8800ac759da912a22";
+      sha256 = "sha256-yleq8bg3ZnilbYTNXRteBALiJ/fIXOxXxqf966OokqQ=";
+    };
 
-  postFixup = ''
-    wrapProgram $out/bin/afk-cmds \
-      --prefix LD_LIBRARY_PATH : ${(lib.makeLibraryPath buildInputs)}
-    mkdir -p $out/share/icons/hicolor/256x256/apps/
-    cp $src/afk-icon.png $out/share/icons/hicolor/256x256/apps/afk-icon.png
-  '';
-  cargoSha256 = "sha256-CPpFUdgb0zTZAVlv4uhJ0Y7eocCjuEZNgQJdNwV1FI4=";
-}
+    inherit buildInputs;
+
+    nativeBuildInputs = [
+      pkg-config
+      wrapGAppsHook
+    ];
+
+    postFixup = ''
+      wrapProgram $out/bin/afk-cmds \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
+      mkdir -p $out/share/icons/hicolor/256x256/apps/
+      cp $src/afk-icon.png $out/share/icons/hicolor/256x256/apps/afk-icon.png
+    '';
+    cargoSha256 = "sha256-CPpFUdgb0zTZAVlv4uhJ0Y7eocCjuEZNgQJdNwV1FI4=";
+  }

pkgs/fastfetch.nix

@@ -0,0 +1,56 @@
+{
+  chafa,
+  cmake,
+  dbus,
+  dconf,
+  fetchFromGitHub,
+  glib,
+  imagemagick_light,
+  libglvnd,
+  libxcb,
+  makeWrapper,
+  ocl-icd,
+  opencl-headers,
+  pciutils,
+  pkg-config,
+  stdenv,
+  vulkan-loader,
+  wayland,
+  xfce,
+  xorg,
+  zlib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fastfetch";
+  version = "1.11.0";
+
+  src = fetchFromGitHub {
+    owner = "LinusDierheimer";
+    repo = finalAttrs.pname;
+    rev = finalAttrs.version;
+    hash = "sha256-sSQaXXKH/ZELdhbUKuvAj0gZ0fSO/Xjxsv/TU0Xq47k=";
+  };
+
+  nativeBuildInputs = [cmake makeWrapper pkg-config];
+
+  buildInputs = [
+    dbus
+    dconf
+    glib
+    pciutils
+    zlib
+    chafa
+    imagemagick_light
+    ocl-icd
+    libglvnd
+    vulkan-loader
+    wayland
+    libxcb
+    xfce.xfconf
+    opencl-headers
+    xorg.libX11
+  ];
+  cmakeFlags = [
+    "-DTARGET_DIR_ETC=./etc"
+  ];
+})

pkgs/parrot.nix

@@ -11,33 +11,37 @@
   makeWrapper,
 }:
 # yt-dlp and ffmpeg required at runtime
-rustPlatform.buildRustPackage {
-  pname = "parrot";
-  version = "1.5.1";
+let
   src = fetchFromGitHub {
     owner = "aquelemiguel";
     repo = "parrot";
     rev = "6b1df01bd9cce1c0d8446dea720c4a32ff935514";
     hash = "sha256-f6YAdsq2ecsOCvk+A8wsUu+ywQnW//gCAkVLF0HTn8c=";
   };
+in
+  rustPlatform.buildRustPackage
+  {
+    pname = "parrot";
+    version = "1.6.0";
+    inherit src;
+    buildInputs = [
+      libopus
+      openssl
+    ];
 
-  buildInputs = [
-    libopus
-    openssl
-  ];
+    nativeBuildInputs = [
+      pkg-config
+      cmake
+      makeWrapper
+    ];
+    postInstall = ''
+      wrapProgram $out/bin/parrot \
+        --set PATH ${lib.makeBinPath [
+        yt-dlp
+        ffmpeg
+      ]}'';
 
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    makeWrapper
-  ];
-  postInstall = ''
-    wrapProgram $out/bin/parrot \
-      --set PATH ${lib.makeBinPath [
-      yt-dlp
-      ffmpeg
-    ]}'';
-  cargoSha256 = "sha256-RueYf+SzDwhqEb40iR0hViEuMinH72T480fuqJWJ+uk=";
+    cargoLock.lockFile = src + "/Cargo.lock";
 
-  RUSTC_BOOTSTRAP = 1;
-}
+    RUSTC_BOOTSTRAP = 1;
+  }