commit c4184fbd3dddb059c6756ff7c836972b0b5baffb
parent bba82347a828bd305edd6263084ff14ed2109c49
Author: Matsuda Kenji <ftvda283@gmail.com>
Date: Tue, 24 Aug 2021 20:08:18 +0900
change shell to bash
Diffstat:
11 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
@@ -1,5 +1,6 @@
#!/bin/sh
+setxkbmap -layout jp
userresources=$XDG_CONFIG_HOME/X11/Xresources
usermodmap=$XDG_CONFIG_HOME/X11/Xmodmap
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
@@ -1,54 +1,40 @@
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<fontconfig>
- <match target="pattern">
- <test qual="any" name="family"><string>monospace</string></test>
- <edit name="family" mode="prepend" binding="same"><string>Liberation Mono</string></edit>
- <edit name="family" mode="append" binding="same"><string>Noto Serif CJK JP</string></edit>
- <edit name="family" mode="append" binding="same"><string>Noto Color Emoji</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>emoji</string></test>
- <edit name="family" mode="prepend" binding="same"><string>Liberation Mono</string></edit>
- <edit name="family" mode="append" binding="same"><string>Noto Color Emoji</string></edit>
- </match>
-
<alias>
<family>serif</family>
<prefer>
<family>Noto Serif CJK JP</family>
- <family>Noto Color Emoji</family>
+ <family>Noto Emoji</family>
</prefer>
</alias>
<alias>
<family>sans-serif</family>
<prefer>
<family>Noto Sans CJK JP</family>
- <family>Noto Color Emoji</family>
+ <family>Noto Emoji</family>
</prefer>
</alias>
<alias>
<family>sans</family>
<prefer>
<family>Noto Sans CJK JP</family>
- <family>Noto Color Emoji</family>
+ <family>Noto Emoji</family>
</prefer>
</alias>
- <!--
<alias>
<family>monospace</family>
<prefer>
<family>Liberation Mono</family>
+ <family>Noto Emoji</family>
<family>Noto Serif CJK JP</family>
</prefer>
</alias>
<alias>
<family>emoji</family>
<prefer>
+ <family>Noto Emoji</family>
<family>Liberation Mono</family>
- <family>Noto Color Emoji</family>
</prefer>
</alias>
- -->
</fontconfig>
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
@@ -1,3 +1,3 @@
-text/html; w3m %s -I %{charset} -T text/html
+text/html; w3m -o keymap_file=~/.config/w3m/keymap %s -I %{charset} -T text/html
image/*; sxiv %s
application/pdf; zathura %s
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
@@ -4,12 +4,12 @@ set realname = "Matsuda Kenji"
set hostname = "gmail.com"
set from = "ftvda283@gmail.com"
-#送信設定
+# send
set folder = "imaps://ftvda283@gmail.com@imap.gmail.com:993"
set smtp_url = "smtp://ftvda283@gmail.com@smtp.gmail.com:587"
set imap_user = "ftvda283@gmail.com"
-#フォルダ設定
+# folder
set spoolfile = "+INBOX"
#set record = "+[Gmail]/Sent Mail"
unset record
@@ -19,12 +19,12 @@ set postponed = "+[Gmail]/Drafts"
named-mailboxes "inbox" =INBOX "sent" =[Gmail]/Sent\ Mail "drafts" =[Gmail]/Drafts "spam" =[Gmail]/Spam "trash" =[Gmail]/Trash
set sort=reverse-date
-#セキュリティ設定
+# security
set ssl_starttls = yes
set ssl_force_tls = yes
-#基本設定
-set editor = "vi"
+# basic
+set editor = "nvi"
set charset = "utf-8"
set certificate_file = "./certificates"
set mailcap_path = "~/.config/mutt/mailcap"
diff --git a/.config/mutt/password.gpg b/.config/mutt/password.gpg
Binary files differ.
diff --git a/.config/newsboat/urls b/.config/newsboat/urls
@@ -23,3 +23,4 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCAZqVGCUyiEBNopy7EloMTw asm
https://www.youtube.com/feeds/videos.xml?channel_id=UCnGxonfiiey6qbiuxPPPLDw
https://www.youtube.com/feeds/videos.xml?channel_id=UCkMxe-0NaJw0Yc0g2Q29gcw
https://www.youtube.com/feeds/videos.xml?channel_id=UC_h4JsXCMhC1al0IkmoaW8g
+https://www.youtube.com/feeds/videos.xml?channel_id=UCT0q8NipPzU_G4yUtcAhKag
diff --git a/.config/w3m/keymap b/.config/w3m/keymap
@@ -165,23 +165,23 @@ keymap C-e UP
keymap C-y DOWN
keymap gg BEGIN
keymap G END
-keymap C-d NEXT_PAGE
-keymap d NEXT_PAGE
-keymap C-u PREV_PAGE
-keymap u PREV_PAGE
+keymap C-d NEXT_HALF_PAGE
+keymap d NEXT_HALF_PAGE
+keymap C-u PREV_HALF_PAGE
+keymap u PREV_HALF_PAGE
keymap zz CENTER_V
########## cursor ##########
-keymap l MOVE_RIGHT
-keymap h MOVE_LEFT
-keymap j MOVE_DOWN
-keymap k MOVE_UP
+keymap l MOVE_RIGHT1
+keymap h MOVE_LEFT1
+keymap j MOVE_DOWN1
+keymap k MOVE_UP1
keymap 0 LINE_BEGIN
keymap $ LINE_END
keymap w NEXT_WORD
keymap b PREV_WORD
########## cursor history ##########
-keymap C-r REDO
-keymap u UNDO
+#keymap C-r REDO
+#keymap u UNDO
########## navigation ##########
keymap f MOVE_LIST_MENU
keymap F LIST_MENU
diff --git a/.profile b/.profile
@@ -1,6 +1,7 @@
-# ~/.profile
+# ~/.bash_profile
-export ENV=$HOME/.shrc
+#export ENV=$HOME/.shrc
+source $HOME/.bashrc
# ~/ clean up:
export XDG_CONFIG_HOME="$HOME/.config"
diff --git a/.shrc b/.shrc
@@ -4,4 +4,4 @@ PS1='[\u@\h \W]\$ '
alias w3m='w3m -o keymap_file=~/.config/w3m/keymap'
alias tmux='tmux -f /home/kenji/.config/tmux/tmux.conf'
-set -o vi
+set -o vi -o posix
diff --git a/bin/dwm_blocks_battery.sh b/bin/dwm_blocks_battery.sh
@@ -1,7 +1,15 @@
#!/bin/sh
online=$(sysctl -n hw.sensors.acpiac0.indicator0 | cut -d' ' -f1)
-capacity=$(printf "%.0f" $(echo $(sysctl -n hw.sensors.acpibat0.amphour3 | cut -d' ' -f1) / $(sysctl -n hw.sensors.acpibat0.amphour4 | cut -d' ' -f1) '*' 100 | bc -l))
+if [ "$online" = "On" ]; then
+ capacity=$(printf "%.0f" $(echo $(sysctl -n hw.sensors.acpibat0.amphour3 |
+ cut -d' ' -f1) / $(sysctl -n hw.sensors.acpibat0.amphour4 |
+ cut -d' ' -f1) '*' 100 | bc -l))
+else
+ capacity=$(printf "%.0f" $(echo $(sysctl -n hw.sensors.acpibat0.amphour3 |
+ cut -d' ' -f1) / $(sysctl -n hw.sensors.acpibat0.amphour4 |
+ cut -d' ' -f1) '*' 100 | bc -l))
+fi
if [ "$online" = "On" ]; then
state=
diff --git a/bin/dwm_blocks_wifi.sh b/bin/dwm_blocks_wifi.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-ifconfig | awk '/^[^ \t]/{interface=$1;ssid=""}\
- /ssid/{ssid=$2}\
- /associated/{if(!ssid){print ""}else{print "", ssid};connected=1}\
- END{if(!connected){print " down"}}'
+ifconfig em0 | awk '/active/{printf ""}'
+ifconfig iwn0 | awk '/active/{printf ""}/no network/{printf " down\n"}/nwid/{printf "%s\n", $3}'
