aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fischer <martin@push-f.com>2026-10-07 20:16:39 +0200
committerMartin Fischer <martin@push-f.com>2026-10-31 08:42:41 +0100
commitcf189a805acb008429cbf84b593fe6380a3bf700 (patch)
tree2f1d9353aa3ac2d11a10d735ea07b01fe7371703
parenta8e5624b71f753af2e986d0f0c62c6e982861e28 (diff)
tweak(workstation): remove global lang toolchains
They should be pinned in projects that need them.
-rwxr-xr-xinstall-imperative9
-rw-r--r--nixos/profiles/workstation/dev.nix9
-rw-r--r--nixos/profiles/workstation/pkgs/pi.nix3
3 files changed, 5 insertions, 16 deletions
diff --git a/install-imperative b/install-imperative
index dcf5bb7..12ebb25 100755
--- a/install-imperative
+++ b/install-imperative
@@ -1,14 +1,7 @@
#!/usr/bin/env bash
# This script installs software which I rather not manage via Nix.
-# E.g. typos and pyright are updated so frequently that nixpkgs is bound to be outdated.
-# While I could declaratively install them via their version and hash I don't care enough
-# (I just want the latest).
-
-rustup toolchain install stable
-rustup component add rust-analyzer
+# typos has new releases very frequently
cargo install typos-cli
-npm install -g pyright
-
android-studio installPlugins IdeaVIM com.intellij.plugins.watcher
diff --git a/nixos/profiles/workstation/dev.nix b/nixos/profiles/workstation/dev.nix
index 7d52322..4c986a1 100644
--- a/nixos/profiles/workstation/dev.nix
+++ b/nixos/profiles/workstation/dev.nix
@@ -9,14 +9,8 @@
};
environment.systemPackages = with pkgs; [
- rustup
- go
- python313
- nodejs_22
-
# CLI tools
docker-compose
- gnumake
pkgs-unstable.jujutsu
just
openssl
@@ -25,7 +19,6 @@
fastmod
license-generator
- gcc # rustc fails if cc linker isn't found
chromium
pkgs-unstable.zed-editor
@@ -34,8 +27,8 @@
platformio
# language servers
- # rust-analyzer is installed via rustup
nixd
+ rust-analyzer
# documentation
man-pages # Linux development manual pages
diff --git a/nixos/profiles/workstation/pkgs/pi.nix b/nixos/profiles/workstation/pkgs/pi.nix
index b055fb0..e5d1da6 100644
--- a/nixos/profiles/workstation/pkgs/pi.nix
+++ b/nixos/profiles/workstation/pkgs/pi.nix
@@ -1,7 +1,9 @@
{
bubblewrap,
coreutils,
+ lib,
pi-coding-agent,
+ python3,
symlinkJoin,
writeShellScriptBin,
}:
@@ -47,6 +49,7 @@ let
physical_pwd="$(${coreutils}/bin/pwd -P)"
exec ${sbox}/bin/sbox \
+ --setenv PATH "${lib.makeBinPath [ python3 ]}:$PATH" \
--setenv PI_CODING_AGENT_DIR "$HOME/.config/pi" \
--bind "$HOME/.config/pi" "$HOME/.config/pi" \
--bind "$physical_pwd" "$physical_pwd" \