summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.wmii/config.sh13
-rw-r--r--.wmii/include.sh4
2 files changed, 6 insertions, 11 deletions
diff --git a/.wmii/config.sh b/.wmii/config.sh
index abe378f..58217fa 100644
--- a/.wmii/config.sh
+++ b/.wmii/config.sh
@@ -6,6 +6,8 @@ DOWN=n
LEFT=b
RIGHT=f
+HIST="`conffile history`"
+
# Colors tuples: "<text> <background> <border>"
. `conffile theme-solarized-dark`
@@ -37,9 +39,6 @@ Event() {
# Configure X11
xsetroot -solid "$WMII_BACKGROUND"
- # Generate dynamic files
- path_ls $PATH > $progsfile
-
# Clear the LBar and RBar
find $WMII_DIR/{l,r}bar -type f -delete
# Populate the LBar by emulating [Create|Focus]Tag events
@@ -210,22 +209,22 @@ Key() {
## Running programs
$MODKEY-a) ## Open wmii actions menu
- Action $(path_ls $WMII_CONFPATH | wimenu -h "${hist}.actions" -n 5000) & ;;
+ Action $(path_ls $WMII_CONFPATH | wimenu -h "${HIST}.actions" -n 5000) & ;;
$MODKEY-x) ## Open program menu
- setsid $(wimenu -h "${hist}.progs" -n 5000 <$progsfile) & ;;
+ setsid $(path_ls $PATH | wimenu -h "${HIST}.progs" -n 5000) & ;;
$MODKEY-Return) ## Launch a terminal
setsid x-terminal-emulator & ;;
## Tag actions
$MODKEY-t) ## Change to another tag
{
- tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return
+ tag=$(lstags | wimenu -h "${HIST}.tags" -n 50) || return
echo view $tag >> $WMII_DIR/ctl
}& ;;
$MODKEY-Shift-t) ## Retag the selected client
sel=$(sed 1q $WMII_DIR/client/sel/ctl)
{
- tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return
+ tag=$(lstags | wimenu -h "${HIST}.tags" -n 50) || return
echo "$tag" >> $WMII_DIR/client/$sel/tags
}& ;;
esac
diff --git a/.wmii/include.sh b/.wmii/include.sh
index 43855e6..d4e58c3 100644
--- a/.wmii/include.sh
+++ b/.wmii/include.sh
@@ -8,8 +8,4 @@ if [ -z "$WMII_DIR" ]; then
fi
. "$HOME/.wmii/util.sh"
-
-hist="`conffile history`"
-progsfile=$WMII_NAMESPACE/.proglist
-
. "$HOME/.wmii/config.sh"