Cleanup a bit

[dotfiles.git] / files / pc / bashrc

diff --git a/files/pc/bashrc b/files/pc/bashrc
index ecc33c27d8bad99c9eed2e2a84c55f556147dee6..e2c3f840cdd4102d62a75705df7ab6fd72d49307 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
 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
 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
 
 fi
 unset color_prompt force_color_prompt
 


@@ -121,25 +123,30 @@ fi
 # eval "$(oh-my-posh --init --shell bash --config ~/oh-my-posh.omp.json)"
 
 # Call Windows apps from within Windows Subsystem for Linux
 # eval "$(oh-my-posh --init --shell bash --config ~/oh-my-posh.omp.json)"
 
 # Call Windows apps from within Windows Subsystem for Linux

-alias code="/mnt/c/Program\ Files/Microsoft\ VS\ Code/bin/code"
-alias clip="/mnt/c/Windows/system32/clip.exe"
-alias paste="/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe -noprofile -command Get-Clipboard"
-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/bin:$PATH"
 export PATH="$HOME/bin/platform-tools:$PATH"

+export PATH="$HOME/.cargo/bin:$PATH"
+

 export LUANTI_DATA="$HOME/.var/app/net.minetest.Minetest/.minetest"
 export LUANTI_RUN="flatpak run net.minetest.Minetest"
 
 ## Projects
 
 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
 
 
 # GoLang
 export GOROOT=/home/edward/.go
 export PATH=$GOROOT/bin:$PATH
 

-source $HOME/envs/invoke/bin/activate
-source $HOME/.env
+# source $HOME/envs/invoke/bin/activate
+
+[[ -f $HOME/.env ]] && 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
+[[ ! -f $HOME/.env ]] && $HOME/envs/invoke/bin/invoke --print-completion-script bash > ~/.invoke-complete.sh
+alias invoke='source $HOME/envs/invoke/bin/activate'

 source $HOME/.invoke-complete.sh
 source $HOME/.invoke-complete.sh