aboutsummaryrefslogtreecommitdiff
path: root/.bashrc
diff options
context:
space:
mode:
authorJustine Smithies <justine@smithies.me.uk>2023-10-16 20:23:17 +0100
committerJustine Smithies <justine@smithies.me.uk>2023-10-16 20:23:17 +0100
commitc20025d016b684da31cf2947b42fd1196fb834a3 (patch)
tree29bdb7e80dd800c9249dd5a5ea406d232a9a2f7c /.bashrc
parent910e53dcde030c277b482458576f05880cdbf458 (diff)
Added zig 0.11.0 binary location to PATH variable
Diffstat (limited to '.bashrc')
-rw-r--r--.bashrc3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bashrc b/.bashrc
index eca502d..a01156c 100644
--- a/.bashrc
+++ b/.bashrc
@@ -79,9 +79,12 @@ export SSH_ASKPASS=~/.local/bin/ssh-askpass
export TERMINAL="foot"
export SAL_USE_VCLPLUGIN=gtk3
+<<<<<<< HEAD
# Path to Zig binary
export PATH=$PATH:~/Downloads/zig/zig-linux-x86_64-0.11.0/
+=======
+>>>>>>> parent of 632d6d0 (Added zig 0.11.0 binary location to PATH variable)
# Enable the use of ssh-agent
if ! pgrep -u "$USER" ssh-agent > /dev/null; then
ssh-agent -t 1h > "$XDG_RUNTIME_DIR/ssh-agent.env"