From de82f19ccd23231a67e823549d9b082f1d382c25 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 3 Oct 2012 10:05:57 +0900 Subject: [PATCH 1/8] show ipaddress even when DISPLAY is not empty --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index f0d7fff..9f81ecf 100755 --- a/bashrc +++ b/bashrc @@ -588,7 +588,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(){ From 7b957d60a979719e4543b2d08818d30a77ea0f19 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 3 Oct 2012 14:21:57 +0900 Subject: [PATCH 2/8] modify tmux.conf --- tmux.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/tmux.conf b/tmux.conf index 1f4dfdf..fbdffc8 100644 --- a/tmux.conf +++ b/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)" From d2d7563964d7f6058a3c53015e3ba3320334912e Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Oct 2012 20:37:38 +0900 Subject: [PATCH 3/8] fix tmux func --- bashrc | 1 + 1 file changed, 1 insertion(+) diff --git a/bashrc b/bashrc index 13f41f0..a2d2526 100755 --- a/bashrc +++ b/bashrc @@ -289,6 +289,7 @@ input(){ tmux(){ if test $# -eq 0 then + command tmux start-server if command tmux has -t main then command tmux attach -t main From 3363e755eff2103b9b9080e5b21263f695a82c3c Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Oct 2012 20:53:50 +0900 Subject: [PATCH 4/8] add moc.conf --- conf/moc.conf | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 conf/moc.conf diff --git a/conf/moc.conf b/conf/moc.conf new file mode 100644 index 0000000..1445578 --- /dev/null +++ b/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" From 114657bf10911559e84cca571be4fb87e3d0437f Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Oct 2012 20:55:12 +0900 Subject: [PATCH 5/8] add arch conf saver --- conf/arch/README.md | 3 +++ conf/arch/updatefiles.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 conf/arch/README.md create mode 100755 conf/arch/updatefiles.sh diff --git a/conf/arch/README.md b/conf/arch/README.md new file mode 100644 index 0000000..c142488 --- /dev/null +++ b/conf/arch/README.md @@ -0,0 +1,3 @@ +# Arch Linux + +some copies of conf files and utils diff --git a/conf/arch/updatefiles.sh b/conf/arch/updatefiles.sh new file mode 100755 index 0000000..3f2be3a --- /dev/null +++ b/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." From d483c8a15ca4647535d76e386880e717830bf82d Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Oct 2012 21:00:00 +0900 Subject: [PATCH 6/8] add some conf backup --- conf/arch/gpg.conf | 5 +++ conf/arch/myjp106.map | 70 +++++++++++++++++++++++++++++++++++++++++ conf/arch/rc.conf | 43 +++++++++++++++++++++++++ conf/arch/vconsole.conf | 3 ++ 4 files changed, 121 insertions(+) create mode 100644 conf/arch/gpg.conf create mode 100644 conf/arch/myjp106.map create mode 100644 conf/arch/rc.conf create mode 100644 conf/arch/vconsole.conf diff --git a/conf/arch/gpg.conf b/conf/arch/gpg.conf new file mode 100644 index 0000000..d679beb --- /dev/null +++ b/conf/arch/gpg.conf @@ -0,0 +1,5 @@ +no-greeting +no-permission-warning +lock-never +keyserver hkp://pool.keyserver.eu +keyserver-options timeout=10 diff --git a/conf/arch/myjp106.map b/conf/arch/myjp106.map new file mode 100644 index 0000000..47077ca --- /dev/null +++ b/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 +# +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 diff --git a/conf/arch/rc.conf b/conf/arch/rc.conf new file mode 100644 index 0000000..469bbc1 --- /dev/null +++ b/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) diff --git a/conf/arch/vconsole.conf b/conf/arch/vconsole.conf new file mode 100644 index 0000000..32f7bb1 --- /dev/null +++ b/conf/arch/vconsole.conf @@ -0,0 +1,3 @@ +KEYMAP="myjp106" +FONT="LatGrkCyr-8x16" +CONSOLEMAP= From 03355829988b4366cf36758d8882c643a505d9eb Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Oct 2012 21:01:55 +0900 Subject: [PATCH 7/8] add arch/fixwicd.sh --- conf/arch/fixwicd.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 conf/arch/fixwicd.sh diff --git a/conf/arch/fixwicd.sh b/conf/arch/fixwicd.sh new file mode 100755 index 0000000..8f4dffa --- /dev/null +++ b/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 + From b16f244ca645effc74122edc7cdd15cf35df0f24 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Oct 2012 21:10:23 +0900 Subject: [PATCH 8/8] fix tmux but it seems to make no sense --- bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashrc b/bashrc index a2d2526..dbd04f2 100755 --- a/bashrc +++ b/bashrc @@ -289,7 +289,7 @@ input(){ tmux(){ if test $# -eq 0 then - command tmux start-server + (cd ~; command tmux start;) if command tmux has -t main then command tmux attach -t main