diff --git a/project.el b/project.el index bcb586b..78fd4d8 100644 --- a/project.el +++ b/project.el @@ -266,15 +266,27 @@ Return output file name." :sitemap-format-entry date-format-entry :sitemap-function org-blog-posts-sitemap-fn) - - ("assets" + ("css" :base-directory ,assets-dir - :base-extension ".*" - :exclude ".*\.org$" + :base-extension "css" :publishing-directory ,publish-assets-dir :publishing-function org-blog-publish-attachment :recursive t) + ("img" + :base-directory ,assets-dir + :base-extension "(jpg|png|gif|jpeg)" + :publishing-directory ,publish-assets-dir + :publishing-function org-blog-publish-attachment + :recursive t) + + ("files" + :base-directory ,assets-dir + :base-extension ".*" + :exclude ".*\.(org|css|jpg|png|gif|jpeg)$" + :publishing-directory ,publish-assets-dir + :publishing-function org-blog-publish-attachment + :recursive t) ("draft-org-files" :base-directory ,base-dir @@ -294,18 +306,30 @@ Return output file name." :htmlized-source t :html-head-extra ,org-blog-head :html-preamble org-blog-preamble - :html-postamble org-blog-postamble - - ) - ("draft-assets" + :html-postamble org-blog-postamble) + ("draft-css" + :base-directory ,assets-dir + :base-extension "css" + :publishing-directory ,draft-publish-assets-dir + :publishing-function org-blog-publish-attachment + :recursive t) + ("draft-img" + :base-directory ,assets-dir + :base-extension "(jpg|png|gif|jpeg)" + :publishing-directory ,draft-publish-assets-dir + :publishing-function org-blog-publish-attachment + :recursive t) + ("draft-files" :base-directory ,assets-dir :base-extension ".*" - :exclude ".*\.org$" + :include ".*\.(org|css|jpg|png|gif|jpeg)$" :publishing-directory ,draft-publish-assets-dir :publishing-function org-blog-publish-attachment :recursive t) + ("assets" :components ("css" "img" "files")) ("blog" :components ("orgfiles" "assets")) + ("draft-assets" :components ("draft-css" "draft-img" "draft-files")) ("draft" :components ("draft-org-files" "draft-assets")))) ;; add target=_blank and rel="noopener noreferrer" to all links by default diff --git a/project.el.sig b/project.el.sig index b25385f..2515641 100644 Binary files a/project.el.sig and b/project.el.sig differ diff --git a/src/css/mk.css b/src/css/mk.css index 897e623..1180a25 100644 --- a/src/css/mk.css +++ b/src/css/mk.css @@ -285,7 +285,7 @@ img { :root { /* Dark */ --bg: var(--b03); - --fg: var(--b0); + --fg: var(--b1); --fg0: var(--b00); --bg2: var(--b02); --fg2: var(--b1); @@ -302,7 +302,7 @@ img { #d:checked ~ .main, #d:checked ~ #labels { --bg: var(--b03); - --fg: var(--b0); + --fg: var(--b1); --fg0: var(--b00); --bg2: var(--b02); --fg2: var(--b1); @@ -476,7 +476,7 @@ code, .main code { .org-outshine-level-1, .org-outshine-level-2, .org-outshine-level-3, .org-outshine-level-4, .org-outshine-level-5, .org-outshine-level-6, .org-outshine-level-7, .org-outshine-level-8, .org-outshine-level-9 { - color:var(--fg2); + color:var(--fg0); } .org-highlight-numbers-number, .org-highlight-number-number diff --git a/src/posts/0010-Haskell-Now/index.org b/src/posts/0010-Haskell-Now/index.org index 47dd8e4..5a44d33 100644 --- a/src/posts/0010-Haskell-Now/index.org +++ b/src/posts/0010-Haskell-Now/index.org @@ -179,32 +179,32 @@ The article contains five parts: {{{lnk(shell.nix)}}} #+begin_src nix :tangle shell.nix - { nixpkgs ? import (fetchTarball https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz) {} }: - let - inherit (nixpkgs) pkgs; - inherit (pkgs) haskellPackages; +{ nixpkgs ? import (fetchTarball https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz) {} }: +let + inherit (nixpkgs) pkgs; + inherit (pkgs) haskellPackages; - haskellDeps = ps: with ps; [ - base - protolude - containers - ]; + haskellDeps = ps: with ps; [ + base + protolude + containers + ]; - ghc = haskellPackages.ghcWithPackages haskellDeps; + ghc = haskellPackages.ghcWithPackages haskellDeps; - nixPackages = [ - ghc - pkgs.gdb - haskellPackages.cabal-install - ]; - in - pkgs.stdenv.mkDerivation { - name = "env"; - buildInputs = nixPackages; - shellHook = '' - export PS1="\n\[[hs:\033[1;32m\]\W\[\033[0m\]]> " - ''; - } + nixPackages = [ + ghc + pkgs.gdb + haskellPackages.cabal-install + ]; +in +pkgs.stdenv.mkDerivation { + name = "env"; + buildInputs = nixPackages; + shellHook = '' + export PS1="\n\[[hs:\033[1;32m\]\W\[\033[0m\]]> " + ''; +} #+end_src 5. In the =hsenv= directory, in a terminal, run =nix-shell --pure=. @@ -220,11 +220,11 @@ The article contains five parts: something like this: #+begin_src - ~/hsenv> nix-shell - [nix-shell:~/hsenv]$ ghci - GHCi, version 8.6.5: http://www.haskell.org/ghc/ :? for help - Prelude> import Protolude - Prelude Protolude> +~/hsenv> nix-shell +[nix-shell:~/hsenv]$ ghci +GHCi, version 8.6.5: http://www.haskell.org/ghc/ :? for help +Prelude> import Protolude +Prelude Protolude> #+end_src Congratulations you should be ready to start now.