Merge branch 'master' of https://github.com/mastermindzh/dotfiles

bash/.bashrc

@@ -1,7 +1,7 @@
 # if powerline-shell is available use it.
 function _update_ps1() {
-    if hash powerline-shell 2>/dev/null; then
-        PS1=$(powerline-rs --shell bash $?)
+    if hash powerline-rs 2>/dev/null; then
+        PS1="$(powerline-rs --shell bash $?)"
     fi
 }
 
@@ -20,13 +20,20 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
+# Fix .netcore paths if dotnet is installed
+if hash dotnet 2>/dev/null; then
+    export DOTNET_ROOT=/opt/dotnet
+    export MSBuildSDKsPath=$DOTNET_ROOT/sdk/$(${DOTNET_ROOT}/dotnet --version)/Sdks
+    export PATH="${PATH}:${DOTNET_ROOT}:~/.dotnet/tools"
+fi
+
 #... :P fancy stuffs
 #screenfetch -t -A "UBUNTU"
 neofetch
 PS1='[\u@\h \W]\$ '
 
 if [[ $TERM != linux && ! $PROMPT_COMMAND =~ _update_ps1 ]]; then
-    PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
+   PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
 fi
 
 export PATH=$PATH:/home/mastermindzh/bin

bash/mounts.sh

@@ -41,6 +41,11 @@ declare -A MOUNTS3=(
   [share]='appdata'
   [mount]='appdata'
 )
+declare -A MOUNTS4=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='isos'
+  [mount]='isos'
+)
 
 # declare array with "objects"
 declare -n MOUNTS

i3/config

@@ -223,6 +223,7 @@ for_window [class="Pavucontrol"] floating enable
 for_window [class="Lxappearance"] floating enable
 for_window [class="Arandr"] floating enable
 for_window [class="Eog"] floating enable
+for_window [title="Tidal-hifi - settings"] floating enable
 
 ############################################
 #    Workspace specific tools              #