diff --git a/Dockerfile.dev b/Dockerfile.dev index 280078f..ee6dcf9 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -16,7 +16,7 @@ RUN useradd -m -u 1000 -U -p '' -s /bin/bash hugo \ && mkdir -p /opt/workdir \ && chown -R 1000:1000 /home/hugo /opt/workdir /usr/local/bin/hugo -USER hugo +USER 1000 WORKDIR /opt/workdir diff --git a/archetypes/default.md b/archetypes/default.md index 7cd6309..592696b 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -2,6 +2,7 @@ title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} draft: true +tags: [] --- Headers @@ -93,8 +94,6 @@ Syntax highlighting } ``` - - Example code ```go diff --git a/assets/css/layout.scss b/assets/css/layout.scss index a1822d4..e56ea87 100644 --- a/assets/css/layout.scss +++ b/assets/css/layout.scss @@ -1,5 +1,6 @@ @import "nav"; @import "list"; +@import "syntax"; html, body { @@ -23,7 +24,7 @@ p { max-width: 1280px; margin: 0 auto; display: grid; - grid-template-columns: 5fr 1.5fr; + grid-template-columns: 3fr 1fr; } #header { @@ -48,3 +49,16 @@ p { grid-column-end: 3; font-size: 0.8rem; } + +.highlight { + line-height: 1.5em; + margin: 15px 0; + + .chroma { + padding-right: 10px; + } +} + +#openring { + margin: 35px 0; +} diff --git a/assets/css/nav.scss b/assets/css/nav.scss index b91c357..98c50d5 100644 --- a/assets/css/nav.scss +++ b/assets/css/nav.scss @@ -9,10 +9,10 @@ nav { } .title { - font-size: 0.8rem; + font-size: 0.9rem; } } #license { - font-size: 0.8rem; + font-size: 1rem; } diff --git a/config.toml b/config.toml index 080d352..4be6ac4 100644 --- a/config.toml +++ b/config.toml @@ -29,17 +29,30 @@ summaryLength = 32 url = "https://git.vdhsn.com/adam/blog" [[menu.other]] - name = "keybase.io/aveldhousen" - url = "https://keybase.io/aveldhousen" - - [[menu.other]] + Title = "Find me on GitHub" name = "github.com/adamveld12" url = "https://github.com/adamveld12" + [[menu.other]] + Title = "Follow me on Keybase" + name = "keybase.io/aveldhousen" + url = "https://keybase.io/aveldhousen" + [[menu.other]] name = "RSS" url = "/index.xml" [[menu.other]] name = "Resume" - url = "/resume_2019.pdf" \ No newline at end of file + url = "/resume_2019.pdf" + +[markup] + [markup.highlight] + codeFences = true + guessSyntax = false + lineNoStart = 1 + lineNos = true + lineNumbersInTable = true + noClasses = false + style = "monokai" + tabWidth = 4 \ No newline at end of file diff --git a/content/posts/git-tips-lint-test-precommit-hook.md b/content/posts/git-tips-lint-test-precommit-hook.md index 3490b54..b903498 100755 --- a/content/posts/git-tips-lint-test-precommit-hook.md +++ b/content/posts/git-tips-lint-test-precommit-hook.md @@ -1,14 +1,13 @@ --- title: "Git Tips - Lint + Test Pre-commit Hook" date: 2020-01-01T21:00:39Z -tags: [git, bash, ] +tags: [git, bash] --- One of my favorite inventions is a `pre-commit` hook that auto runs test and lint commands from a `makefile` or `package.json` if they're found: -```sh -{{}} +```bash {linenos=table} #!/usr/bin/env bash if [ -f "$PWD/makefile" ] && [ ! -z "$(cat $PWD/makefile | grep '^lint:')" ]; then @@ -26,7 +25,6 @@ elif [ -f "$PWD/package.json" ] && [ ! -z "$(cat $PWD/package.json | grep "^\"te echo "running npm run test" npm run test fi -{{}} ``` The `/usr/bin/env bash` piece ensures that the script has access to all of the environment variables you expect in your diff --git a/hugo b/hugo index 6e28a75..e8d55bc 100755 --- a/hugo +++ b/hugo @@ -2,8 +2,8 @@ if [ -z "$(docker ps | grep hugo)" ]; then exec docker run -it --rm --name hugo \ -p 1313:1313 \ - -u ${UID}:${UID} \ -v $PWD:/opt/workdir \ + -u 0 \ --entrypoint=/usr/local/bin/hugo hugo $@ else exec docker exec -it hugo hugo $@