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

bash/.alias.sh

@@ -68,6 +68,9 @@ alias echo-server='npx http-echo-server'
 alias mountcalibre='sudo mount.cifs //10.10.1.11/books /mnt/calibre -o nobrl,user=mastermindzh,noperm,rw'
 alias xpid="xprop _NET_WM_PID | cut -d' ' -f3"
 alias clean-node-modules='find . -name "node_modules" -type d -print0 |xargs -0 rm -r --'
+alias nomachine='/usr/NX/bin/nxplayer'
+alias unlockuser='faillock --reset --user'
+alias npm-list-links='npm ls -g --depth=0 --link=true'
 
 # might be useful in demos...
 alias oopsie='fuck'

bash/.bashrc

@@ -1,3 +1,4 @@
+#!/bin/bash
 # if powerline-shell is available use it.
 function _update_ps1() {
     if hash powerline-rs 2>/dev/null; then
@@ -19,8 +20,14 @@ source ~/.variables
 sourceIfExists ~/lib/azure-cli/az.completion
 eval "$(thefuck --alias)"
 
-# evals
+# load keychain with private key
-eval $(keychain --eval --quiet ~/.ssh/id_rsa)
+if test -f "$HOME/.ssh/id_ed25519"; then
+    eval "$(keychain --eval --quiet ~/.ssh/id_ed25519)"
+else
+    # fallback to older rsa
+    eval "$(keychain --eval --quiet ~/.ssh/id_rsa)"
+fi
+
 eval "$(pyenv init -)"
 
 export NVM_DIR="$HOME/.nvm"
@@ -36,7 +43,7 @@ fi
 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

dependencies/aur.txt

@@ -1,4 +1,4 @@
-visual-studio-code-insiders
+visual-studio-code-bin
 i3blocks-contrib
 enpass-bin
 insync
@@ -17,3 +17,4 @@ notifyconf
 dotnet-host-bin
 sysmontask
 keychain
+nomachine

dependencies/pacman.txt

@@ -80,3 +80,10 @@ dotnet-sdk
 aspnet-runtime
 clamav
 clamtk
+keychain
+thefuck
+peek
+blueman
+pulseaudio-bluetooth
+bluez
+bluez-libs