Add nix-ld and nix-index, update python venv template accordingly

common.nix

@@ -36,6 +36,19 @@
     home-manager
   ];
 
+  programs.nix-ld = {
+    enable = true;
+    libraries = with pkgs; [
+      stdenv.cc.cc
+      zlib
+      fuse3
+      icu
+      openssl
+      curl
+      expat
+    ];
+  };
+
   fonts.fontconfig.enable = true;
   programs.ssh.startAgent = true;
   programs.fish.enable = true;

home/collections/common/desktop.nix

@@ -8,6 +8,7 @@
     ../../env/bat.nix
     ../../env/direnv.nix
     ../../env/keychain.nix
+    ../../env/nix-index.nix
     ../../env/pypoetry.nix
     ../../env/starship.nix
     ../../terminal/wezterm.nix

home/env/bash.nix

@@ -11,4 +11,5 @@
   };
   programs.keychain.enableBashIntegration = true;
   programs.starship.enableBashIntegration = true;
+  programs.nix-index.enableBashIntegration = true;
 }

home/env/fish.nix

@@ -11,4 +11,5 @@
   };
   programs.keychain.enableFishIntegration = true;
   programs.starship.enableFishIntegration = true;
+  programs.nix-index.enableFishIntegration = true;
 }

home/env/nix-index.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.nix-index.enable = true;
+}

home/env/zsh.nix

@@ -16,4 +16,5 @@
   };
   programs.keychain.enableZshIntegration = true;
   programs.starship.enableZshIntegration = true;
+  programs.nix-index.enableZshIntegration = true;
 }

templates/venv.nix

@@ -1,15 +1,7 @@
 { pkgs ? import <nixpkgs> { }, python ? pkgs.python39, ... }:
-
-let
-  python-packages = ps: with ps; [
-    pip
-    setuptools
-    wheel
-  ];
-in
 pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
-    (python.withPackages python-packages)
+    (python.withPackages (ps: with ps; [ pip wheel ]))
     poetry
     black
     isort
@@ -18,8 +10,7 @@ pkgs.mkShell {
   ];
 
   shellHook = ''
-    export LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib/"
     [ -d .venv ] || python -m venv .venv
-    [ -d .venv ] && source .venv/bin/activate
+    source .venv/bin/activate
   '';
 }