aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Pedroni <e.pedroni91@gmail.com>2017-05-31 21:39:39 +0200
committerEduardo Pedroni <e.pedroni91@gmail.com>2017-05-31 21:39:39 +0200
commited0dbbe50afe6987b947204ec49460539599b2b4 (patch)
tree8cb1e369a7694a516c4f443ac55cb8bf1d9588c1
parent4e88dd96b4e8b02dba337d1d7435bed64d155c8a (diff)
Standardised configs a bit more, removed some old settings that I didn't use and added some new ones I need
-rw-r--r--config-desktop.h13
-rw-r--r--config-laptop.h11
2 files changed, 14 insertions, 10 deletions
diff --git a/config-desktop.h b/config-desktop.h
index 6ddddf2..01eb9ed 100644
--- a/config-desktop.h
+++ b/config-desktop.h
@@ -63,13 +63,14 @@ static const Rule rules[] = {
//{ NULL, NULL, NULL, 0, False, -1 },
{ "Surf", "surf", NULL, 1 << 0, False, -1 },
{ "Chromium", "chromium", NULL, 1 << 0, False, -1 },
+ { "Firefox", "Navigator", NULL, 1 << 0, False, -1 },
- { "XTerm", "weechat", "weechat", 1 << 1, False, -1 },
+ { "Thunderbird", "Mail", NULL, 1 << 1, False, -1 },
{ "Chromium", "crx_knipolnnllmklapflnccelgolnpehhpl", NULL, 1 << 1, False, -1},
{ "Slack", "slack", NULL, 1 << 1, False, -1},
{ "Eclipse", "Eclipse", NULL, 1 << 2, False, -1 },
- { "sun-awt-X11-XFramePeer", "jetbrains-idea", NULL, 1 << 2, False, -1 },
+ { "jetbrains-idea", "sun-awt-X11-XFramePeer", NULL, 1 << 2, False, -1 },
{ "TeXstudio", "texstudio", NULL, 1 << 3, False, -1 },
{ "Abiword", "abiword", NULL, 1 << 3, False, -1 },
@@ -106,10 +107,11 @@ static const Layout layouts[] = {
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 *termcmd[] = { "xterm", NULL };
static const char *browsercmd[] = { "chromium", NULL };
-static const char *weechatcmd[] = { "xterm", "-name", "weechat", "-e", "weechat", NULL };
+static const char *emailcmd[] = { "thunderbird", NULL };
static const char *playercmd[] = { "deadbeef", NULL };
static const char *editorcmd[] = { "gedit", NULL };
static const char *scrotcmd[] = { "scrot", "/home/eddy/screenshots/%Y-%m-%d-%H:%M:%S.png", NULL };
+static const char *lockcmd[] = { "i3lock", "-c", "000000", NULL };
static const char *lowervolumecmd[] = { "amixer", "-q", "set", "Master", "2dB-", NULL };
static const char *raisevolumecmd[] = { "amixer", "-q", "set", "Master", "2dB+", NULL };
@@ -121,9 +123,10 @@ static Key keys[] = {
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_t, spawn, {.v = browsercmd } },
{ MODKEY|ShiftMask, XK_p, spawn, {.v = playercmd } },
- { MODKEY|ShiftMask, XK_o, spawn, {.v = weechatcmd } },
+ { MODKEY|ShiftMask, XK_o, spawn, {.v = emailcmd } },
{ MODKEY|ShiftMask, XK_i, spawn, {.v = editorcmd } },
- { 0, XK_Print, spawn, {.v = scrotcmd } },
+ { MODKEY, XK_p, spawn, {.v = lockcmd } },
+ { 0, XK_Print, spawn, {.v = scrotcmd } },
{ 0, SEARCH, prodlock, {0} },
diff --git a/config-laptop.h b/config-laptop.h
index 3ee2eda..c905c36 100644
--- a/config-laptop.h
+++ b/config-laptop.h
@@ -64,13 +64,14 @@ static const Rule rules[] = {
//{ NULL, NULL, NULL, 0, False, -1 },
{ "Surf", "surf", NULL, 1 << 0, False, -1 },
{ "Chromium", "chromium", NULL, 1 << 0, False, -1 },
+ { "Firefox", "Navigator", NULL, 1 << 0, False, -1 },
- { "XTerm", "weechat", "weechat", 1 << 1, False, -1 },
+ { "Thunderbird", "Mail", NULL, 1 << 1, False, -1 },
{ "Chromium", "crx_knipolnnllmklapflnccelgolnpehhpl", NULL, 1 << 1, False, -1},
- { "Slack", "slack", NULL, 1 << 1, False, -1},
+ { "Slack", "slack", NULL, 1 << 1, False, -1},
{ "Eclipse", "Eclipse", NULL, 1 << 2, False, -1 },
- { "sun-awt-X11-XFramePeer", "jetbrains-idea", NULL, 1 << 2, False, -1 },
+ { "jetbrains-idea", "sun-awt-X11-XFramePeer", NULL, 1 << 2, False, -1 },
{ "TeXstudio", "texstudio", NULL, 1 << 3, False, -1 },
{ "Abiword", "abiword", NULL, 1 << 3, False, -1 },
@@ -107,7 +108,7 @@ static const Layout layouts[] = {
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 *termcmd[] = { "xterm", NULL };
static const char *browsercmd[] = { "chromium", NULL };
-static const char *weechatcmd[] = { "xterm", "-name", "weechat", "-e", "weechat", NULL };
+static const char *emailcmd[] = { "thunderbird", NULL };
static const char *playercmd[] = { "deadbeef", NULL };
static const char *editorcmd[] = { "gedit", NULL };
static const char *scrotcmd[] = { "scrot", "/home/eddy/screenshots/%Y-%m-%d-%H:%M:%S.png", NULL };
@@ -127,7 +128,7 @@ static Key keys[] = {
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_t, spawn, {.v = browsercmd } },
{ MODKEY|ShiftMask, XK_p, spawn, {.v = playercmd } },
- { MODKEY|ShiftMask, XK_o, spawn, {.v = weechatcmd } },
+ { MODKEY|ShiftMask, XK_o, spawn, {.v = emailcmd } },
{ MODKEY|ShiftMask, XK_i, spawn, {.v = editorcmd } },
{ MODKEY, XK_p, spawn, {.v = lockcmd } },
{ 0, XK_Print, spawn, {.v = scrotcmd } },