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

bash/.alias.sh

@@ -60,6 +60,8 @@ alias addpgpkey='gpg --recv-keys'
 alias clean-trash='sudo rm -rf ~/.local/share/Trash/*'
 alias clean-journal='sudo journalctl --vacuum-time=2d'
 alias clean-all='clean-trash && clean-journal && clean-pacmancache && docker-clean-all'
+alias dotnet-install='~/.dotnet-install.sh --install-dir /usr/share/dotnet/ -channel'
+alias mountshares='sudo bash ~/dotfiles/bash/mounts.sh'
 
 # cli tools
 alias crypto='curl -s rate.sx?qF | head -n -2 | tail -n +10'
@@ -92,6 +94,7 @@ alias sudo='sudo '
 alias markdown-toc='markdown-toc --bullets="-" -i'
 alias tree='tree --dirsfirst'
 alias handbrake='ghb'
+alias cal='cal -mw --color'
 
 # grub
 alias update-grub='grub-mkconfig -o /boot/grub/grub.cfg'

bash/.bashrc

@@ -5,13 +5,19 @@ function _update_ps1() {
     fi
 }
 
+# sourceIfExists
+function sourceIfExists () {
+    [[ -f "$1" ]] && source "$1"
+}
+
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 source ~/.alias
 source ~/.custom
 source ~/.variables
-source ~/lib/azure-cli/az.completion
+sourceIfExists ~/lib/azure-cli/az.completion
+eval "$(thefuck --alias)"
 
 # evals
 eval "$(pyenv init -)"
@@ -20,17 +26,11 @@ 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
 
 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

@@ -46,6 +46,16 @@ declare -A MOUNTS4=(
   [share]='isos'
   [mount]='isos'
 )
+declare -A MOUNTS5=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='books'
+  [mount]='books'
+)
+declare -A MOUNTS6=(
+  [server]="$MY_SERVER_LOCATION"
+  [share]='pictures'
+  [mount]='pictures'
+)
 
 # declare array with "objects"
 declare -n MOUNTS

computers/dev-pc/install.sh

@@ -2,4 +2,4 @@
 
 MYPATH="$PWD/computers/dev-pc"
 
-ln -sf "$MYPATH/xprofile.sh" ~/.xprofile
+ln -sf "$MYPATH/xprofile.sh" ~/.xprofile

computers/dev-pc/xprofile.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
-xrandr --output DVI-I-0 --off --output DVI-I-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1 --off --output DVI-D-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal
+#!/bin/sh
+xrandr --output DVI-I-0 --off --output DVI-I-1 --off --output HDMI-0 --off --output DP-0 --off --output DP-1 --off --output DVI-D-0 --primary --mode 1920x1080 --pos 0x0 --rotate normal

config/.gitconfig

@@ -12,3 +12,5 @@
 [core]
 	autocrlf = input
 	editor = nano
+[pull]
+	rebase = false

config/gtk-3.0/settings.ini

@@ -1,7 +1,7 @@
 gtk-application-prefer-dark-theme=0
 gtk-theme-name=Arc
 gtk-icon-theme-name=Numix
-gtk-font-name=System San Francisco Display 12
+gtk-font-name=Liberation Sans 12
 gtk-cursor-theme-name=Breeze
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
@@ -13,4 +13,4 @@ gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=rgb
+gtk-xft-rgba=rgb

config/picom.conf

@@ -0,0 +1,6 @@
+#################################
+#   Transparency / Opacity      #
+#################################
+
+# Opacity of inactive windows. (0.1 - 1.0)
+inactive-opacity = 1.0;

config/rofi

@@ -9,4 +9,4 @@ rofi.font: monospace 10
 
 rofi.terminal:             xfce4-terminal
 rofi.ssh-client:           ssh
-rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"
+rofi.ssh-command:          {terminal} -e "{ssh-client} {host}"

dependencies/aur.txt

@@ -1,15 +1,16 @@
-notify-osd-customizable
-notifyconf
+visual-studio-code-insiders
+i3blocks-contrib
 enpass-bin
 insync
-visual-studio-code-insiders
 ttf-font-awesome-4
 awesome-terminal-fonts-git
 otf-droid-sans-mono-powerline-git
 downgrade
+powerline-rs
 dive
 xorg-xev
 networkmanager-l2tp
 snapd
-i3blocks-contrib
 azure-cli
+notify-osd-customizable
+notifyconf

dependencies/pacman.txt

@@ -1,3 +1,4 @@
+base-devel
 xorg-server
 xorg-xinit
 mesa
@@ -9,6 +10,7 @@ scrot
 arandr
 chromium
 xfce4-terminal
+ttf-font-awesome
 sushi
 libconfig
 compton
@@ -26,7 +28,6 @@ python-pip
 gdm
 neofetch
 git
-networkmanager
 scrot
 acpi
 imagemagick
@@ -68,5 +69,13 @@ networkmanager-openvpn
 ranger
 w3m
 system-config-printer
-thunar
-thunar-archive-plugin
+nautilus 
+nautilus-share
+geany
+dotnet-host 
+dotnet-runtime
+dotnet-sdk
+aspnet-runtime
+wget
+pyenv
+jq

i3/config

@@ -34,8 +34,8 @@ set $workspace6 "6: "
 set $workspace7 "7: "
 set $workspace8 "8: "
 set $workspace9 "9: "
-set $workspace10 "10:  "
-set $workspace11 " Virtualbox" 
+set $workspace10 "10: "
+set $workspace11 " VM/Remote" 
 set $workspace12 " Enpass"
 
 # scripts
@@ -187,8 +187,7 @@ bindsym $mod+Shift+p move container to workspace $workspace12
 #    Appearance settings                   #
 ############################################
 # Set the default font
-#font pango:DejaVu Sans Mono 8
-font pango:System San Francisco Display 10
+font pango:Liberation sans 13
 
 # Bar decoration
 bar {
@@ -231,7 +230,6 @@ for_window [title="Tidal-hifi - settings"] floating enable
 ############################################
 assign [class="Franz"] $workspace9
 assign [class="Enpass-Desktop"] $workspace12
-assign [class="Enpass"] $workspace12
 assign [class="VirtualBox Machine"] $workspace11
 
 # database stuff
@@ -304,7 +302,7 @@ mode "$mode_gaps_outer" {
 #    Autorun                               #
 ############################################
 exec --no-startup-id i3-msg 'workspace $workspace2; exec xfce4-terminal' && i3-msg 'workspace $workspace1'
-exec 'enpass'
+exec --no-startup-id i3-msg 'workspace $workspace12; exec enpass'
 exec --no-startup-id nm-applet
 exec_always feh --bg-scale ~/Pictures/Wallpapers/wallpaper.jpg
 exec /usr/bin/compton

i3/i3blocks.conf

@@ -28,18 +28,11 @@ command=/usr/lib/i3blocks/$BLOCK_NAME/$BLOCK_NAME
 separator_block_width=15
 markup=none
 
-# Currently playing song
-[play_music]
-command=python ~/.config/i3/scripts/blocks/currentSong.py --layout t-A
-separator_block_width=13
-interval=1
-color=#e29e0b
-
 [tidal]
 command=bash ~/.config/i3/scripts/blocks/tidal.sh
 separator_block_width=13
 interval=1
-color=#4293f5
+color=#00ffff
 
 [weather]
 command=curl wttr.in?format=1

i3/scripts/blocks/temp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-temp=$(sensors | # execute sensors
+intelTemp=$(sensors | # execute sensors
 grep -w "Core 0:" | # grep for the first core
 sed 's/([^)]*)//g' | # filter
 tr -s " " | # remove whitespace
@@ -8,5 +8,13 @@ sed -e 's/Core 0\(.*\):/\1/' | #  get value between Core 0 and :
 cut -c 3- | rev | cut -c 7- | rev #remove clutter
 )
 
+amdTemp=$(sensors | grep -w "Tdie:" | sed 's/([^)]*)//g' | tr -s " " | cut -c 8- | rev | cut -c 6- | rev)
+
 # echo out the result
-echo $temp°C
+if [ -z "$intelTemp" ]
+then
+      echo $amdTemp
+else
+      echo $intelTemp°C
+fi
+

i3/scripts/startup.sh

@@ -6,3 +6,10 @@ insync start
 # Wait for the programs to start then remove attention (e.g red blinking)
 sleep 1
 wmctrl -r "Enpass" -b remove,demands_attention
+
+
+# Start gkraken if the command exists
+if command -v gkraken &> /dev/null
+then
+    gkraken --hide-window &
+fi

install.sh

@@ -62,8 +62,8 @@ function copyToDir {
 function install_fonts {
 	mkdir -p ~/.fonts
 	mkdir -p ~/.local/share/fonts
-	yes | cp -rf ./fonts/* ~/.fonts
-	yes | cp -rf ./fonts/* ~/.local/share/fonts
+	cp -rf ./fonts/* ~/.fonts
+	cp -rf ./fonts/* ~/.local/share/fonts
 }
 
 # install trizen, a aur helper
@@ -80,7 +80,7 @@ function install_config {
 
 	# link directories
 	linkDir "$PWD"/wallpapers ~/Pictures/Wallpapers
-	linkDir "$PWD"/i3/ ~/.config/i3
+	linkDir "$PWD"/i3 ~/.config/i3
 	linkDir "$PWD"/config/notify-osd/notify-osd ~/.notify-osd
 	linkDir "$PWD"/config/terminal/xfce4-term ~/.config/xfce4/terminal
 	linkDir "$PWD"/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/.config
@@ -88,6 +88,7 @@ function install_config {
 
 	# link user files
 	ln -sf "$PWD"/bash/.bashrc ~/.bashrc
+  	ln -sf "$PWD"/bash/.dotnet-install.sh ~/.dotnet-install.sh
 	ln -sf "$PWD"/bash/.alias.sh ~/.alias
 	ln -sf "$PWD"/config/nano/.nanorc ~/.nanorc
 	ln -sf "$PWD"/bash/.powerline-shell.json ~/.powerline-shell.json
@@ -99,6 +100,7 @@ function install_config {
 	ln -sf "$PWD"/config/user-dirs.dirs ~/.config/user-dirs.dirs
 	mkdir -p ~/.pulse
 	ln -sf "$PWD"/config/pulse/daemon.conf ~/.pulse/daemon.conf
+  ln -sf "$PWD"/config/picom.conf ~/.config/picom.conf
 
 	# link system files / directories
 	sudo ln -sf "$PWD"/config/package-managers/pacman.conf /etc/pacman.conf
@@ -117,7 +119,7 @@ function install_config {
 
 # Installs the dependencies on Arch Linux
 function install_dependencies {
-	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm --force -S
+	fileToList dependencies/pacman.txt | xargs sudo pacman --noconfirm -S
 
 	install_trizen
 	fileToList dependencies/aur.txt | xargs trizen --force -S --noconfirm
@@ -132,20 +134,6 @@ function install_dependencies {
 # User output functions
 # =======================================
 
-# list the dependencies file
-function list_dependencies {
-	echo ""
-	echo "=========================="
-	echo ""
-	cat dependencies/pacman.txt
-	cat dependencies/aur.txt
-	cat dependencies/pip.txt
-	cat dependencies/npm.txt
-	echo ""
-	echo "=========================="
-	echo ""
-}
-
 # Run the intro bit
 function intro {
 	echo "___  ___          _                      _           _     _     _ "
@@ -197,8 +185,7 @@ intro
 ask "Do you want to continue installing my config and rice?" Y &&
 
 # Ask for dependency installation
-list_dependencies
-if ask "Do you want to install the list of applications above? (might prompt for password)" Y; then
+if ask "Do you want to install the applications listen in ./dependencies? (might prompt for password)" Y; then
     install_dependencies
 fi
 
@@ -236,4 +223,4 @@ select opt in "$PWD/computers"/*; do
 done
 clear 
 
-echo "Enjoy using my rice! Do not forget to select i3 in GDM :)"
+echo "Enjoy using my rice! Do not forget to select i3 in GDM :)"