Resolve conflicts

2 files changed, 35 insertions, 30 deletions

diff --git a/Shell/bash_aliases b/Shell/bash_aliases
index 3e60c1e..6dad212 100644
--- a/Shell/bash_aliases
+++ b/Shell/bash_aliases
@@ -1,11 +1,16 @@
 #if you wanna change timezone just copy one of /usr/share/zoneinfo/place to /etc/localtime
-# awesome perl echo 'one two three'| perl -lne 'print $2 if /one(.*)three/' 
 
-alias sp='spotify &e'
 
 #bauerbill
 alias bb='baurebill'
 
+alias mutt='neomutt'
+alias sp='spotify --force-device-scale-factor=2 &! exit'
+alias wa='chromium --app=https://web.whatsapp.com'
+alias serial='screen /dev/$(basename $(ls /dev/ttyAC*|tail -1)) 9600n'
+
+# bauerbill
+alias bb='bb-wrapper'
 #ip
 alias ip='ip -c'
 
@@ -17,8 +22,9 @@ alias ,.='!!'
 
 # mpv 
 alias mpvl='mpv --ytdl-format=43'
+alias mpvh='mpv --ytdl-format=137+251'
+alias mpv="mpv --ytdl-format 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'"
 
-#Micrcontroller 
 alias serial='micronucleus --run ~/Sync/Programming/serial.hex'
 
 alias yt='mpsyt'
@@ -30,10 +36,7 @@ alias remouse='sudo modprobe -r bcm5974'
 alias enmouse='sudo modprobe bcm5974 && ~/bin/mousefix'
 
 # Notes
-alias physics='vim ~/Sync/Notes/Physics/physics.txt'
-alias chemistry='vim ~/Sync/Notes/Chemistry/chemistry.txt'
-alias english='vim ~/Sync/Notes/English/english.txt'
-alias swedish='vim ~/Sync/Notes/Swedish/swedish.txt'
+alias notes='cd ~/Sync/Notes/EE2'
 
 #quiet
 alias quiet='sudo hdparm -y /dev/sda'
@@ -60,7 +63,9 @@ alias py='python3'
 alias scan='iwlist wlp2s0 scan'
 alias connect='sudo iwconfig wlan0 essid'
 alias home='cd /home/vasko'
-alias l='ls'
+alias l='ls --color=auto'
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
 alias d='ls'
 alias dm='ls | more'
 alias n='clear'
@@ -77,7 +82,8 @@ alias o='less'
 alias g='wget'
 alias x='tar -xvzf'
 alias a='tar -cvzf'
-alias i='yaourt -S'
+alias i='bb -S'
+alias ia='bb -S --aur'
 alias p='sudo pacman -Rs'
 alias clean='sudo pacman -Rsn $(pacman -Qdtq)'
 alias t='optirun'
@@ -89,7 +95,7 @@ alias iso='dd if=/dev/cdrom of=~/cdrom_image.iso'
 alias tglxspheres='vblank_mode=0 optirun -vv /opt/VirtualGL/bin/glxspheres64'
 alias pglxspheres='vblank_mode=0 primusrun /opt/VirtualGL/bin/glxspheres64'
 alias httpserve='python -m SimpleHTTPServer'
-alias pi='ping -4 google.com'
+alias pi='ping -4 skozl.com'
 alias pl='ping 8.8.8.8'
 alias def='sdcv'
 
@@ -180,4 +186,3 @@ alias matb='vim ~/Sync/Notes/EE2/Mathematics-2b.md                       '
 alias matc='vim ~/Sync/Notes/EE2/Mathematics-2c.md                       '
 alias pow='vim ~/Sync/Notes/EE2/Power-Engineering.md                    '
 alias sig='vim ~/Sync/Notes/EE2/Signals-and-Linear-Systems.md           '
-
diff --git a/Shell/zshrc b/Shell/zshrc
index 6568d91..8cde6c1 100644
--- a/Shell/zshrc
+++ b/Shell/zshrc
@@ -9,7 +9,7 @@ zstyle ':completion:*' menu select
 #zstyle ':completion:*' format '%BCompleting %d%b'
 # End of lines configured by zsh-newuser-install
 # The following lines were added by compinstall
-zstyle :compinstall filename '/home/vasko/.zshrc'
+zstyle :compinstall filename '/home/vsz/.zshrc'
 
 autoload -Uz compinit
 compinit
@@ -27,7 +27,7 @@ export PATH="$HOME/bin:$PATH"
 export EDITOR="vim"
 export LD_LIBRARY_PATH=/usr/local/lib
 
-PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}☢ "
+PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}▶ "
 #RPROMPT="[%{$fg_no_bold[yellow]%}%?%{$reset_color%}]"
 
 
@@ -57,23 +57,23 @@ export ANDROID_HOME=/opt/android-sdk
 
 
 
-case $TERM in
-  (*rxvt*)
-
-    # Write some info to terminal title.
-    # This is seen when the shell prompts for input.
-    function precmd {
-    print -Pn "\e]0;%(1j,%j job%(2j|s|); ,)%1~\a"
-    #timeout --signal=KILL 1s ~/dotfiles/Panel/lemonbar/windows 
-    }
-    # Write command and args to terminal title.
-    # This is seen while the shell waits for a command to complete.
-    function preexec {
-    printf "\033]0;%s\a" "$1"
-    }
-
-  ;;
-esac
+#case $TERM in
+#  (*rxvt*)
+#
+#    # Write some info to terminal title.
+#    # This is seen when the shell prompts for input.
+#    function precmd {
+#    print -Pn "\e]0;%(1j,%j job%(2j|s|); ,)%1~\a"
+#    #timeout --signal=KILL 1s ~/dotfiles/Panel/lemonbar/windows 
+#    }
+#    # Write command and args to terminal title.
+#    # This is seen while the shell waits for a command to complete.
+#    function preexec {
+#    printf "\033]0;%s\a" "$1"
+#    }
+#
+#  ;;
+#esac
 
 ## Fancy sysinfo
 #~/bin/sysinfo