Awesome: support for any network interface in vicious plugin.

netinit: support for any wireless network interface.
pkg: public list.
shell.d: cleasing.
homeinit: cleansing.
master
Pierre Neidhardt 2013-05-04 00:30:11 +02:00
parent 37b76dd981
commit 600e0bcaa1
5 changed files with 64 additions and 25 deletions

View File

@ -127,10 +127,15 @@ if ostype == "Linux" then
-- Net
-- CHECK: not sure if args["{".. device .." carrier}"] may have values below 0. What do values of the args table mean?
local networks = { "eth0", "wlan0" }
local proc = io.popen("ls -1 /sys/class/net")
local ifarray = {}
for line in proc:lines() do
table.insert (ifarray, line);
end
proc:close()
vicious.register(netwidget, vicious.widgets.net,
function (widget, args)
for _,device in pairs(networks) do
for _,device in pairs(ifarray) do
value = tonumber(args["{".. device .." carrier}"])
if value ~= nil and value ~= 0 then
return separator .. '<span color="#CC9393">↓' .. args["{" .. device .. " down_kb}"] .. '</span> <span color="#7F9F7F">↑' .. args["{" .. device .. " up_kb}"] .. '</span>'

26
.pkg-arch-public-low Normal file
View File

@ -0,0 +1,26 @@
alsa-utils
chromium
cups
epdfview
flashplugin
foomatic-db-nonfree
git
gpicview
ifplugd
iw
libreoffice
linux-lts
lxdm
ttf-dejavu
vlc
wpa_actiond
wpa_supplicant
xfce4
xorg-server
xorg-xinit
xorg-xrdb
yaourt
libgphoto2
ntfs-3g
hplip

View File

@ -8,6 +8,9 @@ SOURCEDIR="${HOME}/personal/dataperso"
[ -z "$XDG_DATA_HOME" ] && XDG_DATA_HOME="$HOME/.local/share"
[ -z "$XDG_DATA_DIRS" ] && XDG_DATA_DIRS="/usr/local/share"
## Temp folder
mkdir -p temp
## Emacsclient launcher. Required for best emacsclient integration. For a fully
## functional daemon, you should write a file like this and set 'EDITOR=em'.
if [ ! -f /bin/em ]; then
@ -18,20 +21,20 @@ emacsclient -a \"\" -t \"\$@\"' > '/bin/em'; chmod 755 /bin/em"
fi
echo "==> Abook"
ln -snf "$(realpath ${SOURCEDIR}/contacts)" "${HOME}/.abook"
[ -d "$SOURCEDIR" ] && ln -snf "$(realpath ${SOURCEDIR}/contacts)" "${HOME}/.abook"
echo
echo "==> Mutt"
ln -snf "$(realpath ${SOURCEDIR}/mails)" "${HOME}/.mutt"
[ -d "$SOURCEDIR" ] && ln -snf "$(realpath ${SOURCEDIR}/mails)" "${HOME}/.mutt"
mkdir -p "${HOME}/.mutt.d/hcache"
echo
echo "==> TODO data"
ln -snf "${SOURCEDIR}/todo/todo.org" "${HOME}/todo.org"
echo "==> TODO"
[ -d "$SOURCEDIR" ] && ln -snf "${SOURCEDIR}/todo/todo.org" "${HOME}/todo.org"
echo
echo "==> rtorrent"
mkdir -p "${HOME}/.session"
[ -n "$(command -v rtorrent)" ] && mkdir -p "${HOME}/.session"
echo
## Luakit -- Install the adblock modules
@ -61,17 +64,22 @@ fi
## Bookmarks
echo "==> Bookmarks"
BROWSER_DATA_DIR="$XDG_DATA_HOME/$BROWSER/"
if [ "$BROWSER" = "dwb" ]; then
BROWSER_DATA_DIR="$XDG_CONFIG_HOME/$BROWSER/default/"
if [ -z "$BROWSER" ]; then
echo "Variable BROWSER is not set."
else
BROWSER_DATA_DIR="$XDG_DATA_HOME/$BROWSER/"
if [ "$BROWSER" = "dwb" ]; then
BROWSER_DATA_DIR="$XDG_CONFIG_HOME/$BROWSER/default/"
fi
[ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/bookmarks/bookmarks" "$BROWSER_DATA_DIR"
[ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/bookmarks/quickmarks" "$BROWSER_DATA_DIR"
fi
ln -sf "${SOURCEDIR}/bookmarks/bookmarks" "$BROWSER_DATA_DIR"
ln -sf "${SOURCEDIR}/bookmarks/quickmarks" "$BROWSER_DATA_DIR"
echo
## News
if [ -n "$(command -v newsbeuter)" ]; then
echo "==> Newsbeuter"
mkdir -p "$XDG_DATA_HOME/newsbeuter"
ln -sf "${SOURCEDIR}/news/urls" "$XDG_CONFIG_HOME/newsbeuter/"
ln -sf "${SOURCEDIR}/news/news_starred" "$XDG_CONFIG_HOME/newsbeuter/"
[ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/news/urls" "$XDG_CONFIG_HOME/newsbeuter/"
[ -d "$SOURCEDIR" ] && ln -sf "${SOURCEDIR}/news/news_starred" "$XDG_CONFIG_HOME/newsbeuter/"
echo

View File

@ -1,7 +1,7 @@
#!/usr/bin/env zsh
################################################################################
## Custom network initialization script.
## 2012-10-29
## 2013-05-03
################################################################################
## Deps: wpa_supplicant, ccrypt (optional)
@ -28,7 +28,9 @@ if [ $(id -u) -ne 0 ]; then
exit
fi
NET_INTERFACE=wlan0
## Note: systemd-197 introduced Predictable Network Interface Names, so we need
## to check for the proper device dynamically.
NET_INTERFACE=$(ls -1 /sys/class/net | grep -m1 "^wl")
WPA_SUPPLICANT_CONF="$(cat /etc/wpa_supplicant.conf)"
TIMEOUT_LIMIT=500
@ -60,8 +62,6 @@ else
## Same comments as for Linux.
pkill dhclient
pkill wpa_supplicant
ifconfig wlan0 up
if [ -n "$(ifconfig ${NET_INTERFACE} | grep 'ssid ""')" ]; then

View File

@ -105,14 +105,14 @@ export EDITOR
## SSH-Agent
## WARNING: this is somewhat insecure. avoid using it on a mutli-user machine.
if [ $(ps ax -o command="" | grep -c "ssh-agent") -eq 1 ]; then
SSH_ENV_FILE="/tmp/ssh-agent-env"
if [ $(ps ax -o command="" | grep -c "ssh-agent") -eq 2 ]; then
SSH_AGENT_VARS=$(ssh-agent)
eval $(echo "${SSH_AGENT_VARS}")
rm -f "/tmp/ssh-agent-env"
echo "${SSH_AGENT_VARS}" | sed '2q' | cut -d'=' -f2 | cut -d';' -f1 > "/tmp/ssh-agent-env"
chmod 444 "/tmp/ssh-agent-env"
echo "${SSH_AGENT_VARS}" | sed '2q' | cut -d'=' -f2 | cut -d';' -f1 > "$SSH_ENV_FILE"
chmod 444 "$SSH_ENV_FILE"
unset $SSH_AGENT_VARS
else
SSH_AUTH_SOCK=$(sed -n '1{p;q}' "/tmp/ssh-agent-env") ; export SSH_AUTH_SOCK
SSH_AGENT_PID=$(sed -n '2{p;q}' "/tmp/ssh-agent-env") 2>/dev/null ; export SSH_AGENT_PID
elif [ -f "$SSH_ENV_FILE" ]; then
SSH_AUTH_SOCK=$(sed -n '1{p;q}' "$SSH_ENV_FILE") ; export SSH_AUTH_SOCK
SSH_AGENT_PID=$(sed -n '2{p;q}' "$SSH_ENV_FILE") 2>/dev/null ; export SSH_AGENT_PID
fi