diff --git a/users/pbsds/home/profiles/bashrc.d/nix-shell.sh b/users/pbsds/home/profiles/bashrc.d/nix-shell.sh index e767f07..99b61e1 100644 --- a/users/pbsds/home/profiles/bashrc.d/nix-shell.sh +++ b/users/pbsds/home/profiles/bashrc.d/nix-shell.sh @@ -25,7 +25,7 @@ _ns() { cmd=("${cmd[@]:1}") if [[ ${#cmd[@]} -gt 0 ]]; then ( - _ns "$is_dev" "${args[@]}" + _ns false "${args[@]}" set -x "${cmd[@]}" ) @@ -106,7 +106,10 @@ _ns() { export XDG_DATA_DIRS="$storepath/share${XDG_DATA_DIRS:+":$XDG_DATA_DIRS"}" fi if [[ -d "$storepath/share/man" ]]; then - export MANPATH="$storepath/share/man${MANPATH:+":$MANPATH"}" + if [[ ! -v MANPATH ]] && command -v manpath >/dev/null; then + export MANPATH="$(manpath)" + fi + export MANPATH="$storepath/share/man:$MANPATH" fi if [[ -d "$storepath/share/pkgconfig" ]]; then export PKG_CONFIG_PATH="$storepath/share/pkgconfig${PKG_CONFIG_PATH:+":$PKG_CONFIG_PATH"}" diff --git a/users/pbsds/home/profiles/desktop/zed/remote.nix b/users/pbsds/home/profiles/desktop/zed/remote.nix index 28515a1..860de9c 100644 --- a/users/pbsds/home/profiles/desktop/zed/remote.nix +++ b/users/pbsds/home/profiles/desktop/zed/remote.nix @@ -9,9 +9,9 @@ unstable.package-version-server # Zed autodownloads this vscode-langservers-extracted # vscode-{css,eslint,html,json,markdown}-language-server taplo # toml lsp - gopls + gopls # TODO: requires 'go' in env, should i add it? pyright # (node) TODO: eww please figure out python-lsp-server! - rust-analyzer # TODO: ra-multiplex + rust-analyzer # TODO: ra-multiplex, TODO: requires rustc or rustup? glsl_analyzer ruff # simple-completion-language-server # theirs seem to work?