dotfiles

commit fb74bc15155ab2beac19197675272f868ef2b6ac
parent 44f4d7552568d270cd870b4cb19f8e92da43aece
Author: Matsuda Kenji <ftvda283@gmail.com>
Date:   Fri, 21 Aug 2020 16:22:43 +0900

several changes

Diffstat:
M
.bash_profile
 | 
8
++++----
M
.config/i3blocks/battery.sh
 | 
2
+-
M
.config/i3blocks/config
 | 
16
++++++++--------
M
.config/i3blocks/lunar_cal.sh
 | 
2
+-
M
.config/i3blocks/volume.sh
 | 
2
+-
M
.config/mutt/muttrc
 | 
8
++++----
M
.config/nvim/init.vim
 | 
1
+

7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/.bash_profile b/.bash_profile
@@ -2,14 +2,14 @@
 
 [[ -f ~/.bashrc ]] && . ~/.bashrc
 
-export PATH="$PATH:$HOME/.local/bin"
-export EDITOR=nvim
-export HISTFILE="$XDG_CACHE_HOME/bash/.bash_history"
-
 # ~/ clean up:
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
 
+export PATH="$PATH:$HOME/.local/bin"
+export EDITOR=nvim
+export HISTFILE="$XDG_CACHE_HOME/bash/.bash_history"
+
 export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
 export XAUTHORITY="$XDG_CACHE_HOME/X11/Xauthority"
 #docker
diff --git a/.config/i3blocks/battery.sh b/.config/i3blocks/battery.sh
@@ -16,4 +16,4 @@ else
     state=
 fi
 
-echo "$state ${capacity}%"
+echo "$state ${capacity}"
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
@@ -10,13 +10,17 @@ signal=1
 
 [brightness]
 label=☀ 
-command=xbacklight -get | xargs printf '%.0f%%\n'
+command=xbacklight -get | xargs printf '%.0f\n'
 interval=once
 signal=2
 
-[load average]
+[battery]
+command=$PWD/battery.sh
+interval=5
+
+[cpu]
 label= 
-command=echo "$(uptime | sed 's/.*load average: \(.*\)/\1/' | cut -d, -f1)/$(grep 'processor' /proc/cpuinfo | wc -l)"
+command=echo "$(uptime | sed 's/.*load average: \(.*\)/\1/' | cut -d, -f1)"
 interval=5
 
 [temperature]
@@ -26,17 +30,13 @@ interval=5
 
 [memory]
 label= 
-command=free -h | awk 'match($0, /^Mem/){print $3 " / " $2}'
+command=free -h | awk 'match($0, /^Mem/){print $3}'
 interval=5
 
 [wifi]
 command=./wifi.sh
 interval=5
 
-[battery]
-command=$PWD/battery.sh
-interval=5
-
 [calendar]
 command=$PWD/lunar_cal.sh
 interval=3600
diff --git a/.config/i3blocks/lunar_cal.sh b/.config/i3blocks/lunar_cal.sh
@@ -20,4 +20,4 @@ zassetsu1=`cut -d, -f8 <<<$lunar_cal`
 zassetsu2=`cut -d, -f9 <<<$lunar_cal`
 festivals=`cut -d, -f10 <<<$lunar_cal`
 
-echo "令和$reiwa年$leap${month_names[$month]}$date日 $six_labels $zodiac$sekki24$zassetsu1$zassetsu2$festivals"
+echo "令和$reiwa年$leap${month_names[$month - 1]}$date日 $six_labels $zodiac$sekki24$zassetsu1$zassetsu2$festivals"
diff --git a/.config/i3blocks/volume.sh b/.config/i3blocks/volume.sh
@@ -7,4 +7,4 @@ mute=`pactl list sinks \
 volume=`pactl list sinks \
     | grep 'Volume' | grep -o '[0-9]*%' \
     | head -1 | tr -d '%'`
-echo "$state ${volume}%"
+echo "$state ${volume}"
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
@@ -13,10 +13,10 @@ set imap_user = "ftvda283@gmail.com"
 
 #フォルダ設定
 set spoolfile = "+INBOX"
-set record = "+Sent"
-set trash = "+Archive"
-set postponed = "+Drafts"
-mailboxes =INBOX =Sent =Archive =Draft
+#set record = "+Sent"
+set trash = "+[Gmail]/ゴミ箱"
+set postponed = "+[Gmail]/下書き"
+mailboxes =INBOX
 
 #セキュリティ設定
 set ssl_starttls = yes
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -3,3 +3,4 @@ set encoding=utf-8
 
 set number
 set shiftwidth=4
+set tabstop=4