crates

home-manager/common-packages.nix

@@ -1,13 +1,14 @@
 { pkgs, ... }:
 let
-  customPkgs = import ../custom-pkgs/default.nix pkgs;
+  crates = import ../custom-pkgs/crates pkgs;
 in
 with pkgs; [
   bacon
   bat
+  cargo-cross
   cargo-expand
+  cargo-mommy
   cargo-nextest
-  customPkgs.cargo-mommy
   dig
   fzf
   gcc
@@ -18,9 +19,12 @@ with pkgs; [
   htop
   hyperfine
   inferno
+  jq
   p7zip
   python3
   ripgrep
   rustup-toolchain-install-master
   samply
-]
+  tokei
+  uwuify
+] ++ crates

home-manager/desktop.nix

@@ -31,7 +31,6 @@ in
 
   home.packages = with pkgs; [
     audacity
-    customPkgs.cargo-mommy
     customPkgs.cargo-bisect-rustc
     discord
     jetbrains.idea-ultimate
@@ -53,7 +52,7 @@ in
       g = "git";
     };
     shellAliases = {
-      x = "CARGO_MOMMYS_ACTUAL=${lib.getExe customPkgs.x} ${lib.getExe customPkgs.cargo-mommy}";
+      x = "CARGO_MOMMYS_ACTUAL=${lib.getExe customPkgs.x} ${lib.getExe' pkgs.cargo-mommy "cargo-mommy"}";
     };
   };