diff --git a/dmenu/config.def.h b/dmenu/config.def.h index 81cc894..ccedfa8 100644 --- a/dmenu/config.def.h +++ b/dmenu/config.def.h @@ -17,8 +17,8 @@ static const char *colors[SchemeLast][2] = { [SchemePrompt] = { "#444444", "#222222" }, }; /* -l and -g options; controls number of lines and columns in grid if > 0 */ -static unsigned int lines = 0; -static unsigned int columns = 0; +static unsigned int lines = 5; +static unsigned int columns = 2; /* * Characters not considered part of a word while deleting words diff --git a/dmenu/config.h b/dmenu/config.h index 81cc894..ccedfa8 100644 --- a/dmenu/config.h +++ b/dmenu/config.h @@ -17,8 +17,8 @@ static const char *colors[SchemeLast][2] = { [SchemePrompt] = { "#444444", "#222222" }, }; /* -l and -g options; controls number of lines and columns in grid if > 0 */ -static unsigned int lines = 0; -static unsigned int columns = 0; +static unsigned int lines = 5; +static unsigned int columns = 2; /* * Characters not considered part of a word while deleting words diff --git a/dmenu/config.mk b/dmenu/config.mk index 6f55670..a54dd42 100644 --- a/dmenu/config.mk +++ b/dmenu/config.mk @@ -1,6 +1,8 @@ # dmenu version VERSION = 5.4-odweta +PKG_CONFIG := pkg-config + # paths PREFIX = /usr MANPREFIX = $(PREFIX)/share/man diff --git a/dwm/config/appearance.h b/dwm/config/appearance.h index 8c3fa93..6828d36 100644 --- a/dwm/config/appearance.h +++ b/dwm/config/appearance.h @@ -6,14 +6,40 @@ static const int topbar = 1; /* 0 means bottom bar */ #define MAIN_FONT "JetBrainsMono Nerd Font Propo:size=14" static const char *fonts[] = { MAIN_FONT }; static const char dmenufont[] = MAIN_FONT; -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_main[] = "#735e97"; -static const char *colors[][3] = { + +/* Gruvbox */ +static const char col_gray1[] = "#1d2021"; /* hard dark background */ +static const char col_gray2[] = "#504945"; /* inactive border */ +static const char col_gray3[] = "#ebdbb2"; /* normal text */ +static const char col_gray4[] = "#ebdbb2"; /* selected text */ +static const char col_main[] = "#3c3836"; /* muted selected background */ + +static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, [SchemeSel] = { col_gray4, col_main, col_main }, }; +// static const char col_gray1[] = "#1d2021"; /* hard dark background */ +// static const char col_gray2[] = "#504945"; /* inactive border */ +// static const char col_gray3[] = "#ebdbb2"; /* normal text */ +// static const char col_gray4[] = "#1d2021"; /* selected text */ +// static const char col_main[] = "#d79921"; /* selected background */ +// +// static const char *colors[][3] = { +// /* fg bg border */ +// [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, +// [SchemeSel] = { col_gray4, col_main, col_main }, +// }; +/* dracula */ +// 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_main[] = "#735e97"; +// static const char *colors[][3] = { +// /* fg bg border */ +// [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, +// [SchemeSel] = { col_gray4, col_main, col_main }, +// }; +// diff --git a/install.sh b/install.sh index b4421af..5c4b948 100755 --- a/install.sh +++ b/install.sh @@ -2,6 +2,8 @@ set -e +export PKG_CONFIG=pkg-config + install_module() { cd "$1" make clean @@ -10,10 +12,10 @@ install_module() { cd - >/dev/null } -install_module dmenu -install_module dwm -install_module dwmblocks -install_module slock +install_module dmenu +install_module dwm +install_module dwmblocks +install_module slock install_module st echo "linking .xinitrc into ~/"