flake.lock: Update

Flake lock file updates:

• Updated input 'firefox':
    'github:nix-community/flake-firefox-nightly/60cec1b0d4f65c7dc9845726eeb0474fdd848233?narHash=sha256-5apoXvep/egGhrX3ZkJS4JJL6HZiTuDTBgV9hiaIXPA%3D' (2024-04-24)
  → 'github:nix-community/flake-firefox-nightly/6dc8e7385b5014b33024751137308b0e17327dd1?narHash=sha256-QTRODNT0q3v06%2ByiKKQjIutBJKbVF2Plpz5TIjo%2BkCI%3D' (2024-04-24)

.git-blame-ignore-revs

@@ -1,2 +1,4 @@
 # Alejandra reformat of Nix files
 97f6bb71e0774a96f74cbabc14933b2d8cd709c3
+# Fixed a bunch of packages that forced a reformat
+daa64b85dcc6d98fcb453d7201726ff0b7b3b3b5

flake.lock

@@ -285,11 +285,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713920225,
-        "narHash": "sha256-5apoXvep/egGhrX3ZkJS4JJL6HZiTuDTBgV9hiaIXPA=",
+        "lastModified": 1713979156,
+        "narHash": "sha256-QTRODNT0q3v06+yiKKQjIutBJKbVF2Plpz5TIjo+kCI=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "60cec1b0d4f65c7dc9845726eeb0474fdd848233",
+        "rev": "6dc8e7385b5014b33024751137308b0e17327dd1",
         "type": "github"
       },
       "original": {

packages/adb-sync/default.nix

@@ -1,36 +1,35 @@
 {
-  pkgs,
+  stdenvNoCC,
+  fetchFromGitHub,
   lib,
-}: let
-  inherit (pkgs) stdenvNoCC fetchFromGitHub;
-in
-  stdenvNoCC.mkDerivation rec {
-    pname = "adb-sync";
-    version = "1.0.0";
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "adb-sync";
+  version = "1.0.0";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "adb-sync";
-      rev = "v${version}";
-      hash = "sha256-uoIueSbhml6lHgpI6OH1Y4cNeZzzTBS+PAPHf62xJzY=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "adb-sync";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-uoIueSbhml6lHgpI6OH1Y4cNeZzzTBS+PAPHf62xJzY=";
+  };
 
-    outputs = ["out"];
+  outputs = ["out"];
 
-    dontConfigure = true;
-    dontBuild = true;
+  dontConfigure = true;
+  dontBuild = true;
 
-    installPhase = ''
-      install -m755 -D adb-sync $out/bin/adb-sync
-      install -m755 -D adb-channel $out/bin/adb-channel
-    '';
+  installPhase = ''
+    install -m755 -D adb-sync $out/bin/adb-sync
+    install -m755 -D adb-channel $out/bin/adb-channel
+  '';
 
-    meta = with lib; {
-      homepage = "https://github.com/google/adb-sync";
-      description = "adb-sync is a tool to synchronize files between a PC and an Android device using the ADB (Android Debug Bridge)";
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "adb-sync";
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/google/adb-sync";
+    description = "adb-sync is a tool to synchronize files between a PC and an Android device using the ADB (Android Debug Bridge)";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "adb-sync";
+  };
+})

packages/adbtuifm/default.nix

@@ -1,29 +1,28 @@
 {
-  pkgs,
+  buildGoModule,
+  fetchFromGitHub,
   lib,
-}: let
-  inherit (pkgs) buildGoModule fetchFromGitHub;
-in
-  buildGoModule rec {
-    pname = "adbtuifm";
-    version = "0.5.8";
+}:
+buildGoModule rec {
+  pname = "adbtuifm";
+  version = "0.5.8";
 
-    src = fetchFromGitHub {
-      owner = "darkhz";
-      repo = "adbtuifm";
-      rev = "v${version}";
-      hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY=";
-    };
+  src = fetchFromGitHub {
+    owner = "darkhz";
+    repo = "adbtuifm";
+    rev = "v${version}";
+    hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY=";
+  };
 
-    vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks=";
+  vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks=";
 
-    ldflags = ["-s" "-w"];
+  ldflags = ["-s" "-w"];
 
-    meta = with lib; {
-      description = "A TUI File Manager for ADB";
-      homepage = "https://github.com/darkhz/adbtuifm";
-      license = licenses.mit;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "adbtuifm";
-    };
-  }
+  meta = with lib; {
+    description = "A TUI File Manager for ADB";
+    homepage = "https://github.com/darkhz/adbtuifm";
+    license = licenses.mit;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "adbtuifm";
+  };
+}

packages/adx/default.nix

@@ -1,35 +1,36 @@
 {
-  pkgs,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
   lib,
-}: let
-  inherit (pkgs) darwin fetchFromGitHub rustPlatform stdenv;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "adx";
-    version = "4.5.4";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "adx";
+  version = "4.5.4";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "adx";
-      rev = "v${version}";
-      hash = "sha256-/T3Kd11nHiBVTPyk9C7GztO/+xUK2xfrZLGSJ8E101k=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "adx";
+    rev = "v${version}";
+    hash = "sha256-/T3Kd11nHiBVTPyk9C7GztO/+xUK2xfrZLGSJ8E101k=";
+  };
 
-    cargoHash = "sha256-D8LFtU0xxsY4m58PTvKVJKvsxB8OfA4fDqpNEZG3aEI=";
+  cargoHash = "sha256-D8LFtU0xxsY4m58PTvKVJKvsxB8OfA4fDqpNEZG3aEI=";
 
-    # Tests are annoying to make work with buildRustPackage
-    doCheck = false;
+  # Tests are annoying to make work with buildRustPackage
+  doCheck = false;
 
-    buildInputs = lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.Security
-      darwin.apple_sdk.frameworks.SystemConfiguration
-    ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.SystemConfiguration
+  ];
 
-    meta = with lib; {
-      description = "Rust tooling to poll Google Maven repository for updates to AndroidX artifacts";
-      homepage = "https://github.com/msfjarvis/adx";
-      license = with licenses; [asl20 mit];
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "adx";
-    };
-  }
+  meta = with lib; {
+    description = "Rust tooling to poll Google Maven repository for updates to AndroidX artifacts";
+    homepage = "https://github.com/msfjarvis/adx";
+    license = with licenses; [asl20 mit];
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "adx";
+  };
+}

packages/clipboard-substitutor/default.nix

@@ -1,38 +1,40 @@
 {
-  pkgs,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
+  xorg,
   lib,
-}: let
-  inherit (pkgs) darwin fetchFromGitHub rustPlatform stdenv xorg;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "clipboard-substitutor";
-    version = "0.7.7";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "clipboard-substitutor";
+  version = "0.7.7";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "clipboard-substitutor";
-      rev = "v${version}";
-      hash = "sha256-WSvSDZJ2SOtE68BHv7IINieVgblfWdpNrurFH7+83aI=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "clipboard-substitutor";
+    rev = "v${version}";
+    hash = "sha256-WSvSDZJ2SOtE68BHv7IINieVgblfWdpNrurFH7+83aI=";
+  };
 
-    buildFeatures = lib.optionals stdenv.isLinux ["journald"];
-    cargoHash = "sha256-iYSR7dXrEU0VasCzmkA0lSW6Wj5t8o3uF4oVIc8chy8=";
+  buildFeatures = lib.optionals stdenv.isLinux ["journald"];
+  cargoHash = "sha256-iYSR7dXrEU0VasCzmkA0lSW6Wj5t8o3uF4oVIc8chy8=";
 
-    useNextest = true;
+  useNextest = true;
 
-    buildInputs =
-      lib.optionals stdenv.isDarwin [
-        darwin.apple_sdk.frameworks.AppKit
-      ]
-      ++ lib.optionals stdenv.isLinux [
-        xorg.libxcb
-      ];
+  buildInputs =
+    lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.AppKit
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      xorg.libxcb
+    ];
 
-    meta = with lib; {
-      description = "CLI to listen to clipboard events and perform operations on the copied text";
-      homepage = "https://github.com/msfjarvis/clipboard-substitutor";
-      license = with licenses; [asl20 mit];
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "clipboard-substitutor";
-    };
-  }
+  meta = with lib; {
+    description = "CLI to listen to clipboard events and perform operations on the copied text";
+    homepage = "https://github.com/msfjarvis/clipboard-substitutor";
+    license = with licenses; [asl20 mit];
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "clipboard-substitutor";
+  };
+}

packages/diffuse-bin/default.nix

@@ -1,34 +1,33 @@
 {
-  pkgs,
+  stdenvNoCC,
+  fetchurl,
   lib,
-}: let
-  inherit (pkgs) stdenvNoCC fetchurl;
-in
-  stdenvNoCC.mkDerivation rec {
-    pname = "diffuse-bin";
-    version = "0.1.0";
-    src = fetchurl {
-      url = "https://github.com/JakeWharton/diffuse/releases/download/${version}/diffuse-${version}-binary.jar";
-      hash = "sha256-YNYZNzxGpdBrgSbB1h4K3Bi3Lyy7kkXvkg0zh+RLhs8=";
-    };
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "diffuse-bin";
+  version = "0.1.0";
+  src = fetchurl {
+    url = "https://github.com/JakeWharton/diffuse/releases/download/${finalAttrs.version}/diffuse-${finalAttrs.version}-binary.jar";
+    hash = "sha256-YNYZNzxGpdBrgSbB1h4K3Bi3Lyy7kkXvkg0zh+RLhs8=";
+  };
 
-    dontUnpack = true;
-    dontBuild = true;
-    dontConfigure = true;
+  dontUnpack = true;
+  dontBuild = true;
+  dontConfigure = true;
 
-    installPhase = ''
-      mkdir -p $out/bin
-      printf "#!/bin/sh\n\nexec java \$JAVA_OPTS -jar \$0 \"\$@\"\n" > $out/bin/diffuse
-      cat $src >> $out/bin/diffuse
-      chmod +x $out/bin/diffuse
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    printf "#!/bin/sh\n\nexec java \$JAVA_OPTS -jar \$0 \"\$@\"\n" > $out/bin/diffuse
+    cat $src >> $out/bin/diffuse
+    chmod +x $out/bin/diffuse
+  '';
 
-    meta = with lib; {
-      description = "Diffuse is a tool for diffing APKs, AABs, AARs, and JARs";
-      homepage = "https://github.com/jakewharton/diffuse";
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "diffuse";
-    };
-  }
+  meta = with lib; {
+    description = "Diffuse is a tool for diffing APKs, AABs, AARs, and JARs";
+    homepage = "https://github.com/jakewharton/diffuse";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "diffuse";
+  };
+})

packages/gdrive/default.nix

@@ -1,29 +1,28 @@
 {
-  pkgs,
+  buildGoModule,
+  fetchFromGitHub,
   lib,
-}: let
-  inherit (pkgs) buildGoModule fetchFromGitHub;
-in
-  buildGoModule rec {
-    pname = "gdrive";
-    version = "3.0.13";
+}:
+buildGoModule rec {
+  pname = "gdrive";
+  version = "3.0.13";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "gdrive";
-      rev = "v${version}";
-      hash = "sha256-FFNgMV3gPQ2p1ilYK+t10UgcNF/knO/PVM3Zw/VSSGw=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "gdrive";
+    rev = "v${version}";
+    hash = "sha256-FFNgMV3gPQ2p1ilYK+t10UgcNF/knO/PVM3Zw/VSSGw=";
+  };
 
-    vendorHash = "sha256-WibiLYMeWR63Q8lu287jeczT0n0/lh6T8PfOH7eJh8Q=";
+  vendorHash = "sha256-WibiLYMeWR63Q8lu287jeczT0n0/lh6T8PfOH7eJh8Q=";
 
-    ldflags = ["-s" "-w"];
+  ldflags = ["-s" "-w"];
 
-    meta = with lib; {
-      description = "Google Drive CLI Client";
-      homepage = "https://github.com/msfjarvis/gdrive";
-      license = licenses.mit;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "gdrive";
-    };
-  }
+  meta = with lib; {
+    description = "Google Drive CLI Client";
+    homepage = "https://github.com/msfjarvis/gdrive";
+    license = licenses.mit;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "gdrive";
+  };
+}

packages/gitice/default.nix

@@ -1,11 +1,12 @@
 {
   pkgs,
+  fetchFromGitHub,
+  makeRustPlatform,
   lib,
   inputs,
 }: let
-  inherit (pkgs) fetchFromGitHub makeRustPlatform;
-  inherit (inputs) rust-manifest;
-  inherit ((import inputs.fenix {inherit pkgs;})) fromManifestFile;
+  inherit (inputs) fenix rust-manifest;
+  inherit ((import fenix {inherit pkgs;})) fromManifestFile;
 
   toolchain = (fromManifestFile rust-manifest).minimalToolchain;
 in

packages/gitout/default.nix

@@ -1,45 +1,51 @@
 {
-  pkgs,
+  rustPlatform,
+  fetchFromGitHub,
+  perl,
+  pkg-config,
+  libgit2,
+  openssl,
+  zlib,
+  stdenv,
+  darwin,
   lib,
-}: let
-  inherit (pkgs) rustPlatform fetchFromGitHub perl pkg-config libgit2 openssl zlib stdenv darwin;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "gitout";
-    version = "0.2.2";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "gitout";
+  version = "0.2.2";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "gitout";
-      rev = "v${version}";
-      hash = "sha256-lUai0pqLsRxAB+aH0dO6d66f4ccHGPRsRPWUWPA0i3w=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "gitout";
+    rev = "v${version}";
+    hash = "sha256-lUai0pqLsRxAB+aH0dO6d66f4ccHGPRsRPWUWPA0i3w=";
+  };
 
-    cargoHash = "sha256-ZTmf98OUdlIwPFPFVrgJa+VV7BIxZuwekuFiF8vOQKo=";
+  cargoHash = "sha256-ZTmf98OUdlIwPFPFVrgJa+VV7BIxZuwekuFiF8vOQKo=";
 
-    PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig";
+  PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig";
 
-    nativeBuildInputs = [
-      perl
-      pkg-config
+  nativeBuildInputs = [
+    perl
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      libgit2
+      openssl
+      zlib
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Security
     ];
 
-    buildInputs =
-      [
-        libgit2
-        openssl
-        zlib
-      ]
-      ++ lib.optionals stdenv.isDarwin [
-        darwin.apple_sdk.frameworks.Security
-      ];
-
-    meta = with lib; {
-      description = "A command-line tool and Docker image to automatically backup Git repositories from GitHub or anywhere";
-      homepage = "https://github.com/msfjarvis/gitout";
-      changelog = "https://github.com/msfjarvis/gitout/blob/${src.rev}/CHANGELOG.md";
-      license = licenses.mit;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "gitout";
-    };
-  }
+  meta = with lib; {
+    description = "A command-line tool and Docker image to automatically backup Git repositories from GitHub or anywhere";
+    homepage = "https://github.com/msfjarvis/gitout";
+    changelog = "https://github.com/msfjarvis/gitout/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "gitout";
+  };
+}

packages/gphotos-cdp/default.nix

@@ -1,29 +1,28 @@
 {
-  pkgs,
+  buildGoModule,
+  fetchFromGitHub,
   lib,
-}: let
-  inherit (pkgs) buildGoModule fetchFromGitHub;
-in
-  buildGoModule rec {
-    pname = "gphotos-cdp";
-    version = "1.0.0";
+}:
+buildGoModule rec {
+  pname = "gphotos-cdp";
+  version = "1.0.0";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "gphotos-cdp";
-      rev = "4262092a2fe585f4b66bd50bd4c235e8f24824f6";
-      hash = "sha256-xLCldbD37JEDQTwFSUqiEOM09vH+KaB/I8O3WoNqR6A=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "gphotos-cdp";
+    rev = "4262092a2fe585f4b66bd50bd4c235e8f24824f6";
+    hash = "sha256-xLCldbD37JEDQTwFSUqiEOM09vH+KaB/I8O3WoNqR6A=";
+  };
 
-    vendorHash = "sha256-FzGDVMKzAjISb4P7/vBIBTbBWpyAUnR26gXcvUWnjHw=";
+  vendorHash = "sha256-FzGDVMKzAjISb4P7/vBIBTbBWpyAUnR26gXcvUWnjHw=";
 
-    ldflags = ["-s" "-w"];
+  ldflags = ["-s" "-w"];
 
-    meta = with lib; {
-      description = "This program uses the Chrome DevTools Protocol to drive a Chrome session that downloads your photos stored in Google Photos";
-      homepage = "https://github.com/msfjarvis/gphotos-cdp";
-      license = licenses.asl20;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "gphotos-cdp";
-    };
-  }
+  meta = with lib; {
+    description = "This program uses the Chrome DevTools Protocol to drive a Chrome session that downloads your photos stored in Google Photos";
+    homepage = "https://github.com/msfjarvis/gphotos-cdp";
+    license = licenses.asl20;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "gphotos-cdp";
+  };
+}

packages/hcctl/default.nix

@@ -1,35 +1,36 @@
 {
-  pkgs,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
   lib,
-}: let
-  inherit (pkgs) darwin fetchFromGitHub rustPlatform stdenv;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "hcctl";
-    version = "2.0.8";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "hcctl";
+  version = "2.0.8";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "healthchecks-rs";
-      rev = "hcctl-v${version}";
-      hash = "sha256-A83pzY+c4kz59tHEc6hRd0Zp8Uj96KdrenD9RDWwavQ=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "healthchecks-rs";
+    rev = "hcctl-v${version}";
+    hash = "sha256-A83pzY+c4kz59tHEc6hRd0Zp8Uj96KdrenD9RDWwavQ=";
+  };
 
-    buildInputs =
-      lib.optionals stdenv.isDarwin
-      [darwin.apple_sdk.frameworks.Security];
+  buildInputs =
+    lib.optionals stdenv.isDarwin
+    [darwin.apple_sdk.frameworks.Security];
 
-    buildAndTestSubdir = "hcctl";
+  buildAndTestSubdir = "hcctl";
 
-    cargoHash = "sha256-v8mpH1akao35P8ePFTFLBidkPW+vzsaMg4h51TudYMM=";
+  cargoHash = "sha256-v8mpH1akao35P8ePFTFLBidkPW+vzsaMg4h51TudYMM=";
 
-    useNextest = true;
+  useNextest = true;
 
-    meta = with lib; {
-      description = "Simple CLI tool to keep a track of your https://healthchecks.io account";
-      homepage = "https://msfjarvis.dev/g/healthchecks-rs";
-      license = with licenses; [asl20 mit];
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "hcctl";
-    };
-  }
+  meta = with lib; {
+    description = "Simple CLI tool to keep a track of your https://healthchecks.io account";
+    homepage = "https://msfjarvis.dev/g/healthchecks-rs";
+    license = with licenses; [asl20 mit];
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "hcctl";
+  };
+}

packages/katbin/default.nix

@@ -1,34 +1,35 @@
 {
-  pkgs,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
   lib,
-}: let
-  inherit (pkgs) darwin fetchFromGitHub rustPlatform stdenv;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "katbin-cli";
-    version = "1.3.15";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "katbin-cli";
+  version = "1.3.15";
 
-    src = fetchFromGitHub {
-      owner = "SphericalKat";
-      repo = "katbin-cli";
-      rev = "v${version}";
-      hash = "sha256-MGYzh5OBNPy2e+RVSppA7a1+cixyaxMwXeOuRV9aFmg=";
-    };
+  src = fetchFromGitHub {
+    owner = "SphericalKat";
+    repo = "katbin-cli";
+    rev = "v${version}";
+    hash = "sha256-MGYzh5OBNPy2e+RVSppA7a1+cixyaxMwXeOuRV9aFmg=";
+  };
 
-    cargoHash = "sha256-Wbcw2eMD2OtL7qp8XL2Ri60yuyisiQRatY77egtEKlg=";
+  cargoHash = "sha256-Wbcw2eMD2OtL7qp8XL2Ri60yuyisiQRatY77egtEKlg=";
 
-    doCheck = false;
+  doCheck = false;
 
-    buildInputs = lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.Security
-    ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
 
-    meta = with lib; {
-      description = "A CLI for katbin";
-      homepage = "https://github.com/SphericalKat/katbin-cli";
-      changelog = "https://github.com/SphericalKat/katbin-cli/blob/${src.rev}/CHANGELOG.md";
-      license = with licenses; [asl20 mit];
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "katbin";
-    };
-  }
+  meta = with lib; {
+    description = "A CLI for katbin";
+    homepage = "https://github.com/SphericalKat/katbin-cli";
+    changelog = "https://github.com/SphericalKat/katbin-cli/blob/${src.rev}/CHANGELOG.md";
+    license = with licenses; [asl20 mit];
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "katbin";
+  };
+}

packages/linkleaner/default.nix

@@ -1,11 +1,14 @@
 {
   pkgs,
+  fetchFromGitHub,
+  makeRustPlatform,
+  stdenv,
+  darwin,
   lib,
   inputs,
 }: let
-  inherit (pkgs) fetchFromGitHub makeRustPlatform stdenv darwin;
-  inherit (inputs) rust-manifest;
-  inherit ((import inputs.fenix {inherit pkgs;})) fromManifestFile;
+  inherit (inputs) fenix rust-manifest;
+  inherit ((import fenix {inherit pkgs;})) fromManifestFile;
 
   toolchain = (fromManifestFile rust-manifest).minimalToolchain;
 in

packages/monocraft-nerdfonts/default.nix

@@ -1,31 +1,30 @@
 {
-  pkgs,
+  stdenvNoCC,
+  fetchurl,
   lib,
-}: let
-  inherit (pkgs) stdenvNoCC fetchurl;
-in
-  stdenvNoCC.mkDerivation rec {
-    pname = "monocraft-nerdfonts";
-    version = "3.0";
-    src = fetchurl {
-      url = "https://github.com/IdreesInc/Monocraft/releases/download/v${version}/Monocraft-nerd-fonts-patched.ttf";
-      hash = "sha256-QxMp8UwcRjWySNHWoNeX2sX9teZ4+tCFj+DG41azsXw=";
-    };
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "monocraft-nerdfonts";
+  version = "3.0";
+  src = fetchurl {
+    url = "https://github.com/IdreesInc/Monocraft/releases/download/v${finalAttrs.version}/Monocraft-nerd-fonts-patched.ttf";
+    hash = "sha256-QxMp8UwcRjWySNHWoNeX2sX9teZ4+tCFj+DG41azsXw=";
+  };
 
-    dontUnpack = true;
-    dontBuild = true;
-    dontConfigure = true;
+  dontUnpack = true;
+  dontBuild = true;
+  dontConfigure = true;
 
-    installPhase = ''
-      mkdir -p $out/share/fonts/truetype/
-      cat $src > $out/share/fonts/truetype/Monocraft-nerdfonts.ttf
-    '';
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype/
+    cat $src > $out/share/fonts/truetype/Monocraft-nerdfonts.ttf
+  '';
 
-    meta = with lib; {
-      description = "A monospaced programming font inspired by the Minecraft typeface";
-      homepage = "https://github.com/IdreesInc/Monocraft";
-      license = licenses.ofl;
-      platforms = platforms.all;
-      maintainers = with maintainers; [msfjarvis];
-    };
-  }
+  meta = with lib; {
+    description = "A monospaced programming font inspired by the Minecraft typeface";
+    homepage = "https://github.com/IdreesInc/Monocraft";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [msfjarvis];
+  };
+})

packages/patreon-dl/default.nix

@@ -1,29 +1,28 @@
 {
-  pkgs,
+  buildGoModule,
+  fetchFromGitHub,
   lib,
-}: let
-  inherit (pkgs) buildGoModule fetchFromGitHub;
-in
-  buildGoModule {
-    pname = "patreon-dl";
-    version = "1.0.2";
+}:
+buildGoModule {
+  pname = "patreon-dl";
+  version = "1.0.2";
 
-    src = fetchFromGitHub {
-      owner = "PrivateGER";
-      repo = "patreon-dl";
-      rev = "1db8b378af8c889d841036b2eaf6cb2461011ee8";
-      hash = "sha256-CiMR6mb6PKj9enO4nDm959MxdQNo0UMo5nif6x37UBE=";
-    };
+  src = fetchFromGitHub {
+    owner = "PrivateGER";
+    repo = "patreon-dl";
+    rev = "1db8b378af8c889d841036b2eaf6cb2461011ee8";
+    hash = "sha256-CiMR6mb6PKj9enO4nDm959MxdQNo0UMo5nif6x37UBE=";
+  };
 
-    vendorHash = "sha256-6Y8SmgH5SFvkw3YQh8SlSktJsctped8as1FCdIc4FQc=";
+  vendorHash = "sha256-6Y8SmgH5SFvkw3YQh8SlSktJsctped8as1FCdIc4FQc=";
 
-    ldflags = ["-s" "-w"];
+  ldflags = ["-s" "-w"];
 
-    meta = with lib; {
-      description = "A Patreon Image Downloader";
-      homepage = "https://github.com/PrivateGER/patreon-dl";
-      license = licenses.unlicense;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "patreon-dl";
-    };
-  }
+  meta = with lib; {
+    description = "A Patreon Image Downloader";
+    homepage = "https://github.com/PrivateGER/patreon-dl";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "patreon-dl";
+  };
+}

packages/pidcat/default.nix

@@ -1,38 +1,36 @@
 {
-  pkgs,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenvNoCC,
   lib,
-}: let
-  inherit (pkgs) fetchFromGitHub installShellFiles stdenvNoCC;
-in
-  stdenvNoCC.mkDerivation rec {
-    pname = "pidcat";
-    version = "2.2.0";
-    # I already fixed it in the source
-    dontPatchShebangs = 1;
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pidcat";
+  version = "2.2.0";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "pidcat";
-      rev = "v${version}";
-      hash = "sha256-VOIND2CzWo+LV84C+FbTC0r3FqY7VpBaWn95IKTYFT8=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "pidcat";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VOIND2CzWo+LV84C+FbTC0r3FqY7VpBaWn95IKTYFT8=";
+  };
 
-    nativeBuildInputs = [installShellFiles];
+  nativeBuildInputs = [installShellFiles];
 
-    postInstall = ''
-      installShellCompletion --bash bash_completion.d/pidcat
-    '';
+  postInstall = ''
+    installShellCompletion --bash bash_completion.d/pidcat
+  '';
 
-    installPhase = ''
-      install -m755 -D pidcat.py $out/bin/pidcat
-    '';
+  installPhase = ''
+    install -m755 -D pidcat.py $out/bin/pidcat
+  '';
 
-    meta = with lib; {
-      homepage = "https://github.com/JakeWharton/pidcat";
-      description = "pidcat - colored logcat script";
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "pidcat";
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/JakeWharton/pidcat";
+    description = "pidcat - colored logcat script";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "pidcat";
+  };
+})

packages/piv-agent/default.nix

@@ -1,33 +1,34 @@
 {
-  pkgs,
+  buildGoModule,
+  fetchFromGitHub,
+  pcsclite,
+  pkg-config,
   lib,
-}: let
-  inherit (pkgs) buildGoModule fetchFromGitHub pcsclite pkg-config;
-in
-  buildGoModule rec {
-    pname = "piv-agent";
-    version = "0.21.0";
+}:
+buildGoModule rec {
+  pname = "piv-agent";
+  version = "0.21.0";
 
-    src = fetchFromGitHub {
-      owner = "smlx";
-      repo = "piv-agent";
-      rev = "v${version}";
-      hash = "sha256-aukcnubhB8kbAl22eeFKzLPvVcYdgcEQ1gy3n6KWG00=";
-    };
+  src = fetchFromGitHub {
+    owner = "smlx";
+    repo = "piv-agent";
+    rev = "v${version}";
+    hash = "sha256-aukcnubhB8kbAl22eeFKzLPvVcYdgcEQ1gy3n6KWG00=";
+  };
 
-    buildInputs = [pcsclite];
+  buildInputs = [pcsclite];
 
-    nativeBuildInputs = [pkg-config];
+  nativeBuildInputs = [pkg-config];
 
-    vendorHash = "sha256-1d6EKEvo4XNDXRtbdnKkqyF9y0LPPHWKu9X/wYnbmas=";
+  vendorHash = "sha256-1d6EKEvo4XNDXRtbdnKkqyF9y0LPPHWKu9X/wYnbmas=";
 
-    ldflags = ["-s" "-w"];
+  ldflags = ["-s" "-w"];
 
-    meta = with lib; {
-      description = "An SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey";
-      homepage = "https://github.com/smlx/piv-agent";
-      license = licenses.asl20;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "piv-agent";
-    };
-  }
+  meta = with lib; {
+    description = "An SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey";
+    homepage = "https://github.com/smlx/piv-agent";
+    license = licenses.asl20;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "piv-agent";
+  };
+}

packages/rnnoise-plugin-slim/default.nix

@@ -9,14 +9,14 @@
   pkg-config,
   xorg,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rnnoise-plugin-slim";
   version = "1.03";
 
   src = fetchFromGitHub {
     owner = "werman";
     repo = "noise-suppression-for-voice";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-1DgrpGYF7G5Zr9vbgtKm/Yv0HSdI7LrFYPSGKYNnNDQ=";
   };
 
@@ -46,4 +46,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [msfjarvis];
   };
-}
+})

packages/rucksack/default.nix

@@ -1,30 +1,30 @@
 {
-  pkgs,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
   lib,
-}: let
-  inherit (pkgs) fetchFromGitHub rustPlatform stdenv;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "rucksack";
-    version = "1.1.1";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "rucksack";
+  version = "1.1.1";
 
-    src = fetchFromGitHub {
-      owner = "msfjarvis";
-      repo = "rucksack";
-      rev = "v${version}";
-      hash = "sha256-oZJGXR33SxvysrKTEz2ds0CwI3cjDYHJC7UWwOiq3g4=";
-    };
+  src = fetchFromGitHub {
+    owner = "msfjarvis";
+    repo = "rucksack";
+    rev = "v${version}";
+    hash = "sha256-oZJGXR33SxvysrKTEz2ds0CwI3cjDYHJC7UWwOiq3g4=";
+  };
 
-    buildFeatures = lib.optionals stdenv.isLinux ["journald"];
-    cargoHash = "sha256-Aijv7Zs/wbksRJsF2uMcLjdFjnxzhFcTAvy9kJi5cVI=";
+  buildFeatures = lib.optionals stdenv.isLinux ["journald"];
+  cargoHash = "sha256-Aijv7Zs/wbksRJsF2uMcLjdFjnxzhFcTAvy9kJi5cVI=";
 
-    useNextest = true;
+  useNextest = true;
 
-    meta = with lib; {
-      description = "Simple CLI tool to watch directories and move their files to a single dumping ground";
-      homepage = "https://github.com/msfjarvis/rucksack";
-      license = with licenses; [asl20 mit];
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "rucksack";
-    };
-  }
+  meta = with lib; {
+    description = "Simple CLI tool to watch directories and move their files to a single dumping ground";
+    homepage = "https://github.com/msfjarvis/rucksack";
+    license = with licenses; [asl20 mit];
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "rucksack";
+  };
+}

packages/when/default.nix

@@ -1,31 +1,30 @@
 {
-  pkgs,
+  fetchFromGitHub,
+  rustPlatform,
   lib,
-}: let
-  inherit (pkgs) fetchFromGitHub rustPlatform;
-in
-  rustPlatform.buildRustPackage rec {
-    pname = "when";
-    version = "0.4.0";
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "when";
+  version = "0.4.0";
 
-    src = fetchFromGitHub {
-      owner = "mitsuhiko";
-      repo = "when";
-      rev = version;
-      hash = "sha256-JvnvGD14VOXu0+xVMF4aQLvgOFLxNsebCSgKZLycHUw=";
-      fetchSubmodules = true;
-    };
+  src = fetchFromGitHub {
+    owner = "mitsuhiko";
+    repo = "when";
+    rev = version;
+    hash = "sha256-JvnvGD14VOXu0+xVMF4aQLvgOFLxNsebCSgKZLycHUw=";
+    fetchSubmodules = true;
+  };
 
-    cargoHash = "sha256-HhxAk5pLOpn2cRDoPkrxyV27n6IGAI2vkep9j3o275I=";
+  cargoHash = "sha256-HhxAk5pLOpn2cRDoPkrxyV27n6IGAI2vkep9j3o275I=";
 
-    useNextest = true;
+  useNextest = true;
 
-    meta = with lib; {
-      description = "Timezones from the command line";
-      homepage = "https://github.com/mitsuhiko/when";
-      changelog = "https://github.com/mitsuhiko/when/blob/${src.rev}/CHANGELOG.md";
-      license = licenses.asl20;
-      maintainers = with maintainers; [msfjarvis];
-      mainProgram = "when";
-    };
-  }
+  meta = with lib; {
+    description = "Timezones from the command line";
+    homepage = "https://github.com/mitsuhiko/when";
+    changelog = "https://github.com/mitsuhiko/when/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [msfjarvis];
+    mainProgram = "when";
+  };
+}