summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h60
-rw-r--r--dwm.179
-rwxr-xr-xvolsv3
3 files changed, 31 insertions, 111 deletions
diff --git a/config.h b/config.h
index b65e3fd..fc607bb 100644
--- a/config.h
+++ b/config.h
@@ -91,42 +91,42 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont,
static const char *passmenu[] = { "passmenu", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
static const char *termcmd[] = { "tabbed", "-c", "st", "-w", NULL };
//static const char *termcmd[] = { "dmenuabduco", NULL };
-static const char *mpdtoggle[] = { "playerctl", "--player=mpd,mpv,%any", "play-pause", NULL };
-static const char *mpdnext[] = { "playerctl", "--player=mpd,mpv,%any", "next", NULL };
-static const char *mpdprev[] = { "playerctl", "--player=mpd,mpv,%any", "previous", NULL };
-static const char *plytoggle[] = { "playerctl", "--player=%any,mpd", "play-pause", NULL };
-static const char *plyfwd[] = { "playerctl", "--player=%any,mpd", "position 5+", NULL };
-static const char *plybck[] = { "playerctl", "--player=%any,mpd", "position 5-", NULL };
-static const char *blightup[] = { "light", "-A", "1", NULL };
-static const char *blightdown[] = { "light", "-U", "1", NULL };
-static const char *audioup[] = { "volsv", "-i", NULL };
-static const char *audiodown[] = { "volsv", "-d", NULL };
-static const char *audiomute[] = { "volsv", "-t", NULL };
-static const char *micmute[] = { "pamixer", "--source", "1", "-t", NULL };
-static const char *lockscr[] = { "xautolock", "-locknow", NULL };
-static const char *xidletog[] = { "xidletog", NULL };
-static const char *xkillcmd[] = { "xkill", NULL };
+//static const char *mpdtoggle[] = { "playerctl", "--player=mpd,mpv,%any", "play-pause", NULL };
+//static const char *mpdnext[] = { "playerctl", "--player=mpd,mpv,%any", "next", NULL };
+//static const char *mpdprev[] = { "playerctl", "--player=mpd,mpv,%any", "previous", NULL };
+//static const char *plytoggle[] = { "playerctl", "--player=%any,mpd", "play-pause", NULL };
+//static const char *plyfwd[] = { "playerctl", "--player=%any,mpd", "position 5+", NULL };
+//static const char *plybck[] = { "playerctl", "--player=%any,mpd", "position 5-", NULL };
+//static const char *blightup[] = { "light", "-A", "1", NULL };
+//static const char *blightdown[] = { "light", "-U", "1", NULL };
+//static const char *audioup[] = { "volsv", "-i", NULL };
+//static const char *audiodown[] = { "volsv", "-d", NULL };
+//static const char *audiomute[] = { "volsv", "-t", NULL };
+//static const char *micmute[] = { "pamixer", "--source", "1", "-t", NULL };
+//static const char *lockscr[] = { "xscreensaver-command", "-lock", NULL };
+//static const char *xidletog[] = { "xidletog", NULL };
+//static const char *xkillcmd[] = { "xkill", NULL };
static Key keys[] = {
/* modifier key function argument */
{ MODKEY, XK_d, spawn, {.v = dmenucmd } },
{ MODKEY, XK_p, spawn, {.v = passmenu } },
- { MODKEY, XK_c, spawn, {.v = xidletog } },
- { MODKEY, XK_x, spawn, {.v = xkillcmd } },
+// { MODKEY, XK_c, spawn, {.v = xidletog } },
+// { MODKEY, XK_x, spawn, {.v = xkillcmd } },
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
- { 0, XF86XK_AudioPlay, spawn, {.v = mpdtoggle } },
- { 0, XF86XK_AudioNext, spawn, {.v = mpdnext } },
- { 0, XF86XK_AudioPrev, spawn, {.v = mpdprev } },
- { ShiftMask, XF86XK_AudioPlay, spawn, {.v = plytoggle } },
- { ShiftMask, XF86XK_AudioNext, spawn, {.v = plyfwd } },
- { ShiftMask, XF86XK_AudioPrev, spawn, {.v = plybck } },
- { 0, XF86XK_MonBrightnessUp, spawn, {.v = blightup } },
- { 0, XF86XK_MonBrightnessDown, spawn, {.v = blightdown } },
- { 0, XF86XK_AudioLowerVolume, spawn, {.v = audiodown } },
- { 0, XF86XK_AudioRaiseVolume, spawn, {.v = audioup } },
- { 0, XF86XK_AudioMute, spawn, {.v = audiomute } },
- { 0, XF86XK_AudioMicMute, spawn, {.v = micmute } },
- { Mod4Mask, XK_l, spawn, {.v = lockscr } },
+// { 0, XF86XK_AudioPlay, spawn, {.v = mpdtoggle } },
+// { 0, XF86XK_AudioNext, spawn, {.v = mpdnext } },
+// { 0, XF86XK_AudioPrev, spawn, {.v = mpdprev } },
+// { ShiftMask, XF86XK_AudioPlay, spawn, {.v = plytoggle } },
+// { ShiftMask, XF86XK_AudioNext, spawn, {.v = plyfwd } },
+// { ShiftMask, XF86XK_AudioPrev, spawn, {.v = plybck } },
+// { 0, XF86XK_MonBrightnessUp, spawn, {.v = blightup } },
+// { 0, XF86XK_MonBrightnessDown, spawn, {.v = blightdown } },
+// { 0, XF86XK_AudioLowerVolume, spawn, {.v = audiodown } },
+// { 0, XF86XK_AudioRaiseVolume, spawn, {.v = audioup } },
+// { 0, XF86XK_AudioMute, spawn, {.v = audiomute } },
+// { 0, XF86XK_AudioMicMute, spawn, {.v = micmute } },
+// { Mod4Mask, XK_l, spawn, {.v = lockscr } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
diff --git a/dwm.1 b/dwm.1
index a9f276c..68b6722 100644
--- a/dwm.1
+++ b/dwm.1
@@ -74,85 +74,6 @@ Spawn
.BR dmenu(1)
for launching other programs.
.TP
-.B Mod1\-c
-Spawn xidletog to change caffeine/xautolock state.
-.TP
-.B Mod1\-x
-Spawn
-.BR xkill(1)
-to kill any selected window.
-.TP
-.B AudioPlay
-Spawn
-.BR playerctl(1)
-to toggle (in order, if not found)
-.BR mpd(1),
-.BR mpv(1),
-or any other MPRIS compatible media player
-.TP
-.B AudioNext
-Spawn
-.BR playerctl(1)
-to go to next track of (in order, if not found)
-.BR mpd(1),
-.BR mpv(1),
-or any other MPRIS compatible media player
-.TP
-.B AudioPrev
-Spawn
-.BR playerctl(1)
-to go to previous track of (in order, if not found)
-.BR mpd(1),
-.BR mpv(1),
-or any other MPRIS compatible media player
-.TP
-.B Shift\-AudioPlay
-Spawn
-.BR playerctl(1)
-to toggle (in order, if not found) any other MPRIS compatible media player, pr
-.BR mpd(1).
-.TP
-.B Shift\-AudioNext
-Spawn
-.BR playerctl(1)
-to skip forward in (in order, if not found) any other MPRIS compatible media player, pr
-.BR mpd(1).
-.TP
-.B Shift\-AudioPrev
-Spawn
-.BR playerctl(1)
-to toggle (in order, if not found) any other MPRIS compatible media player, pr
-.BR mpd(1).
-.TP
-.B MonBrightnessUp
-Spawn
-.BR light(1)
-to turn the backlight brightness up
-.TP
-.B MonBrightnessDown
-Spawn
-.BR light(1)
-to turn the backlight brightness down
-.TP
-.B AudioLowerVolume
-Spawn volsv to turn the volume (pulseaudio first, alsa if not found) down
-.TP
-.B AudioRaiseVolume
-Spawn volsv to turn the volume (pulseaudio first, alsa if not found) up
-.TP
-.B AudioMute
-Spawn volsv to mute the volume (pulseaudio first, alsa if not found)
-.TP
-.B AudioMicMute
-Spawn
-.BR pamixer(1)
-to mute the microphone.
-.TP
-.B Mod4\-l
-Spawn
-.BR i3lock-fancy(1)
-to lock the screen.
-.TP
.B Mod1\-b
Toggles bar on and off.
.TP
diff --git a/volsv b/volsv
index 2732a1c..9e62a7c 100755
--- a/volsv
+++ b/volsv
@@ -14,8 +14,7 @@ alsasv () {
"up" | "-i") amixer sset Master 5%+ ;;
"down" | "-d") amixer sset Master 5%- ;;
"toggle" | "-t") amixer sset Master toggle ;;
- "mic" | "-m") amixer set Capture toggle ;;
esac
}
# check which it is
-[ ! -z "$(pgrep pulseaudio)" ] && pulsesv $1 || alsasv $1 ; pkill -RTMIN+10 dwmblocks ; touch /tmp/volsv.tmp
+[ ! -z $(pgrep pulseaudio) ] && pulsesv $1 || alsasv $1 ; pkill -RTMIN+10 dwmblocks