diff --git a/users/pbsds/home/profiles/bashrc.d/clipboard.sh b/users/pbsds/home/profiles/bashrc.d/clipboard.sh index 2cb35c5..e8f64ac 100644 --- a/users/pbsds/home/profiles/bashrc.d/clipboard.sh +++ b/users/pbsds/home/profiles/bashrc.d/clipboard.sh @@ -6,7 +6,9 @@ if ! command -v wl-copy >/dev/null \ "${XDG_SESSION_TYPE-}" != "wayland" ]] then - alias clip="xclip -sel clip -i -rmlastnl -t text/plain"; + alias clip="xclip -sel clip -i -rmlastnl -t text/plain" + alias clip-prev-cmd="HISTTIMEFORMAT=, history 2 | cut -d, -f2- | head -n1 | xclip -sel clip -i -rmlastnl -t text/plain" else - alias clip="wl-copy --trim-newline --type text/plain"; + alias clip="wl-copy --trim-newline --type text/plain" + alias clip-prev-cmd="HISTTIMEFORMAT=, history 2 | cut -d, -f2- | head -n1 | wl-copy --trim-newline --type text/plain" fi diff --git a/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh b/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh index e71fc1d..cb23a45 100644 --- a/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh +++ b/users/pbsds/home/profiles/bashrc.d/zeditor-remote.sh @@ -87,7 +87,7 @@ zeditor-remote() { local zed_cmd="zeditor ${choice}" local ssh_cd_cmd=$( - rg <<<"$choice" '^ssh://([^/]*)/(~/.*)$' -r 'ssh -t "$1" "cd $2; $$SHELL -l"' ||: + rg <<<"$choice" '^ssh://([^/]*)/(~/.*)$' -r 'ssh -t "$1" "cd $2; \\$$SHELL -l"' ||: ) if [[ -n "$ssh_cd_cmd" ]] && gum confirm "SSH in there now?" --default=yes; then diff --git a/users/pbsds/home/profiles/desktop/zed/default.nix b/users/pbsds/home/profiles/desktop/zed/default.nix index 4d215a3..33aa30e 100644 --- a/users/pbsds/home/profiles/desktop/zed/default.nix +++ b/users/pbsds/home/profiles/desktop/zed/default.nix @@ -2,6 +2,7 @@ { home.shellAliases.atom = "zeditor"; + # home.shellAliases.zeditor-tail-logs = "tail -f ~/.local/share/zed/logs/Zed.log"; home.packages = [ # the rest are in ./remote.nix diff --git a/users/pbsds/home/profiles/desktop/zed/remote.nix b/users/pbsds/home/profiles/desktop/zed/remote.nix index 733869c..28515a1 100644 --- a/users/pbsds/home/profiles/desktop/zed/remote.nix +++ b/users/pbsds/home/profiles/desktop/zed/remote.nix @@ -16,14 +16,18 @@ ruff # simple-completion-language-server # theirs seem to work? + # needed by community plugins - nixd - nil - unstable.nixfmt-rfc-style - harper - typos-lsp + # bash-language-server # bash # TODO: bash.zed fetches this from npm + shellcheck # bash + shfmt # bash + nixd # nix + nil # nix + unstable.nixfmt-rfc-style # nix + harper # harper + typos-lsp # typos # I prefer these in shell.nix / virtual environments - # python3Packages.python-lsp-server + # python3Packages.python-lsp-server # pylsp ]; }