Added themes

9 files changed, 161 insertions, 10 deletions

diff --git a/README.md b/README.md
index 3187cd7..baa7132 100644
--- a/README.md
+++ b/README.md
@@ -7,4 +7,20 @@ This is the setup I use on Linux. I use my own versions of dwm, dmenu, and dwmbl
 
 Installing is done by running the install.sh script.
 
+## Themes
+Their are dwm config files that are different themes. You can change what theme you want in the install.sh file. Then run it again, and the theme will change.
 
+Note that if you want to change anything in the dwm config, do it in dwm/themes/theme_you_want, otherwise it won't be permanent.
+
+### Current Themes
+
+- Red
+
+- Blue
+
+## Credits
+
+### st
+Luke Smith (lukesmith.xyz) is the creator of the version of st I am using, so thanks to him. https://github.com/LukeSmithxyz/
+
+### Wallpapers
diff --git a/dwm-6.2/config.h b/dwm-6.2/config.h
index 05d2e77..5eae90e 100644
--- a/dwm-6.2/config.h
+++ b/dwm-6.2/config.h
@@ -14,7 +14,7 @@ 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_cyan[]        = "#0a0063";
+static const char col_cyan[]        = "#bf0d00";
 static const char *colors[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
diff --git a/dwm-6.2/dwm b/dwm-6.2/dwm
index 71bb797..ed29cad 100755
--- a/dwm-6.2/dwm
+++ b/dwm-6.2/dwm
diff --git a/dwm-6.2/dwm.o b/dwm-6.2/dwm.o
index 240a054..39cd130 100644
--- a/dwm-6.2/dwm.o
+++ b/dwm-6.2/dwm.o
diff --git a/dwm-6.2/themes/blue b/dwm-6.2/themes/blue
new file mode 100644
index 0000000..05d2e77
--- /dev/null
+++ b/dwm-6.2/themes/blue
@@ -0,0 +1,130 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const unsigned int borderpx  = 1;        /* border pixel of windows */
+static const unsigned int gappx     = 30;        /* gaps between 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 int vertpad            = 5;
+static const int sidepad            = 8;
+static const char *fonts[]          = { "Source Code Pro:size=9" };
+static const char dmenufont[]       = "Source Code Pro:size=9";
+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_cyan[]        = "#0a0063";
+static const char *colors[][3]      = {
+	/*               fg         bg         border   */
+	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
+};
+
+/* tagging */
+static const char *tags[] = { "/", "dev", "web", "etc", };
+
+static const Rule rules[] = {
+	/* xprop(1):
+	 *	WM_CLASS(STRING) = instance, class
+	 *	WM_NAME(STRING) = title
+	 */
+	/* class      instance    title       tags mask     isfloating   monitor */
+	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
+	{ "Steam",    NULL,       NULL,       0,            1,           -1},
+	{ "Firefox",  NULL,       NULL,       2 << 1,       0,           -1 },
+	{ "st",       NULL,       NULL,       2,            0,           -1 },
+};
+
+/* layout(s) */
+static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
+static const int nmaster     = 1;    /* number of clients in master area */
+static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
+
+static const Layout layouts[] = {
+	/* symbol     arrange function */
+	{ "[]",      tile },    /* first entry is default */
+	{ "_-_",      NULL },    /* no layout function means floating behavior */
+	{ "(0*0)",      monocle },
+};
+
+/* key definitions */
+#define MODKEY Mod1Mask
+#define TAGKEYS(KEY,TAG) \
+	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
+	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* 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_cyan, "-sf", col_gray4, NULL };
+static const char *termcmd[]  = { "st", NULL };
+
+static Key keys[] = {
+	/* modifier                     key        function        argument */
+	{ MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } },
+	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+/*	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+*/	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+	{ MODKEY|ShiftMask,             XK_Return, zoom,           {0} },
+	{ MODKEY,                       XK_Tab,    view,           {0} },
+	{ MODKEY,                       XK_x,      killclient,     {0} },
+	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                       XK_space,  setlayout,      {0} },
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
+	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+	{ MODKEY,                       XK_minus,  setgaps,        {.i = -1 } },
+	{ MODKEY,                       XK_equal,  setgaps,        {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_equal,  setgaps,        {.i = 0  } },
+	{ MODKEY|ShiftMask, 		XK_f,      spawn,          SHCMD("qutebrowser") },
+	{ MODKEY|ShiftMask,             XK_h,      spawn,          SHCMD("st htop") },
+	{ MODKEY|ShiftMask,             XK_u,      spawn,          SHCMD("~/.local/bin/vol_up") },
+	{ MODKEY|ShiftMask,             XK_d,      spawn,          SHCMD("~/.local/bin/vol_down") },
+	{ MODKEY|ShiftMask,             XK_m,      spawn,           SHCMD("~/.local/bin/mute") },  
+/*      { MODKEY, 			XK_F2,     spawn,          SHCMD("~/.bin/bright_up") },
+	{ MODKEY,			XK_F1,     spawn,          SHCMD("~/.bin/bright_down") },
+*/	TAGKEYS(                        XK_1,                      0)
+	TAGKEYS(                        XK_2,                      1)
+	TAGKEYS(                        XK_3,                      2)
+	TAGKEYS(                        XK_4,                      3)
+	TAGKEYS(                        XK_5,                      4)
+	TAGKEYS(                        XK_6,                      5)
+	TAGKEYS(                        XK_7,                      6)
+	TAGKEYS(                        XK_8,                      7)
+	TAGKEYS(                        XK_9,                      8)
+        { MODKEY|ShiftMask,             XK_q,      quit,           {0} },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static Button buttons[] = {
+	/* click                event mask      button          function        argument */
+	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
+	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
+	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
+	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
+	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
+	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
+	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
+	{ ClkTagBar,            0,              Button1,        view,           {0} },
+	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
+	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
+	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
+};
+
diff --git a/dwm-6.2/themes/red b/dwm-6.2/themes/red
index 5a6a744..5eae90e 100644
--- a/dwm-6.2/themes/red
+++ b/dwm-6.2/themes/red
@@ -14,7 +14,7 @@ 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_cyan[]        = "#0a0063";
+static const char col_cyan[]        = "#bf0d00";
 static const char *colors[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
@@ -93,14 +93,13 @@ static Key keys[] = {
 	{ MODKEY,                       XK_equal,  setgaps,        {.i = +1 } },
 	{ MODKEY|ShiftMask,             XK_equal,  setgaps,        {.i = 0  } },
 	{ MODKEY|ShiftMask, 		XK_f,      spawn,          SHCMD("qutebrowser") },
-	{ MODKEY,        		XK_m, 	   spawn,          SHCMD("minecraft-launcher") },
 	{ MODKEY|ShiftMask,             XK_h,      spawn,          SHCMD("st htop") },
-	{ MODKEY|ShiftMask,             XK_u,      spawn,          SHCMD("/usr/skywalkersw5/.local/bin/vol_up") },
-	{ MODKEY|ShiftMask,             XK_d,      spawn,          SHCMD("/usr/skywalkersw5/.local/bin/vol_down") },
-	{ MODKEY|ShiftMask,             XK_m,      spawn,           SHCMD("/usr/skywalkersw5/.local/bin/mute") },  
-	{ MODKEY, 			XK_F2,     spawn,          SHCMD("~/.bin/bright_up") },
+	{ MODKEY|ShiftMask,             XK_u,      spawn,          SHCMD("~/.local/bin/vol_up") },
+	{ MODKEY|ShiftMask,             XK_d,      spawn,          SHCMD("~/.local/bin/vol_down") },
+	{ MODKEY|ShiftMask,             XK_m,      spawn,           SHCMD("~/.local/bin/mute") },  
+/*      { MODKEY, 			XK_F2,     spawn,          SHCMD("~/.bin/bright_up") },
 	{ MODKEY,			XK_F1,     spawn,          SHCMD("~/.bin/bright_down") },
-	TAGKEYS(                        XK_1,                      0)
+*/	TAGKEYS(                        XK_1,                      0)
 	TAGKEYS(                        XK_2,                      1)
 	TAGKEYS(                        XK_3,                      2)
 	TAGKEYS(                        XK_4,                      3)
diff --git a/etc/wallpaper.jpg b/etc/blue.wallpaper.jpg
index 0920b93..0920b93 100755
--- a/etc/wallpaper.jpg
+++ b/etc/blue.wallpaper.jpg
diff --git a/etc/red.wallpaper.jpg b/etc/red.wallpaper.jpg
new file mode 100644
index 0000000..4cc72e2
--- /dev/null
+++ b/etc/red.wallpaper.jpg
diff --git a/install.sh b/install.sh
index d1c3a8d..579d4f3 100755
--- a/install.sh
+++ b/install.sh
@@ -4,14 +4,18 @@ dwm="dwm-6.2"
 dmenu="./dmenu-5.0"
 st="./st"
 dwmblocks="./dwmblocks"
+theme='red'
 
 echo "Welcome to the archrice installer script"
 echo
 echo "Installing requirements"
-sudo pacman -Sy --needed pulseaudio feh picom dunst xorg xorg-xinit
+sudo pacman -Sy --needed pulseaudio feh picom dunst xorg xorg-xinit adobe-source-code-pro-fonts
 echo "Starting dwm install"
+echo "The dwm theme is $theme"
 
 cd dwm-6.2
+rm config.h
+cp ./themes/$theme ./config.h
 sudo make -s install > ./log.txt
 
 cd ../$st
@@ -22,10 +26,12 @@ sudo make -s install > ./log.txt
 
 cd ../$dwmblocks
 sudo make -s install > ./log.txt
+cd ..
 
 echo "Copying files"
 cp ./etc/.xinitrc ~
-cp ./etc/wallpaper.jpg ~/.config/
+cp ./etc/$theme.wallpaper.jpg ~/.config/
+mv ~/.config/$theme.wallpaper.jpg ~/.config/wallpaper.jpg
 
 mkdir -p ~/.local/bin
 mkdir ~/.dwm/