ewpt3ch/dotfiles-old
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pulled yoga2

Browse Source
This commit is contained in:
Eric Phillips
2019-05-03 02:20:07 +00:00
parent 89b812c0dd 2f6f026bc6
commit ffc562affa
27 changed files with 566 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dwm.config.h
+34 -3
View File
@@ -5,17 +5,30 @@
/* appearance */
static const char font[] = "Inconsolataicon-12";
<<<<<<< HEAD
#define NUMCOLORS 9
=======
#define NUMCOLORS 9
>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898
static const char colors[NUMCOLORS][ColLast][9] = {
// border foreground background
{ "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal
{ "#696969", "#ADFF2F", "#2F4F4F" }, // 1 = selected
<<<<<<< HEAD
{ "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent
{ "#212121", "#90EE90", "#778899" }, // 3 = important
{ "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow
{ "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue
{ "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan
{ "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta
=======
{ "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent
{ "#212121", "#90EE90", "#778899" }, // 3 = important
{ "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow
{ "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue
{ "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan
{ "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta
>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898
{ "#212121", "#F5F5F5", "#2F4F4F" }, // 8 = grey
};
static const unsigned int borderpx = 1; /* border pixel of windows */
@@ -56,25 +69,43 @@ static const Layout layouts[] = {
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */
<<<<<<< HEAD
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL };
=======
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL };
>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898
static const char *termcmd[] = { "termite", NULL };
/*functions for volume control*/
static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL};
static const char *downvol[] = { "amixer", "sset", "Master", "1%-", NULL};
static const char *mute[] = { "amixer", "sset", "Master", "toggle", NULL};
static const char *upvol[] = { "volumeset", "up", NULL };
static const char *downvol[] = { "volumeset", "down", NULL };
static const char *mute[] = { "volumeset", "mute", NULL };
/*cmus functions*/
static const char *cmusplaypause[] = { "cmus-remote", "-u", NULL};
static const char *cmusnext[] = { "cmus-remote", "--next", NULL};
static const char *cmusprev[] = { "cmus-remote", "--prev", NULL};
/*screenshot*/
static const char *screenshot[] = { "scrot", NULL};
/*multi-head*/
static const char *multihead[] = { "hdmi-plug.sh", NULL};
static Key keys[] = {
/* modifier key function argument */
{ 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol} },
{ 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol} },
{ 0, XF86XK_AudioMute, spawn, {.v = mute } },
<<<<<<< HEAD
{ MODKEY, XK_u, spawn, {.v = cmusplaypause} },
{ MODKEY, XK_bracketright, spawn, {.v = cmusnext} },
{ MODKEY, XK_bracketleft, spawn, {.v = cmusprev} },
=======
{ 0, XF86XK_AudioPlay, spawn, {.v = cmusplaypause} },
{ 0, XF86XK_AudioPause, spawn, {.v = cmusplaypause} },
{ MODKEY, XK_u, spawn, {.v = cmusplaypause} },
{ MODKEY, XK_bracketright, spawn, {.v = cmusnext} },
{ MODKEY, XK_bracketleft, spawn, {.v = cmusprev} },
{ MODKEY|ControlMask, XK_s, spawn, {.v = screenshot} },
{ MODKEY|ControlMask, XK_m, spawn, {.v = multihead} },
>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_b, togglebar, {0} },