Updates bashrc, aliasrc, i3 config, mpv config and vimrcHEADmaster

5 files changed, 27 insertions, 11 deletions

diff --git a/dot_bashrc b/dot_bashrc
index 938817e..4c6db13 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -18,6 +18,7 @@ export XDG_CACHE_HOME="$HOME"/.cache
 export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export ANDROID_HOME="$XDG_DATA_HOME"/android
+export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
 export HISTFILE="$XDG_STATE_HOME"/bash/history
 export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
 export PYTHONSTARTUP="$XDG_CONFIG_HOME"/python/pythonrc
@@ -25,12 +26,14 @@ export W3M_DIR="$XDG_DATA_HOME"/w3m
 export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
 export MYPY_CACHE_DIR="$XDG_CACHE_HOME"/mypy
+export CALCHISTFILE="$XDG_CACHE_HOME"/calc_history
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet
+export GDBHISTFILE="$XDG_CONFIG_HOME"/gdb/.gdb_history
 
 PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\w\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]" ; export PS1
 
 [ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc"
 
-# using echo because -bash, for exemple, would break figlet
-echo "$0" | figlet | lolcat -f -r -l -v 1 -h 1
-
-. "$HOME/.cargo/env"
+# Rust package manager
+. "$CARGO_HOME/env"
diff --git a/dot_config/aliasrc b/dot_config/aliasrc
index 22ec1e4..8acf451 100644
--- a/dot_config/aliasrc
+++ b/dot_config/aliasrc
@@ -25,3 +25,4 @@ alias mpv='mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)' \
 	ipa='ip -c a' \
 	wget='wget --hsts-file="$XDG_DATA_HOME"/wget-hsts' \
 	scd='echo "YOU USED SCD, BE CAREFUL" ; cd' \
+	adb='HOME="$XDG_DATA_HOME"/android adb' \
diff --git a/dot_config/i3/config b/dot_config/i3/config
index 1caf83b..084c199 100644
--- a/dot_config/i3/config
+++ b/dot_config/i3/config
@@ -40,8 +40,9 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# start a terminal
+# Two ways to start a terminal
 bindsym $mod+Return exec $TERMINAL
+bindsym Ctrl+Shift+Escape exec $TERMINAL
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -224,7 +225,7 @@ bindsym $mod+Shift+S exec "i3-nagbar -t warning -f fixed -m 'You pressed the sus
 bindsym $mod+Shift+Delete exec "i3-nagbar -t warning -f fixed -m 'You pressed the hibernating shortcut. Do you really want to put your computer to sleep?' -B 'Yes, do it.' 'sudo /bin/ZZZ'"
 
 # What happens when we hit the power button
-bindsym XF86PowerOff exec xcowsay "$(fortune -s)"
+bindsym XF86PowerOff exec xcowsay "$(date +%H:%M:%S && cat /sys/class/power_supply/BAT0/capacity && pactl get-sink-volume alsa_output.pci-0000_00_1f.3.analog-stereo | cut -d' '  -f5-6)"
 
 ######GAPS######
 set $mode_gaps Gaps: (o)uter, (i)nner, (h)orizontal, (v)ertical, (t)op, (r)ight, (b)ottom, (l)eft
@@ -363,7 +364,7 @@ bindsym XF86AudioNext exec playerctl next
 #bindsym XF86AudioPrev exec playerctl previous
 
 # Screenshot with scrot
-#bindsym Print exec notify-send -t 5000 -i /home/mas/Pictures/icons/screenshot.png "Launching" "<span color='cyan' font='26px'><b>scrot</b></span>" ; exec scrot --silent --exec 'mv $f ~/Pictures/screenshots && sxiv ~/Pictures/screenshots/$f'
+bindsym Print exec notify-send -t 5000 -i /home/mas/Pictures/icons/screenshot.png "Launching" "<span color='cyan' font='26px'><b>scrot</b></span>" ; exec scrot --silent --exec 'mv $f ~/Pictures/screenshots && sxiv ~/Pictures/screenshots/$f'
 
 # (C)hromium
 bindsym $mod+Shift+C exec notify-send -t 5000 -i /usr/share/icons/hicolor/256x256/apps/chromium.png "Opening" "<span color='#5D7FD2' font='26px'><b>chromium</b></span>" ; exec chromium
diff --git a/dot_config/mpv/mpv.conf b/dot_config/mpv/mpv.conf
index 0310c27..5cf8b77 100644
--- a/dot_config/mpv/mpv.conf
+++ b/dot_config/mpv/mpv.conf
@@ -1,5 +1,12 @@
 save-position-on-quit
+profile=high-quality
+video-sync=display-resample
+interpolation
+hwdec=auto
+
+[extension.gif]
+osc=no
+loop-file
 
 [pyradio]
 volume=100
-
diff --git a/dot_vimrc b/dot_vimrc
index a3bd846..be693c1 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -39,8 +39,8 @@ Plug 'itchyny/lightline.vim'
 Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
 
 call plug#end()
-"Ctrlp Settings {{{
 
+"Ctrlp Settings {{{
 let g:ctrlp_map = '<c-p>'
 
 let g:ctrlp_cmd = 'ctrlp'
@@ -51,7 +51,6 @@ set wildignore+=*/.git/*,*/tmp/*,*.swp/*,*/node_modules/*,*/temp/*,*/Builds/*,*/
 let g:ctrlp_max_files = 0
 " Search from current directory instead of project root
 
-
 function! CtrlPCommand()
   let c = 0
   let wincount = winnr('$')
@@ -75,6 +74,7 @@ let g:ctrlp_custom_ignore = {
       \ 'file': '\.so$\|\.dat$|\.DS_Store$|\.meta|\.zip|\.rar|\.ipa|\.apk',
       \ }
 " }}}
+
 "Ale Settings {{{
 
 let g:ale_echo_msg_error_str = 'E'
@@ -90,8 +90,8 @@ let g:ale_linters = {
       \  'java': ['javac']
       \ }
 " }}}
-" Deoplete {{{
 
+" Deoplete {{{
 let g:deoplete#enable_at_startup = 1
 
 let g:deoplete#custom#auto_complete_start_length = 2
@@ -129,6 +129,7 @@ let g:UltiSnipsSnippetDirectories = ['~/.vim/UltiSnips', 'UltiSnips']
 let g:UltiSnipsSnippetsDir="~/.vim/UltiSnips"
 
 " }}}
+
 " Java {{{
 
 " Easy compile java in vim
@@ -144,3 +145,6 @@ set termguicolors
 let g:Hexokinase_highlighters = ['virtual']
 let g:Hexokinase_optInPatterns = 'full_hex,rgb,rgba,hsl,hsla'
 " ]
+
+" Set the colorscheme
+colorscheme torte