commit 3796a3ff570a574f6b4b385bed633f59c0e5e9a8
parent 0a6ac00dfb194e8aaf054036a95e705f82b6fe35
Author: Matsuda Kenji <contact2655@matsudakenji.xyz>
Date: Thu, 16 Jun 2022 11:01:06 +0900
customize
Diffstat:
| M | config.diff | | | 71 | ++++++++++++++++++++++++++++++++++++++--------------------------------- |
| M | config.h | | | 6 | ++++-- |
2 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/config.diff b/config.diff
@@ -1,73 +1,78 @@
---- config.h 2021-08-05 10:46:13.691533000 +0900
-+++ config.def.h 2021-06-18 14:17:53.613576000 +0900
-@@ -1,7 +1,7 @@
+--- config.def.h Thu Nov 18 08:37:04 2021
++++ config.h Mon May 2 16:06:58 2022
+@@ -1,25 +1,25 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
--static const unsigned int borderpx = 0; /* border pixel of windows */
-+static const unsigned int borderpx = 1; /* border pixel of windows */
+-static const unsigned int borderpx = 1; /* border pixel of windows */
++static const unsigned int borderpx = 0; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
-@@ -11,15 +11,15 @@
+-static const char *fonts[] = { "monospace:size=10" };
+-static const char dmenufont[] = "monospace:size=10";
++static const char *fonts[] = { "Liberation Mono:size=7", "Font Awesome 5 Free:size=10", "Font Awesome 5 Brands:size=10", "Noto Color Emoji:size=7", "Noto Sans CJK JP:size=7" };
++static const char dmenufont[] = "monospace:size=8";
+ static const char col_gray1[] = "#222222";
static const char col_gray2[] = "#444444";
static const char col_gray3[] = "#bbbbbb";
static const char col_gray4[] = "#eeeeee";
--static const char col_highlight[] = "#324d45";
-+static const char col_cyan[] = "#005577";
+-static const char col_cyan[] = "#005577";
++static const char col_highlight[] = "#324d45";
static const char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-- [SchemeSel] = { col_gray4, col_highlight, col_highlight },
-+ [SchemeSel] = { col_gray4, col_cyan, col_cyan },
+- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++ [SchemeSel] = { col_gray4, col_highlight, col_highlight },
};
/* tagging */
--static const char *tags[] = { "1", "2", "3"};
-+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
++static const char *tags[] = { "1", "2", "3"};
static const Rule rules[] = {
/* xprop(1):
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
};
/* key definitions */
--#define MODKEY Mod4Mask
-+#define MODKEY Mod1Mask
+-#define MODKEY Mod1Mask
++#define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
-@@ -56,19 +56,13 @@
+@@ -57,13 +57,20 @@
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
--static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_highlight, "-sf", col_gray4, NULL };
--static const char *termcmd[] = { "$TERMINAL", NULL };
-+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-+static const char *termcmd[] = { "st", NULL };
+-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+-static const char *termcmd[] = { "st", NULL };
++/*static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_highlight, "-sf", col_gray4, NULL };*/
++static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_highlight, "-sf", col_gray4, NULL };
++static const char *termcmd[] = { "$TERMINAL", NULL };
--#include <X11/XF86keysym.h>
--
++#include <X11/XF86keysym.h>
++
static Key keys[] = {
/* modifier key function argument */
-- { MODKEY|ShiftMask, XK_b, spawn, SHCMD("$BROWSER") },
-- { MODKEY|ShiftMask, XK_s, spawn, SHCMD("$SURF") },
-- { MODKEY, XK_n, spawn, SHCMD("jinput") },
++ { MODKEY|ShiftMask, XK_b, spawn, SHCMD("$BROWSER") },
++ { MODKEY|ShiftMask, XK_s, spawn, SHCMD("$SURF") },
++ { MODKEY, XK_n, spawn, SHCMD("jinput") },
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
-- /*{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },*/
-- { MODKEY|ShiftMask, XK_Return, spawn, SHCMD("$TERMINAL") },
-+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
++ /*{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },*/
++ { MODKEY|ShiftMask, XK_Return, spawn, SHCMD("$TERMINAL") },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
-@@ -100,10 +94,6 @@
+@@ -95,6 +102,10 @@
TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8)
{ MODKEY|ShiftMask, XK_q, quit, {0} },
--
--
-- { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("mixer vol +3 >/dev/null; kill -75 $(pidof dwmblocks)") },
-- { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("mixer vol -3 >/dev/null; kill -75 $(pidof dwmblocks)") },
++
++
++ { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("mixer vol +3 >/dev/null; kill -75 $(pidof dwmblocks)") },
++ { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("mixer vol -3 >/dev/null; kill -75 $(pidof dwmblocks)") },
};
/* button definitions */
diff --git a/config.h b/config.h
@@ -5,7 +5,7 @@ static const unsigned int borderpx = 0; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
-static const char *fonts[] = { "monospace:size=8" };
+static const char *fonts[] = { "DejaVu Sans Mono:size=7", "Noto Serif CJK JP:size=7", "Font Awesome 5 Free:size=7", "Noto Color Emoji:size=7"};
static const char dmenufont[] = "monospace:size=8";
static const char col_gray1[] = "#222222";
static const char col_gray2[] = "#444444";
@@ -57,7 +57,8 @@ static const Layout layouts[] = {
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_highlight, "-sf", col_gray4, NULL };
+/*static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_highlight, "-sf", col_gray4, NULL };*/
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_highlight, "-sf", col_gray4, NULL };
static const char *termcmd[] = { "$TERMINAL", NULL };
#include <X11/XF86keysym.h>
@@ -68,6 +69,7 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("$SURF") },
{ MODKEY, XK_n, spawn, SHCMD("jinput") },
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_p, spawn, SHCMD("pass dmenu") },
/*{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },*/
{ MODKEY|ShiftMask, XK_Return, spawn, SHCMD("$TERMINAL") },
{ MODKEY, XK_b, togglebar, {0} },
