Fixup minion setup

[dotfiles.git] / files / pc / bashrc

diff --git a/files/pc/bashrc b/files/pc/bashrc
index ecc33c27d8bad99c9eed2e2a84c55f556147dee6..96de07730b3ca517fe05fd9653cdf3cb7d7ad482 100644 (file)
--- a/files/pc/bashrc
+++ b/files/pc/bashrc
@@ -57,9 +57,11 @@ if [ -n "$force_color_prompt" ]; then
 fi
 
 if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+    # PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+    # PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+    PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
 fi
 unset color_prompt force_color_prompt
 
@@ -128,18 +130,29 @@ alias in="source $HOME/venv/invoke/bin/activate;cd $HOME/dotfiles/invoke"
 
 export PATH="$HOME/bin:$PATH"
 export PATH="$HOME/bin/platform-tools:$PATH"
+export PATH="$HOME/.cargo/bin:$PATH"
+if [ -f ~/dotfiles/bin/ml ]; then
+       export PATH="$HOME/dotfiles/bin:$PATH"
+fi
+
 export LUANTI_DATA="$HOME/.var/app/net.minetest.Minetest/.minetest"
 export LUANTI_RUN="flatpak run net.minetest.Minetest"
 
 ## Projects
 
+export EDITOR=/usr/bin/vim
+export SYSTEMD_EDITOR=/usr/bin/vim
 
 # GoLang
 export GOROOT=/home/edward/.go
 export PATH=$GOROOT/bin:$PATH
 
-source $HOME/envs/invoke/bin/activate
+# source $HOME/envs/invoke/bin/activate
 source $HOME/.env
 
+[[ -d $HOME/dotfiles/bin ]] && export PATH="$HOME/dotfiles/bin:$PATH"
+[[ -d $HOME/src/minion/bin ]] && export PATH="$HOME/src/minion/bin:$PATH"
+[[ -d $HOME/src/down-shift/bin ]] && export PATH="$HOME/src/down-shift/bin:$PATH"
+
 # from invoke --print-completion-script bash > ~/.invoke-complete.sh
 source $HOME/.invoke-complete.sh