Merge branch 'master' of github.com:10sr/dotfiles

bashrc

@@ -289,6 +289,7 @@ input(){
 tmux(){
     if test $# -eq 0
     then
+        (cd ~; command tmux start;)
         if command tmux has -t main
         then
             command tmux attach -t main
@@ -592,7 +593,7 @@ __my_ps1_git(){
 }
 __my_ps1_ipaddr(){
     local last=$?
-    test -z "$DISPLAY" && ! iswindows && ip-address [Addr:%s]
+    ! iswindows && ip-address [Addr:%s]
     return $last
 }
 __my_ps1_bttry(){

conf/arch/README.md

@@ -0,0 +1,3 @@
+# Arch Linux
+
+some copies of conf files and utils

conf/arch/fixwicd.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Wicd - ArchWiki / https://wiki.archlinux.org/index.php/Wicd#Problems_after_package_update
+# run this script as root when wicd doesnt work after udpate.
+
+rc.d stop wicd
+# rm /etc/wicd/*.conf
+mv /etc/wicd/manager-settings.conf /etc/wicd/manager-settings.conf.bak
+rc.d start wicd
+

conf/arch/gpg.conf

@@ -0,0 +1,5 @@
+no-greeting
+no-permission-warning
+lock-never
+keyserver hkp://pool.keyserver.eu
+keyserver-options timeout=10

conf/arch/myjp106.map

@@ -0,0 +1,70 @@
+# jp106.map : Japanese 106 keyboard keymap
+#
+# Date: Tue, 20 Aug 1996 16:15:31 +0900
+# From: Hideya Hane <wing@aries.bekkoame.or.jp>
+#
+keymaps 0-1,4-5,8-9,12
+alt_is_meta
+include "qwerty-layout"
+include "linux-with-two-alt-keys"
+strings as usual
+compose as usual for "iso-8859-1"
+
+keycode   1 = Escape
+keycode   2 = one              exclam
+keycode   3 = two              quotedbl
+keycode   4 = three            numbersign
+	control	keycode   4 = Escape
+keycode   5 = four             dollar
+	control	keycode   5 = Control_backslash
+keycode   6 = five             percent
+	control	keycode   6 = Control_bracketright
+keycode   7 = six              ampersand
+	control	keycode   7 = Control_underscore
+keycode   8 = seven            apostrophe
+keycode   9 = eight            parenleft
+keycode  10 = nine             parenright
+keycode  11 = zero             asciitilde
+	control	keycode  11 = nul
+keycode  12 = minus            equal
+keycode  13 = asciicircum      asciitilde
+	control	keycode  13 = Control_asciicircum
+keycode  14 = BackSpace
+	control	keycode  14 = BackSpace
+keycode  15 = Tab
+	shift	keycode  15 = Meta_Tab
+keycode  26 = at               grave
+	control	keycode  26 = nul
+keycode  27 = bracketleft      braceleft
+	control	keycode  27 = Escape
+keycode  28 = Return
+	alt	keycode  28 = Meta_Control_m
+keycode  29 = Control
+keycode  39 = semicolon        plus
+keycode  40 = colon            asterisk
+	control keycode  40 = Control_g
+keycode  41 = Escape
+keycode  42 = Shift
+keycode  43 = bracketright     braceright
+	control	keycode  43 = Control_bracketright
+keycode  51 = comma            less
+keycode  52 = period           greater
+	control	keycode  52 = Compose
+keycode  53 = slash            question
+	control	keycode  53 = Delete
+	shift	control	keycode  53 = Delete
+keycode  54 = Shift
+keycode  56 = Alt
+keycode  57 = space
+	control	keycode  57 = nul
+keycode  58 = Control
+keycode  86 = less             greater
+keycode  89 = backslash        underscore
+	control	keycode  89 = Control_backslash
+keycode  92 = space
+keycode  94 = space
+keycode  97 = Control
+keycode 124 = backslash        bar
+	control	keycode 124 = Control_backslash
+keycode 127 = Control
+keycode 93 = Alt

conf/arch/rc.conf

@@ -0,0 +1,43 @@
+#
+# /etc/rc.conf - configuration file for initscripts
+#
+# Most of rc.conf has been replaced by various other configuration
+# files. See archlinux(7) for details.
+#
+# For more details on rc.conf see rc.conf(5).
+#
+
+# LOCALIZATION
+# ------------
+HARDWARECLOCK="UTC" # move to /etc/adjtime ?
+#TIMEZONE="Asia/Tokyo"
+#KEYMAP="myjp106"
+#CONSOLEFONT="LatGrkCyr-8x16"
+#CONSOLEMAP=
+#LOCALE=C
+#DAEMON_LOCALE="yes"
+USECOLOR="yes"
+
+# HARDWARE
+# --------
+# this line is no longer used ?
+#MODULES=(b43 acpi-cpufreq cpufreq_conservative cpufreq_powersave vboxdrv vboxnetflt) # wl
+USEDMRAID="no"
+USELVM="no"
+
+# NETWORKING
+# ----------
+#HOSTNAME=arch-aspireone
+
+#interface=eth0
+#address=
+#netmask=
+#broadcast=
+#gateway=
+
+NETWORK_PERSIST="no"
+
+# DAEMONS
+# -------
+#
+DAEMONS=(@syslog-ng @crond @alsa @postfix @sshd acpid dbus wicd @laptop-mode !network)

conf/arch/updatefiles.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+# copy some important files into current directory.
+
+files="
+/etc/rc.conf
+/var/log/pacman.log
+/etc/pacman.d/gnupg/gpg.conf
+/etc/vconsole.conf
+"
+
+convpass(){
+    echo $1 | sed -e 's / ! g'
+}
+
+for i in $files
+do
+    cp -fvu $i ./$(basename $i)
+done
+
+mapdir=/usr/share/kbd/keymaps/i386/qwerty
+
+test ${mapdir}/myjp106.map.gz -nt ./myjp106.map &&
+zcat ${mapdir}/myjp106.map.gz >./myjp106.map &&
+{
+    test -f ./jp106.map || 
+    zcat ${mapdir}/jp106.map.gz >./jp106.map
+
+    diff -u ./jp106.map ./myjp106.map >mymap.diff
+    echo "Make myjp106 patch."
+}
+
+pacman -Qqe | grep -vx "$(pacman -Qqm)" > ./pkg.lst &&
+echo "Make pkg.lst."

conf/arch/vconsole.conf

@@ -0,0 +1,3 @@
+KEYMAP="myjp106"
+FONT="LatGrkCyr-8x16"
+CONSOLEMAP=

conf/moc.conf

@@ -0,0 +1,7 @@
+MusicDir = "${HOME}/music"
+Repeat = yes
+StartInMusicDir = yes
+Theme = transparent-background
+SetXtermTitle = yes
+SetScreentitle = yes
+OnSongChange = "/usr/bin/notify-send %n\ %t %a\ %r"

tmux.conf

@@ -11,6 +11,7 @@ set -g base-index 1
 set -g default-command /bin/bash
 #set -g default-terminal screen-256color
 #set -g default-terminal screen-16color
+set default-path "$HOME" # not work as i expected
 
 #set -g status-left ""
 #set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)"