diff --git a/.config/neofetch/script.sh b/.config/neofetch/script.sh index a465838..2e96fb5 100755 --- a/.config/neofetch/script.sh +++ b/.config/neofetch/script.sh @@ -30,25 +30,131 @@ battery() { if [[ -f $PREFIX/bin/termux-battery-status ]]; then - percentage=`termux-battery-status | grep percentage | awk '{print $2}' | tr , '%'` + + perc=`termux-battery-status | grep percentage | awk '{print $2}' | tr , '%'` + #debug perc + #perc=9 status=`termux-battery-status | grep status | awk '{print $2}'` - lyw='\e[93m' - lgn='\e[92m' - df='\e[39m' + lrd="\e[91m" + lyw="\e[93m" + lgn="\e[92m" + df="\e[39m" - if [[ $status == '"CHARGING",' ]]; then + old() { - echo -e $lgn"$df : Charging, (${percentage})" + if [[ $status == '"CHARGING",' ]]; then - elif [[ $status == '"DISCHARGING",' ]]; then + echo -e $lgn"$df : Charging, (${perc})" - echo -e $lyw"$df : Discharging, (${percentage})" + elif [[ $status == '"DISCHARGING",' ]]; then - elif [[ $status == '"FULL"' ]]; then + echo -e $lyw"$df : Discharging, (${perc})" - echo -e $lgn"$df : Full, (${percentage})" + elif [[ $status == '"FULL"' ]]; then - fi + echo -e $lgn"$df : Full, (${perc})" + + fi + + } + + + new() { + + #Known bug : + # - Icon : 100% Battery on Discharging + # 3-9% Battery on Discharging + + #Discharging + + if [[ $perc < 21 && $status == '"DISCHARGING",' ]]; then + + echo -e $lrd"$df : Discharging, (${perc})" + + elif [[ $perc < 30, && $perc > 20 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 40 && $perc > 29 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 50 && $perc > 39 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 60 && $perc > 49 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 70 && $perc > 59 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 80 && $perc > 69 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 90 && $perc > 79 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc < 99, && $perc > 89 && $status == '"DISCHARGING",' ]]; then + + echo -e $lyw"$df : Discharging, (${perc})" + + elif [[ $perc == 100 && $status == '"DISCHARGING",' ]]; then + + echo -e $lgn"$df : Discharging, (${perc})" + + + #Charging + + elif [[ $perc < 21 && $perc > 2 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 30 && $perc > 20 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 40 && $perc > 29 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 50 && $perc > 39 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 60 && $perc > 49 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 70 && $perc > 59 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 80 && $perc > 69 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 90 && $perc > 79 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc < 99,5 && $perc > 89 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + elif [[ $perc == 100 && $status == '"CHARGING",' ]]; then + + echo -e $lgn"$df : Charging, (${perc})" + + fi + + } + + new else @@ -60,7 +166,7 @@ battery() { version() { - echo -e "neofetch output v.0.3.0" + echo -e "neofetch output v.0.3.0 pre" } diff --git a/.config/nvim/settings/keybinds.vim b/.config/nvim/settings/keybinds.vim index 8901a6b..b065328 100644 --- a/.config/nvim/settings/keybinds.vim +++ b/.config/nvim/settings/keybinds.vim @@ -65,8 +65,8 @@ nmap :set termguicolors vmap :set termguicolors imap :set termguicolors -" Ctrl+Alt+c Disable termguicolors -nmap :set notermguicolors -vmap :set notermguicolors -imap :set notermguicolors +" Ctrl+Alt+g Disable termguicolors +nmap :set notermguicolors +vmap :set notermguicolors +imap :set notermguicolors diff --git a/.config/nvim/settings/plugins.vim b/.config/nvim/settings/plugins.vim index 4fcfe37..20027d7 100644 --- a/.config/nvim/settings/plugins.vim +++ b/.config/nvim/settings/plugins.vim @@ -17,7 +17,7 @@ call plug#begin('~/.config/nvim/plugs') Plug 'jiangmiao/auto-pairs' " Statusline theme - Plug 'vim-airline/vim-airline' + "Plug 'vim-airline/vim-airline' "Plug 'itchyny/lightline.vim' " Better syntax highlighting diff --git a/.config/nvim/settings/sets.vim b/.config/nvim/settings/sets.vim index 4cb6051..b89f7cf 100644 --- a/.config/nvim/settings/sets.vim +++ b/.config/nvim/settings/sets.vim @@ -46,4 +46,6 @@ let NERDTreeShowHidden=1 " disable autocomment autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o -" search highlight dissapeared +" unset termguicolors / true color + +set notermguicolors diff --git a/.zshrc b/.zshrc index 9cddf6d..8464bd3 100644 --- a/.zshrc +++ b/.zshrc @@ -135,7 +135,7 @@ source $ZSH/oh-my-zsh.sh alias pipes2-slim="~/.color-toys/pipes2-slim" #System Information - alias neo="neofetch --ascii_distro android_small && colortest-slim" + alias neo="neofetch --ascii_distro android_small && panes" alias memory="bash ~/.config/neofetch/script.sh --storage" alias battery="bash ~/.config/neofetch/script.sh --battery" alias ls="exa --icons" @@ -157,6 +157,7 @@ source $ZSH/oh-my-zsh.sh alias nvimconf="nvim ~/.config/nvim/settings/sets.vim" alias nvimtheme="nvim ~/.config/nvim/settings/themes.vim" alias nvimkey="nvim ~/.config/nvim/settings/keybinds.vim" + alias nvimset="nvim ~/.config/nvim/settings/sets.vim" #zsh alias zshconf="nvim ~/.zshrc"