commit 868bda0d594930d39e5697ae95c54758235e5edc
parent 44dcf5d98b08493c888654ba07993d2fce19d499
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Sun, 16 Dec 2018 16:13:40 +0100
Delete diff file (generated on the fly) and fix install makefile target
Diffstat:
| M | Makefile | | | 6 | ++++-- |
| D | general.diff | | | 107 | ------------------------------------------------------------------------------- |
2 files changed, 4 insertions(+), 109 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,8 @@
default: st/st
+.PHONY: install
+install: /usr/local/bin/st
+
st/st: st/config.h
@echo "Building st"
make -C st/
@@ -15,8 +18,7 @@ st/:
@echo "Fetching st source"
git clone git://git.suckless.org/st
-.PHONY: install
-install: st/st
+/usr/local/bin/st: st/st
sudo make -C st/ install
general.diff: config.h
diff --git a/general.diff b/general.diff
@@ -1,107 +0,0 @@
---- st/config.h 2018-12-16 16:08:37.323716503 +0100
-+++ config.h 2018-12-16 16:08:36.257049872 +0100
-@@ -5,7 +5,7 @@
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
--static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-+static char *font = "Pragmata Pro:pixelsize=14:antialias=true:autohint=true";
- static int borderpx = 2;
-
- /*
-@@ -24,8 +24,8 @@
- char *vtiden = "\033[?6c";
-
- /* Kerning / character bounding-box multipliers */
--static float cwscale = 1.0;
--static float chscale = 1.0;
-+static float cwscale = 0.925;
-+static float chscale = 0.9;
-
- /*
- * word delimiter string
-@@ -83,36 +83,35 @@
- unsigned int tabspaces = 8;
-
- /* bg opacity */
--unsigned int alpha = 0xcc;
-+unsigned int alpha = 230;
-
--/* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- /* 8 normal colors */
-- "black",
-- "red3",
-- "green3",
-- "yellow3",
-- "blue2",
-- "magenta3",
-- "cyan3",
-- "gray90",
-+ "#434944",
-+ "#da5673",
-+ "#8cc16d",
-+ "#eebf35",
-+ "#5cabdc",
-+ "#b595cf",
-+ "#44a9ba",
-+ "#fbfbf8",
-
- /* 8 bright colors */
-- "gray50",
-- "red",
-- "green",
-- "yellow",
-- "#5c5cff",
-- "magenta",
-- "cyan",
-- "white",
-+ "#6c6d6b",
-+ "#dba2b4",
-+ "#898e38",
-+ "#8a6b3d",
-+ "#126b8c",
-+ "#7457a2",
-+ "#87c7d4",
-+ "#bfc2bc",
-
- [255] = 0,
-
- /* more colors can be added after 255 to use with DefaultXX */
-- "#cccccc",
-- "#555555",
-- "black",
-+ [256] = "#000000", /* bg */
-+ [257] = "#ffffff", /* fg */
-+ [258] = "#ff00ff", /* cursorcolor */
- };
-
-
-@@ -120,10 +119,10 @@
- * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
--unsigned int defaultfg = 7;
--unsigned int defaultbg = 257;
--static unsigned int defaultcs = 256;
--static unsigned int defaultrcs = 257;
-+unsigned int defaultfg = 257;
-+unsigned int defaultbg = 256;
-+static unsigned int defaultcs = 258;
-+static unsigned int defaultrcs = 0;
-
- /*
- * Default shape of cursor
-@@ -174,9 +173,9 @@
- { ControlMask, XK_Print, toggleprinter, {.i = 0} },
- { ShiftMask, XK_Print, printscreen, {.i = 0} },
- { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
-- { TERMMOD, XK_Prior, zoom, {.f = +1} },
-- { TERMMOD, XK_Next, zoom, {.f = -1} },
-- { TERMMOD, XK_Home, zoomreset, {.f = 0} },
-+ { MODKEY|ShiftMask, XK_plus, zoom, {.f = +1} },
-+ { MODKEY|ShiftMask, XK_underscore, zoom, {.f = -1} },
-+ { MODKEY, XK_Home, zoomreset, {.f = 0} },
- { TERMMOD, XK_C, clipcopy, {.i = 0} },
- { TERMMOD, XK_V, clippaste, {.i = 0} },
- { TERMMOD, XK_Y, selpaste, {.i = 0} },
