From 2766ffb0a6bf3af276e88544602100e06d1cf1e9 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 4 Mar 2018 20:27:49 +0000 Subject: [vim] Fix symlink problem --- arch/.gitignore | 3 ++ arch/additional-packages/PKGBUILD | 30 +++++++++++++ arch/archlinuxfr-packages/PKGBUILD | 5 +++ arch/base-packages/PKGBUILD | 86 ++++++++++++++++++++++++++++++++++++++ arch/local-packages/PKGBUILD | 7 ++++ arch/work-packages/PKGBUILD | 5 +++ i3/.config/i3blocks/bin/battery | 52 +++++++++++++---------- mutt/.mutt/colors/base.muttrc | 1 - pkgs/.gitignore | 3 -- pkgs/archlinuxfr-packages/PKGBUILD | 5 --- pkgs/base-packages/PKGBUILD | 22 ---------- pkgs/local-packages/PKGBUILD | 7 ---- pkgs/work-packages/PKGBUILD | 5 --- vim/.config/nvim | 1 - vim/.config/nvim/after | 1 + vim/.config/nvim/autoload | 1 + vim/.config/nvim/backup | 1 + vim/.config/nvim/compiler | 1 + vim/.config/nvim/ftplugin | 1 + vim/.config/nvim/indent | 1 + vim/.config/nvim/init.vim | 1 + vim/.config/nvim/mySnippets | 1 + vim/.config/nvim/plugged | 1 + vim/.config/nvim/spell | 1 + vim/.config/nvim/swap | 1 + vim/.config/nvim/undo | 1 + vim/.config/nvim/view | 1 + vim/.config/nvim/words | 1 + vim/.vim/init.vim | 1 - 29 files changed, 181 insertions(+), 66 deletions(-) create mode 100644 arch/.gitignore create mode 100644 arch/additional-packages/PKGBUILD create mode 100644 arch/archlinuxfr-packages/PKGBUILD create mode 100644 arch/base-packages/PKGBUILD create mode 100644 arch/local-packages/PKGBUILD create mode 100644 arch/work-packages/PKGBUILD delete mode 100644 pkgs/.gitignore delete mode 100644 pkgs/archlinuxfr-packages/PKGBUILD delete mode 100644 pkgs/base-packages/PKGBUILD delete mode 100644 pkgs/local-packages/PKGBUILD delete mode 100644 pkgs/work-packages/PKGBUILD delete mode 120000 vim/.config/nvim create mode 120000 vim/.config/nvim/after create mode 120000 vim/.config/nvim/autoload create mode 120000 vim/.config/nvim/backup create mode 120000 vim/.config/nvim/compiler create mode 120000 vim/.config/nvim/ftplugin create mode 120000 vim/.config/nvim/indent create mode 120000 vim/.config/nvim/init.vim create mode 120000 vim/.config/nvim/mySnippets create mode 120000 vim/.config/nvim/plugged create mode 120000 vim/.config/nvim/spell create mode 120000 vim/.config/nvim/swap create mode 120000 vim/.config/nvim/undo create mode 120000 vim/.config/nvim/view create mode 120000 vim/.config/nvim/words delete mode 120000 vim/.vim/init.vim diff --git a/arch/.gitignore b/arch/.gitignore new file mode 100644 index 0000000..7d16c28 --- /dev/null +++ b/arch/.gitignore @@ -0,0 +1,3 @@ +*/pkg +*/src +*.tar.xz diff --git a/arch/additional-packages/PKGBUILD b/arch/additional-packages/PKGBUILD new file mode 100644 index 0000000..936974b --- /dev/null +++ b/arch/additional-packages/PKGBUILD @@ -0,0 +1,30 @@ +# yaourt -P && makepkg -i +pkgname=base-packages +pkgver=0 +pkgrel=1 +arch=(any) +depends=(biber + cmus + cpulimit + flake8 + gnuplot + mencoder + ncmpcpp + nmap + npm + pandoc + python-matplotlib + python2-matplotlib + qemu + texlive-bibtexextra + texlive-fontsextra + texlive-formatsextra + texlive-games + texlive-humanities + texlive-latexextra + texlive-pictures + texlive-pstricks + texlive-publishers + texlive-science + tig + ttf-ubuntu-font-family) diff --git a/arch/archlinuxfr-packages/PKGBUILD b/arch/archlinuxfr-packages/PKGBUILD new file mode 100644 index 0000000..da4c54f --- /dev/null +++ b/arch/archlinuxfr-packages/PKGBUILD @@ -0,0 +1,5 @@ +pkgname=archlinuxfr-packages +pkgver=0 +pkgrel=1 +arch=(any) +depends=(dropbox yaourt) diff --git a/arch/base-packages/PKGBUILD b/arch/base-packages/PKGBUILD new file mode 100644 index 0000000..2f3523d --- /dev/null +++ b/arch/base-packages/PKGBUILD @@ -0,0 +1,86 @@ +# yaourt -P && makepkg -i +pkgname=base-packages +pkgver=0 +pkgrel=1 +arch=(any) +depends=(alsa-utils + awesome-terminal-fonts + cronie + ctags + dosfstools + dunst + feh + fuse2 + fzf + git + gnome-alsamixer + grub + htop + hub + i3-gaps + i3blocks + i3lock + i3status + inotify-tools + ipython + isync + lsof + mlocate + moreutils + mpv + msmtp + mutt + neovim + network-manager-applet + networkmanager + networkmanager-openvpn + networkmanager-pptp + pass + pavucontrol + perl-file-mimeinfo + pkgfile + pulseaudio + pulseaudio-alsa + python-jedi + python-neovim + python-pip + python-unidecode + python2-neovim + qutebrowser + redshift + ripgrep + rofi + rsync + rxvt-unicode + shellcheck + sshfs + stow + surfraw + texlive-core + tldr + tmux + ttf-dejavu + urxvt-perls + vifm + weechat + xcape + xclip + xdotool + xfce4-screenshooter + xorg-server + xorg-server-common + xorg-setxkbmap + xorg-xbacklight + xorg-xev + xorg-xkill + xorg-xmodmap + xorg-xrandr + xorg-xrdb + xsel + youtube-dl + zathura + zathura-djvu + zathura-pdf-mupdf + zathura-ps + zenity + zsh) diff --git a/arch/local-packages/PKGBUILD b/arch/local-packages/PKGBUILD new file mode 100644 index 0000000..9ac2a07 --- /dev/null +++ b/arch/local-packages/PKGBUILD @@ -0,0 +1,7 @@ +# yaourt -P && makepkg -i +pkgname=local-packages +pkgver=0 +pkgrel=1 +arch=(any) +depends=(bashmount bitlbee-facebook light myrepos rofi-dmenu spotify tmuxinator + ttf-monaco ubuntu-wallpapers) diff --git a/arch/work-packages/PKGBUILD b/arch/work-packages/PKGBUILD new file mode 100644 index 0000000..63d44d2 --- /dev/null +++ b/arch/work-packages/PKGBUILD @@ -0,0 +1,5 @@ +pkgname=work-packages +pkgver=0 +pkgrel=1 +arch=(any) +depends=(freefem++ gmsh armadillo python-sympy) diff --git a/i3/.config/i3blocks/bin/battery b/i3/.config/i3blocks/bin/battery index d475741..7c7d76c 100755 --- a/i3/.config/i3blocks/bin/battery +++ b/i3/.config/i3blocks/bin/battery @@ -5,35 +5,45 @@ if [ ! -d /sys/class/power_supply/BAT0 ]; then exit fi -output="$(acpi -b)" -remaining_time=$(echo "$output" | grep -o "[0-9][0-9]:[0-9][0-9]") -now_charge=$(cat /sys/class/power_supply/BAT0/now_charge) -full_charge=$(cat /sys/class/power_supply/BAT0/full_charge) -charge=$(( (100*now_charge) / full_charge )) -# charge=$(echo "$output" | grep -oP "..(?=%)") - -if grep -q "Discharging" <(echo "$output"); then - remaining_time=$(echo "$output" | grep -oP "..:..(?=:.. remaining)") - if [[ $charge -lt 20 ]]; then +current_now=$(cat /sys/class/power_supply/BAT0/current_now) +charge_now=$(cat /sys/class/power_supply/BAT0/charge_now) +charge_full=$(cat /sys/class/power_supply/BAT0/charge_full) +bat_status=$(cat /sys/class/power_supply/BAT0/status) +charge_percent=$(( (100*charge_now) / charge_full )) + +if [ "$bat_status" = "Full" ]; then + echo " Full" && exit +fi + +if [ "$bat_status" = "Discharging" ]; then + tot_minutes_remaining=$(( charge_now*60/current_now )) + + if [[ $charge_percent -lt 20 ]]; then icon="" color="#FF0000" - elif [[ $charge -lt 40 ]]; then + elif [[ $charge_percent -lt 40 ]]; then icon="" - color="#FFAE00" - elif [[ $charge -lt 60 ]]; then + color='gray' # ="#FFAE00" + elif [[ $charge_percent -lt 60 ]]; then icon="" - color="#FFF600" - elif [[ $charge -lt 80 ]]; then + color='gray' # ="#FFF600" + elif [[ $charge_percent -lt 80 ]]; then icon="" - color="#A8FF00" + color='gray' # ="#A8FF00" else icon="" - color="#00FF00" + color='gray' # ="#00FF00" fi -else - icon= + +elif [ "$bat_status" = "Charging" ]; then + tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now )) + + icon= color="lightblue" fi -echo "$icon $charge% ($remaining_time)" -echo "$icon $charge% ($remaining_time)" +time_remaining=$(printf "%02d:%02d" \ + $(( tot_minutes_remaining/60 )) \ + $(( tot_minutes_remaining/60 ))) + +echo "$icon $charge_percent% ($time_remaining)" diff --git a/mutt/.mutt/colors/base.muttrc b/mutt/.mutt/colors/base.muttrc index 7bc1aae..714121c 100644 --- a/mutt/.mutt/colors/base.muttrc +++ b/mutt/.mutt/colors/base.muttrc @@ -11,7 +11,6 @@ color sidebar_indicator color232 color178 color sidebar_new color2 default color index color248 default "~R" -color index color69 default "~N" color index color140 default "~U" color index color2 default "~Q" color index color1 default "~D" diff --git a/pkgs/.gitignore b/pkgs/.gitignore deleted file mode 100644 index 7d16c28..0000000 --- a/pkgs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*/pkg -*/src -*.tar.xz diff --git a/pkgs/archlinuxfr-packages/PKGBUILD b/pkgs/archlinuxfr-packages/PKGBUILD deleted file mode 100644 index da4c54f..0000000 --- a/pkgs/archlinuxfr-packages/PKGBUILD +++ /dev/null @@ -1,5 +0,0 @@ -pkgname=archlinuxfr-packages -pkgver=0 -pkgrel=1 -arch=(any) -depends=(dropbox yaourt) diff --git a/pkgs/base-packages/PKGBUILD b/pkgs/base-packages/PKGBUILD deleted file mode 100644 index 038e4d5..0000000 --- a/pkgs/base-packages/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# yaourt -P && makepkg -i -pkgname=base-packages -pkgver=0 -pkgrel=1 -arch=(any) -depends=(alsa-utils autocutsel autopep8 awesome-terminal-fonts biber cmus - cpulimit cronie ctags dunst feh flake8 fuse2 fzf git gnome-alsamixer - gnuplot grub htop hub i3-gaps i3blocks i3lock i3status inotify-tools - ipython isync lsof mencoder mlocate moreutils mpv msmtp mumble mutt ncmpcpp - neovim network-manager-applet networkmanager networkmanager-openvpn - networkmanager-pptp nmap npm pandoc pass perl-file-mimeinfo pkgfile - pulseaudio pulseaudio-alsa python-jedi python-matplotlib python-neovim - python-pip python-unidecode python2-matplotlib python2-neovim qemu - qutebrowser redshift ripgrep rofi rsync rxvt-unicode shellcheck sshfs stow - surfraw texlive-bibtexextra texlive-core texlive-fontsextra - texlive-formatsextra texlive-games texlive-humanities texlive-latexextra - texlive-pictures texlive-pstricks texlive-publishers texlive-science tig - tldr tmux ttf-dejavu ttf-ubuntu-font-family urxvt-perls vifm weechat xcape - xclip xdotool xfce4-screenshooter xorg-server xorg-server-common - xorg-setxkbmap xorg-xbacklight xorg-xev xorg-xkill xorg-xmodmap xorg-xrandr - xorg-xrdb xsel youtube-dl zathura zathura-djvu zathura-pdf-mupdf zathura-ps - zenity zsh) diff --git a/pkgs/local-packages/PKGBUILD b/pkgs/local-packages/PKGBUILD deleted file mode 100644 index 9ac2a07..0000000 --- a/pkgs/local-packages/PKGBUILD +++ /dev/null @@ -1,7 +0,0 @@ -# yaourt -P && makepkg -i -pkgname=local-packages -pkgver=0 -pkgrel=1 -arch=(any) -depends=(bashmount bitlbee-facebook light myrepos rofi-dmenu spotify tmuxinator - ttf-monaco ubuntu-wallpapers) diff --git a/pkgs/work-packages/PKGBUILD b/pkgs/work-packages/PKGBUILD deleted file mode 100644 index 63d44d2..0000000 --- a/pkgs/work-packages/PKGBUILD +++ /dev/null @@ -1,5 +0,0 @@ -pkgname=work-packages -pkgver=0 -pkgrel=1 -arch=(any) -depends=(freefem++ gmsh armadillo python-sympy) diff --git a/vim/.config/nvim b/vim/.config/nvim deleted file mode 120000 index 3f68f9f..0000000 --- a/vim/.config/nvim +++ /dev/null @@ -1 +0,0 @@ -/home/urbain/.vim \ No newline at end of file diff --git a/vim/.config/nvim/after b/vim/.config/nvim/after new file mode 120000 index 0000000..21e8c1e --- /dev/null +++ b/vim/.config/nvim/after @@ -0,0 +1 @@ +../../../../.vim/after \ No newline at end of file diff --git a/vim/.config/nvim/autoload b/vim/.config/nvim/autoload new file mode 120000 index 0000000..2a3595b --- /dev/null +++ b/vim/.config/nvim/autoload @@ -0,0 +1 @@ +../../../../.vim/autoload \ No newline at end of file diff --git a/vim/.config/nvim/backup b/vim/.config/nvim/backup new file mode 120000 index 0000000..5a0539e --- /dev/null +++ b/vim/.config/nvim/backup @@ -0,0 +1 @@ +../../../../.vim/backup \ No newline at end of file diff --git a/vim/.config/nvim/compiler b/vim/.config/nvim/compiler new file mode 120000 index 0000000..2e1517f --- /dev/null +++ b/vim/.config/nvim/compiler @@ -0,0 +1 @@ +../../../../.vim/compiler \ No newline at end of file diff --git a/vim/.config/nvim/ftplugin b/vim/.config/nvim/ftplugin new file mode 120000 index 0000000..bf8ad58 --- /dev/null +++ b/vim/.config/nvim/ftplugin @@ -0,0 +1 @@ +../../../../.vim/ftplugin \ No newline at end of file diff --git a/vim/.config/nvim/indent b/vim/.config/nvim/indent new file mode 120000 index 0000000..e62cbc4 --- /dev/null +++ b/vim/.config/nvim/indent @@ -0,0 +1 @@ +../../../../.vim/indent \ No newline at end of file diff --git a/vim/.config/nvim/init.vim b/vim/.config/nvim/init.vim new file mode 120000 index 0000000..7028409 --- /dev/null +++ b/vim/.config/nvim/init.vim @@ -0,0 +1 @@ +../../../../.vimrc \ No newline at end of file diff --git a/vim/.config/nvim/mySnippets b/vim/.config/nvim/mySnippets new file mode 120000 index 0000000..e7aff9e --- /dev/null +++ b/vim/.config/nvim/mySnippets @@ -0,0 +1 @@ +../../../../.vim/mySnippets \ No newline at end of file diff --git a/vim/.config/nvim/plugged b/vim/.config/nvim/plugged new file mode 120000 index 0000000..ef8b079 --- /dev/null +++ b/vim/.config/nvim/plugged @@ -0,0 +1 @@ +../../../../.vim/plugged \ No newline at end of file diff --git a/vim/.config/nvim/spell b/vim/.config/nvim/spell new file mode 120000 index 0000000..91f79ef --- /dev/null +++ b/vim/.config/nvim/spell @@ -0,0 +1 @@ +../../../../.vim/spell \ No newline at end of file diff --git a/vim/.config/nvim/swap b/vim/.config/nvim/swap new file mode 120000 index 0000000..1e31f47 --- /dev/null +++ b/vim/.config/nvim/swap @@ -0,0 +1 @@ +../../../../.vim/swap \ No newline at end of file diff --git a/vim/.config/nvim/undo b/vim/.config/nvim/undo new file mode 120000 index 0000000..c3bf6ff --- /dev/null +++ b/vim/.config/nvim/undo @@ -0,0 +1 @@ +../../../../.vim/undo \ No newline at end of file diff --git a/vim/.config/nvim/view b/vim/.config/nvim/view new file mode 120000 index 0000000..fcd4091 --- /dev/null +++ b/vim/.config/nvim/view @@ -0,0 +1 @@ +../../../../.vim/view \ No newline at end of file diff --git a/vim/.config/nvim/words b/vim/.config/nvim/words new file mode 120000 index 0000000..404c53d --- /dev/null +++ b/vim/.config/nvim/words @@ -0,0 +1 @@ +../../../../.vim/words \ No newline at end of file diff --git a/vim/.vim/init.vim b/vim/.vim/init.vim deleted file mode 120000 index f67022e..0000000 --- a/vim/.vim/init.vim +++ /dev/null @@ -1 +0,0 @@ -../.vimrc \ No newline at end of file -- cgit v1.2.3