chore: clean up some packaging code

configurations/nos/modules/comics/jdownloader2/default.nix

@@ -12,6 +12,7 @@
       USER_ID = toString config.users.users.${mainUser}.uid;
       GROUP_ID = toString config.users.users.${mainUser}.uid;
       KEEP_APP_RUNNING = 1;
+      DARK_MODE = 1;
       TZ = "America/New_York";
     };
 

packages/fcft/default.nix

@@ -1,6 +1,8 @@
 {
-  fcft,
+  # nix build inputs
   fetchFromGitea,
+  # deps
+  fcft,
   ...
 }:
 fcft.overrideAttrs (o: rec {

packages/homepage/default.nix

@@ -1,6 +1,4 @@
 {
-  # params
-  enableLocalIcons ? true,
   # nix build inputs
   lib,
   stdenv,
@@ -10,6 +8,8 @@
   # deps
   nodejs,
   pnpm,
+  # params
+  enableLocalIcons ? true,
   ...
 }: let
   inherit (lib) getExe optionalString;

packages/komf/default.nix

@@ -1,8 +1,10 @@
 {
+  # nix build inputs
   lib,
   stdenv,
   fetchurl,
   makeWrapper,
+  # deps
   jre,
   ...
 }: let
@@ -43,7 +45,7 @@ in
       homepage = "https://github.com/Snd-R/komf";
       sourceProvenance = with lib.sourceTypes; [binaryBytecode];
       description = ''
-        komf is a tool that fetches metadata and thumbnails for your digital comic book library.
+        Komf is a tool that fetches metadata and thumbnails for your digital comic book library.
       '';
     };
   }

packages/nbted/default.nix

@@ -1,10 +1,10 @@
 {
+  # nix build inputs
   lib,
   rustPlatform,
   fetchFromGitHub,
   ...
-}:
+}: let
-rustPlatform.buildRustPackage rec {
   pname = "nbted";
   version = "1.5.0";
 
@@ -14,26 +14,29 @@ rustPlatform.buildRustPackage rec {
     tag = version;
     hash = "sha256-5gCxTFjI3WDC9+F9i4I2g17+wHWnQHjC4Hurj5CMhB4=";
   };
+in
+  rustPlatform.buildRustPackage {
+    inherit pname src version;
 
-  cargoLock.lockFile = "${src}/Cargo.lock";
+    cargoLock.lockFile = "${src}/Cargo.lock";
 
-  env.OUT_DIR = "$out";
+    env.OUT_DIR = "$out";
 
-  patchPhase = ''
+    patchPhase = ''
-    export OUT_DIR=$(mktemp -d)
+      export OUT_DIR=$(mktemp -d)
 
-    rm ./build.rs
+      rm ./build.rs
-    echo '"${version}"' > $OUT_DIR/git-revision.txt
+      echo '"${version}"' > $OUT_DIR/git-revision.txt
-    substituteInPlace ./Cargo.toml --replace-fail "build = \"build.rs\"" ""
+      substituteInPlace ./Cargo.toml --replace-fail "build = \"build.rs\"" ""
-  '';
-
-  meta = {
-    mainProgram = pname;
-    license = lib.licenses.cc0;
-    homepage = "https://github.com/C4K3/nbted";
-    description = ''
-      Command-line NBT editor written in Rust. It does precisely one thing: convert NBT files to
-      a pretty text format, and reverse the pretty text format back into NBT.
     '';
-  };
+
-}
+    meta = {
+      mainProgram = pname;
+      license = lib.licenses.cc0;
+      homepage = "https://github.com/C4K3/nbted";
+      description = ''
+        Command-line NBT editor written in Rust. It does precisely one thing: convert NBT files to
+        a pretty text format, and reverse the pretty text format back into NBT.
+      '';
+    };
+  }

packages/subscleaner/default.nix

@@ -1,4 +1,5 @@
 {
+  # nix build inputs
   lib,
   pkgs,
   poetry2nix,

packages/urllib3/default.nix

@@ -2,9 +2,9 @@
 {
   # nix build inputs
   lib,
-  fetchPypi,
-  # deps
   python3Packages,
+  fetchPypi,
+  ...
 }:
 python3Packages.buildPythonPackage rec {
   pname = "urllib3";