diff --git a/about.md b/_input/about.md similarity index 100% rename from about.md rename to _input/about.md diff --git a/contact.markdown b/_input/contact.markdown similarity index 100% rename from contact.markdown rename to _input/contact.markdown diff --git a/css/default.css~ b/_input/css/default.css similarity index 87% rename from css/default.css~ rename to _input/css/default.css index a00cd43..34120e3 100644 --- a/css/default.css~ +++ b/_input/css/default.css @@ -14,7 +14,8 @@ body { img { max-width: 100%; - margin: 0 auto; + margin: auto; + display: block; } blockquote { @@ -53,10 +54,11 @@ a:visited { footer { margin-top: 3rem; + margin-bottom: 1.2rem; padding: 1.2rem 0; border-top: 0.2rem solid #eee; font-size: 1.2rem; - color: #555; + color: #ccf; } h1 { @@ -69,8 +71,8 @@ h2 { article .header { font-size: 1.4rem; - font-style: italic; - color: #555; + text-align: right; + color: #cfc; } .logo a { @@ -157,8 +159,18 @@ article .header { margin: 0 0 0 1.2rem; display: inline; } - footer { + footer a, footer a:visited { + color: #499cd4; + } + .bleft { + text-align: left; + display: inline; + float: left; + } + .bright { text-align: right; + display: inline; + float: right; } .logo { margin: 0; diff --git a/css/default.css b/_input/css/default.css~ similarity index 96% rename from css/default.css rename to _input/css/default.css~ index d4261fb..b16c7a1 100644 --- a/css/default.css +++ b/_input/css/default.css~ @@ -158,7 +158,13 @@ article .header { margin: 0 0 0 1.2rem; display: inline; } - footer { + footer a, footer a:visited { + + } + .bleft { + text-align: left; + } + .bright { text-align: right; } .logo { diff --git a/_input/icons/favicon.svg b/_input/icons/favicon.svg new file mode 100644 index 0000000..5d54a20 --- /dev/null +++ b/_input/icons/favicon.svg @@ -0,0 +1,122 @@ + + + + + Globally Harmonized System of Classification and Labelling of Chemicals (GHS) pictogram for substances hazardous to human health. + + + + image/svg+xml + + Globally Harmonized System of Classification and Labelling of Chemicals (GHS) pictogram for substances hazardous to human health. + Official hazard symbols according to directive (EC) No 1272/2008 by the European Chemicals Bureau +The Globally Harmonized System of Classification and Labelling of Chemicals (GHS) is an internationally agreed-upon standard managed by the United Nations that was set up to replace the assortment of hazardous material classification and labelling schemes previously used around the world. +https://en.wikipedia.org/wiki/Globally_Harmonized_System_of_Classification_and_Labelling_of_Chemicals + +symbols (Public Domain) +https://commons.wikimedia.org/wiki/GHS_hazard_symbols + EPS file silhouete.eps from UNECE web site converted with ImageMagick convert and with potrace, edited in inkscape + + + GHS + explosive + flammable + gas + corrosive + acid + harmful + health + pollution + contamination + nature + toxic + hazard + warning + label + chemical + pictogram + symbol + danger + + + + + + + + + + + + + + + + + + + diff --git a/images/haskell-logo.png b/_input/images/haskell-logo.png similarity index 100% rename from images/haskell-logo.png rename to _input/images/haskell-logo.png diff --git a/images/paprika-sub-example.png b/_input/images/paprika-sub-example.png similarity index 100% rename from images/paprika-sub-example.png rename to _input/images/paprika-sub-example.png diff --git a/images/totallyfuckedup-paprika.gif b/_input/images/totallyfuckedup-paprika.gif similarity index 100% rename from images/totallyfuckedup-paprika.gif rename to _input/images/totallyfuckedup-paprika.gif diff --git a/index.html b/_input/index.html similarity index 100% rename from index.html rename to _input/index.html diff --git a/posts/2019-05-25-paprika-evangelists-dead-set.markdown b/_input/posts/2019-05-25-paprika-evangelists-dead-set.markdown similarity index 95% rename from posts/2019-05-25-paprika-evangelists-dead-set.markdown rename to _input/posts/2019-05-25-paprika-evangelists-dead-set.markdown index 134cdff..4db8792 100644 --- a/posts/2019-05-25-paprika-evangelists-dead-set.markdown +++ b/_input/posts/2019-05-25-paprika-evangelists-dead-set.markdown @@ -1,10 +1,8 @@ --- title: "paprika, evangelists at my door, and dead set" -date: 2019-05-25 +published: 2019-05-25 --- -2019年 5月 25日 - ## the evangelists thing i was just invited to a free christian concert with complimentary drinks and hot dogs to be held at a local park. it was an odd experience, and it certainly wasn't something i was expecting but the way it all happened was pretty predictable. we chatted a bit, with antisocial **·me·** not knowing how to answer his questions and very self-conscious of the fact i need to brush my teeth and i hope he couldn't smell my breath. 恥ずかしいよ。 @@ -23,7 +21,9 @@ it was almost three days ago (23日)[＊](# "i am fully aware that when i said ' speaking on behalf the walrus, it's a great film to watch high. the type of high will affect your understanding or lack thereof of the film, which before i started writing this blog post i had seen three times; with my lack of working inner clock it seemed like once each night even now, at which point i've seen it four times. i have not seen it sober nor do i feel so inclined. -> **when to watch** aka **baked or wasted** [if you're interested in seeing this film and want to know what drugs i recommend for your viewing pleasure] +> **when to watch** aka **baked or wasted** + +[if you're interested in seeing this film and want to know what drugs i recommend for your viewing pleasure] **~name a few, rate a few~** (1) weed: always (2) alcohol: recommended over sober (3) lsd: a blast, probably (4) ambien: in the realm of the walrus, i imagine a fun time, especially if you don't have much resistance built-up to it (5) amphetamines (meth/adderall/etc): don't recommend unless you really want to analyse it actively to figure out all there is you can instead of watching as many good anime as you can find (if you're like me, your watch list grows much faster than your completed list, after all) (6) shrooms: this could be a really interesting visual experience. (7) nothing/sober: need to be in the right kind of mood. @@ -48,6 +48,4 @@ unsurprisingly, this took me way too long to write, i've barely proofread any of (temporary disclaimer: if it's written down, it doesn't make it true. i'm wrong all the time and so is everyone else. in addition, people change all the time. opinions, stances, beliefs of all sorts change way more than we realise. if i don't end up contradicting myself at some point, i'm probably not posting enough.) -post finished 26 may 2019 06:25 utc by 僕の名前 - -[ホームページ](/index.html) +> post finished 26 may 2019 06:25 utc 僕の名前 diff --git a/templates/Untitled File b/_input/templates/Untitled File similarity index 100% rename from templates/Untitled File rename to _input/templates/Untitled File diff --git a/_input/templates/archive.html b/_input/templates/archive.html new file mode 100644 index 0000000..c19a055 --- /dev/null +++ b/_input/templates/archive.html @@ -0,0 +1,2 @@ +here you can find all my previous posts (proceed with caution): +$partial("templates/post-list.html")$ diff --git a/templates/default.html b/_input/templates/default.html similarity index 77% rename from templates/default.html rename to _input/templates/default.html index 19c6baf..3f25500 100644 --- a/templates/default.html +++ b/_input/templates/default.html @@ -25,8 +25,12 @@ diff --git a/templates/default.html~ b/_input/templates/default.html~ similarity index 100% rename from templates/default.html~ rename to _input/templates/default.html~ diff --git a/templates/post-list.html b/_input/templates/post-list.html similarity index 100% rename from templates/post-list.html rename to _input/templates/post-list.html diff --git a/templates/post.html b/_input/templates/post.html similarity index 100% rename from templates/post.html rename to _input/templates/post.html diff --git a/templates/post.html~ b/_input/templates/post.html~ similarity index 100% rename from templates/post.html~ rename to _input/templates/post.html~ diff --git a/cabal.nix b/cabal.nix index dc522d2..e36dd84 100755 --- a/cabal.nix +++ b/cabal.nix @@ -1,11 +1,11 @@ -{ mkDerivation, base, hakyll, stdenv }: +{ mkDerivation, base, hakyll, hakyll-favicon, stdenv }: mkDerivation { pname = "murasite"; version = "0.1.0.0"; src = ./.; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base hakyll ]; + executableHaskellDepends = [ base hakyll hakyll-favicon ]; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; } diff --git a/murasite.cabal b/murasite.cabal index ea092c7..66f490e 100644 --- a/murasite.cabal +++ b/murasite.cabal @@ -7,5 +7,6 @@ executable site main-is: site.hs build-depends: base == 4.* , hakyll == 4.12.* + , hakyll-favicon ghc-options: -threaded default-language: Haskell2010 diff --git a/posts/2015-08-12-spqr.markdown b/posts/2015-08-12-spqr.markdown deleted file mode 100644 index 3704aa5..0000000 --- a/posts/2015-08-12-spqr.markdown +++ /dev/null @@ -1,59 +0,0 @@ ---- -title: S.P.Q.R. ---- - -Mauris in lorem nisl. Maecenas tempus facilisis ante, eget viverra nisl -tincidunt et. Donec turpis lectus, mattis ac malesuada a, accumsan eu libero. -Morbi condimentum, tortor et tincidunt ullamcorper, sem quam pretium nulla, id -convallis lectus libero nec turpis. Proin dapibus nisi id est sodales nec -ultrices tortor pellentesque. Vivamus vel nisi ac lacus sollicitudin vulputate -ac ut ligula. Nullam feugiat risus eget eros gravida in molestie sapien euismod. -Nunc sed hendrerit orci. Nulla mollis consequat lorem ac blandit. Ut et turpis -mauris. Nulla est odio, posuere id ullamcorper sit amet, tincidunt vel justo. -Curabitur placerat tincidunt varius. Nulla vulputate, ipsum eu consectetur -mollis, dui nibh aliquam neque, at ultricies leo ligula et arcu. Proin et mi -eget tellus sodales lobortis. Sed tempor, urna vel pulvinar faucibus, lectus -urna vehicula ante, at facilisis dolor odio at lorem. Morbi vehicula euismod -urna, et imperdiet urna ornare vitae. - -Sed tincidunt sollicitudin ultrices. In hac habitasse platea dictumst. Morbi -ligula lectus, egestas at ultricies nec, fringilla et tellus. Duis urna lorem, -bibendum a ornare sed, euismod sed nunc. Aliquam tempor massa at velit fringilla -fringilla. Praesent sit amet tempor felis. Maecenas id felis ac velit aliquam -tempor a sit amet orci. Nunc placerat nulla pellentesque sem commodo cursus. -Praesent quis sapien orci, quis ultricies augue. Nam vestibulum sem non augue -semper tincidunt pellentesque ipsum volutpat. Duis congue, nunc a aliquam -luctus, quam ante convallis nisi, ac pellentesque lacus orci vel turpis. Cum -sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus -mus. Suspendisse hendrerit nisl eu felis sagittis faucibus. Nunc eu congue -lorem. Quisque non nibh nisi, et ultrices massa. Sed vitae erat vitae nulla -pellentesque fermentum. - -Ut diam nunc, consectetur ut ultrices eu, iaculis sed felis. Sed lacinia, odio -et accumsan luctus, arcu ipsum accumsan erat, sit amet malesuada libero lacus et -velit. Donec accumsan tristique tristique. Proin a metus magna, vitae mattis -nisl. Integer a libero ipsum. Mauris faucibus eleifend metus id sodales. Morbi -ornare, nibh nec facilisis imperdiet, turpis sem commodo lorem, id commodo -mauris metus vitae justo. Etiam at pellentesque tortor. Proin mollis accumsan -ligula, nec tempus augue auctor quis. Nulla lacinia, mi quis lobortis auctor, -nisi diam posuere dui, pulvinar feugiat dui libero eget quam. Fusce eu risus -nunc, a consectetur orci. Class aptent taciti sociosqu ad litora torquent per -conubia nostra, per inceptos himenaeos. Maecenas venenatis aliquet orci, a -ultricies sem facilisis eu. Donec dolor purus, porta condimentum convallis nec, -dignissim nec libero. - -Etiam rutrum ultricies dui, et interdum metus elementum et. Nulla sapien nunc, -interdum tristique porttitor in, laoreet vitae mi. Ut vehicula auctor mauris sit -amet bibendum. Phasellus adipiscing mattis libero, eget adipiscing erat -dignissim at. Vivamus convallis malesuada metus nec cursus. Ut cursus, lorem -eleifend sollicitudin condimentum, felis tortor sodales augue, ac tempus lacus -ipsum vitae quam. Vestibulum vitae lacus non tortor vehicula iaculis faucibus -quis massa. - -Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus -mus. Duis malesuada neque nec ante porttitor accumsan. Suspendisse potenti. -Aliquam in lacus magna, imperdiet laoreet lectus. Praesent id diam nec ante -commodo rhoncus nec vel augue. Pellentesque tortor massa, dignissim ut sagittis -sed, hendrerit vitae nunc. Nam gravida, urna vitae hendrerit rutrum, felis augue -vulputate tortor, ut varius velit libero nec lectus. In adipiscing massa in est -scelerisque ullamcorper. Vivamus in nisi metus. diff --git a/posts/2015-10-07-rosa-rosa-rosam.markdown b/posts/2015-10-07-rosa-rosa-rosam.markdown deleted file mode 100644 index bbda8fd..0000000 --- a/posts/2015-10-07-rosa-rosa-rosam.markdown +++ /dev/null @@ -1,46 +0,0 @@ ---- -title: Rosa Rosa Rosam -author: Ovidius ---- - -Suspendisse pharetra ullamcorper sem et auctor. Suspendisse vitae tellus eu -turpis dignissim gravida ut ut tortor. Cum sociis natoque penatibus et magnis -dis parturient montes, nascetur ridiculus mus. Morbi aliquam sapien quis nisl -sodales non aliquet nisl iaculis. Curabitur fermentum orci vel sapien -pellentesque id condimentum metus vehicula. Curabitur turpis purus, scelerisque -at interdum quis, placerat sit amet tortor. Aliquam erat volutpat. - -Integer posuere felis non arcu suscipit ullamcorper. Nam tempus risus venenatis -orci sagittis eu aliquam ante tincidunt. Aenean vehicula ipsum id sapien -tincidunt commodo. Aliquam erat volutpat. Curabitur vehicula libero ac turpis -cursus consectetur. Praesent posuere egestas purus et dapibus. Mauris egestas, -lectus vitae scelerisque ultricies, metus lorem tempor nisi, sed vehicula tortor -mauris nec urna. Quisque urna tellus, facilisis at mollis eget, adipiscing in -nisl. Proin quam arcu, euismod et imperdiet sed, ultricies sed orci. - -Nulla malesuada sem eget lectus scelerisque nec rhoncus metus interdum. In dui -felis, rhoncus id scelerisque eget, vulputate id sem. Nulla facilisi. Vestibulum -eleifend, metus dignissim lacinia ornare, magna nulla vehicula nisi, sed -molestie mauris ipsum vel turpis. Class aptent taciti sociosqu ad litora -torquent per conubia nostra, per inceptos himenaeos. Nulla urna leo, vehicula -eget dignissim a, hendrerit ut risus. Fusce ultricies elementum placerat. Nam at -dolor sed nisi mollis sollicitudin vitae at urna. Vestibulum iaculis adipiscing -eros et mollis. - -Phasellus ultricies elit eu risus sagittis eu dictum ante ultrices. Nulla -congue, augue ac placerat tempor, orci mi luctus nisi, at varius ipsum sem sed -eros. Vivamus eget velit eget felis posuere ornare. In sed metus non est iaculis -facilisis dapibus sit amet enim. Aliquam viverra tortor eget neque volutpat in -auctor urna rutrum. Aliquam ligula augue, congue sit amet rutrum in, semper vel -nulla. Sed tempus porttitor faucibus. Donec cursus sodales nulla, quis lacinia -mi vehicula vel. Sed nec purus orci. Nam leo sapien, rutrum a ultrices quis, -placerat vel ligula. Donec massa quam, pellentesque et molestie nec, hendrerit -id mauris. In hac habitasse platea dictumst. Cras quis quam sem. Curabitur in -arcu diam, in interdum mauris. - -Proin lorem sapien, iaculis et faucibus nec, dictum sed nunc. Pellentesque in -purus justo. Vestibulum facilisis rutrum nisi, a egestas nunc suscipit sed. Ut -quis tortor a arcu bibendum placerat non sed ante. Praesent orci sem, posuere -sit amet cursus molestie, volutpat ut purus. Curabitur aliquam, purus in -pharetra viverra, lorem leo aliquam tellus, vel consequat felis neque et mauris. -Aliquam erat volutpat. diff --git a/posts/2015-11-28-carpe-diem.markdown b/posts/2015-11-28-carpe-diem.markdown deleted file mode 100644 index bd115da..0000000 --- a/posts/2015-11-28-carpe-diem.markdown +++ /dev/null @@ -1,50 +0,0 @@ ---- -title: Carpe Diem ---- - -Fusce tortor quam, egestas in posuere quis, porttitor vel turpis. Donec -vulputate porttitor augue at rhoncus. Proin iaculis consectetur sagittis. -Curabitur venenatis turpis sit amet purus tristique nec posuere risus laoreet. -Nullam nisi sem, dapibus id semper id, egestas vel arcu. Morbi porttitor ipsum -placerat erat consequat sed consequat purus feugiat. Donec auctor elit ut risus -mattis facilisis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. - -Proin vulputate sapien facilisis leo ornare pulvinar. Fusce tempus massa a risus -semper iaculis. Suspendisse sollicitudin posuere nunc, sit amet rutrum leo -facilisis mattis. Sed ornare auctor dui, vitae rutrum neque auctor sit amet. -Proin ac dui magna. Mauris vehicula interdum augue, nec ultrices libero egestas -quis. Nunc convallis euismod ipsum, id sollicitudin orci consequat ac. Fusce -bibendum congue libero, in rutrum nulla congue non. Cras sit amet risus tortor, -eu pellentesque dui. Phasellus euismod enim non nibh sodales quis consectetur -lorem laoreet. Vivamus a egestas quam. Curabitur in tortor augue, vitae varius -tellus. Integer varius, elit ac gravida suscipit, eros erat pellentesque nisi, -et tristique augue odio id nulla. Aliquam sit amet nunc vel tellus hendrerit -tempus ac vel sem. - -Aenean tincidunt sollicitudin sapien ut porttitor. Curabitur molestie adipiscing -lorem vel scelerisque. Donec vitae interdum est. Proin rutrum vulputate -faucibus. Suspendisse sit amet felis odio, non volutpat ante. Sed eu lectus -quam. Curabitur tristique rhoncus est, vel commodo tortor suscipit semper. -Maecenas feugiat vestibulum nisi id facilisis. Nulla non tincidunt libero. -Praesent ultrices interdum commodo. Sed euismod nisl auctor leo ultrices rutrum. -Aliquam nibh felis, congue molestie blandit at, bibendum at eros. Aenean -tincidunt, tortor iaculis placerat sollicitudin, lorem justo tempor diam, et -posuere sapien leo et magna. Quisque vel aliquam mauris. - -Proin varius tempus fermentum. Cum sociis natoque penatibus et magnis dis -parturient montes, nascetur ridiculus mus. Sed tincidunt nunc id magna -adipiscing non sollicitudin turpis tempor. Etiam vel elit ipsum, quis euismod -velit. Quisque elementum magna vitae quam venenatis lacinia. Sed at arcu ipsum. -Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos -himenaeos. Donec ut lorem ac sapien cursus lacinia sit amet mollis dolor. -Vivamus tempus odio nec magna faucibus sed hendrerit lorem tempor. - -Vestibulum eu nisi arcu. Curabitur nisi risus, fermentum ut lacinia ut, interdum -nec magna. Nunc aliquet gravida massa, eu aliquam lorem faucibus at. Sed -sollicitudin volutpat velit id tempor. In nibh justo, pharetra et pretium -dignissim, tempus in turpis. Phasellus eget lobortis nisl. Phasellus sed -fermentum diam. Nam tempus pharetra odio, quis congue eros imperdiet eu. Aliquam -dui eros, hendrerit et vulputate vel, porta eu eros. Nullam nisi dui, commodo -eget pharetra ut, ornare sit amet nunc. Fusce vel neque urna. Maecenas nulla -ante, egestas at consequat quis, fermentum a enim. Aliquam id tristique urna. -Integer augue justo, scelerisque et consectetur id, rhoncus eget enim. diff --git a/posts/2015-12-07-tu-quoque.markdown b/posts/2015-12-07-tu-quoque.markdown deleted file mode 100644 index bdf2ea4..0000000 --- a/posts/2015-12-07-tu-quoque.markdown +++ /dev/null @@ -1,58 +0,0 @@ ---- -title: Tu Quoque -author: Julius ---- - -Vestibulum leo turpis, dignissim quis ultrices sit amet, iaculis ac ligula. -Pellentesque tristique, velit eget scelerisque scelerisque, est dolor ultrices -arcu, quis ullamcorper justo arcu luctus mauris. Integer congue molestie nisi id -posuere. Fusce pellentesque gravida tempus. Integer viverra tortor nec eros -mollis quis convallis sem laoreet. Nulla id libero ac erat varius laoreet. Proin -sed est est. Curabitur lacinia fermentum lorem, elementum malesuada ipsum -malesuada ut. Donec suscipit elit id leo vehicula mattis non sed leo. Morbi -varius eleifend varius. Nulla vestibulum, neque vitae aliquam eleifend, nisi -tellus placerat nunc, quis suscipit elit turpis eu tortor. Etiam euismod -convallis lectus quis venenatis. Phasellus laoreet magna in nibh cursus eu -egestas nulla convallis. Aliquam vel ullamcorper risus. Fusce dictum, massa id -consequat viverra, nulla ante tristique est, a faucibus nisi enim nec dui. Donec -metus ligula, condimentum at porttitor eget, lobortis at quam. - -Aenean vel libero in magna ultricies congue in a odio. Donec faucibus rutrum -ornare. Fusce dictum eleifend fermentum. Vestibulum vel nibh a metus porttitor -rhoncus. Pellentesque id quam neque, eget molestie arcu. Integer in elit vel -neque viverra ultricies in eget massa. Nam ut convallis est. Pellentesque eros -eros, sodales non vehicula et, tincidunt ut odio. Cras suscipit ultrices metus -sit amet molestie. Fusce enim leo, vehicula sed sodales quis, adipiscing at -ipsum. - -Nunc tempor dignissim enim, sed tincidunt eros bibendum quis. Curabitur et dolor -augue, id laoreet mi. Nulla cursus felis id dui vehicula vitae ornare lorem -blandit. Cras eget dui nec odio volutpat pharetra. Fusce hendrerit justo justo, -vel imperdiet enim. Vivamus elit risus, interdum ultrices accumsan eleifend, -vestibulum vitae sapien. Integer bibendum ullamcorper tristique. Nulla quis odio -lectus, quis eleifend augue. Integer a ligula mauris. Aenean et tempus tortor. -Quisque at tortor mi. Vivamus accumsan feugiat est a blandit. Sed vitae enim ut -dolor semper sodales. Duis tristique, ante et placerat elementum, nulla tellus -pellentesque sapien, quis posuere velit mi eget nulla. Sed vestibulum nunc non -est porttitor ut rutrum nibh semper. Pellentesque habitant morbi tristique -senectus et netus et malesuada fames ac turpis egestas. - -Nulla adipiscing ultricies lobortis. Vivamus iaculis nisl vitae tellus laoreet -vitae aliquet lacus mollis. Phasellus ut lacus urna, sed sagittis ante. Etiam -consectetur pretium nisl sed dignissim. Pellentesque convallis, nisl eget -commodo mollis, sem magna consequat arcu, sed pretium ipsum arcu sit amet neque. -Aliquam erat volutpat. Morbi sed mi sed urna vestibulum placerat vitae vel -metus. Fusce ac ante at justo pharetra vehicula. Vivamus vel tortor eget augue -aliquet aliquet at vel odio. Nunc venenatis, magna quis facilisis fringilla, -augue tellus varius neque, in vulputate est eros ut tortor. Duis lorem neque, -aliquam congue posuere id, condimentum non dui. Phasellus ut dui massa, -porttitor suscipit augue. Praesent quis tellus quam, vel volutpat metus. Vivamus -enim est, aliquam in imperdiet et, sagittis eu ligula. Vestibulum hendrerit -placerat orci et aliquet. Cras pharetra, dolor placerat lobortis tempor, metus -odio cursus ligula, et posuere lacus ligula quis dui. - -Donec a lectus eu nibh malesuada aliquam. Proin at metus quam, et tincidunt leo. -Quisque lacus justo, scelerisque sodales pulvinar sed, dignissim ut sapien. -Vivamus diam felis, adipiscing sollicitudin ultricies id, accumsan ac felis. In -eu posuere ligula. Suspendisse potenti. Donec porttitor dictum dui id vehicula. -Integer ante velit, congue id dictum et, adipiscing a tortor. diff --git a/site.hs b/site.hs index 39ba318..94522f4 100644 --- a/site.hs +++ b/site.hs @@ -1,12 +1,27 @@ -------------------------------------------------------------------------------- {-# LANGUAGE OverloadedStrings #-} -import Data.Monoid (mappend) -import Hakyll + +import Data.Monoid ((<>)) +import Hakyll +import Hakyll.Favicon (faviconsRules, faviconsField) -------------------------------------------------------------------------------- +muraConf :: Configuration +muraConf = defaultConfiguration + { destinationDirectory = "_http" + , storeDirectory = "_store" + , tmpDirectory = "_tmp" + , providerDirectory = "_input" + } +-- Our default context for pages +ctx :: Context String +ctx = defaultContext <> + faviconsField + main :: IO () -main = hakyll $ do +main = hakyllWith muraConf $ do + faviconsRules "icons/favicon.svg" match "images/*" $ do route idRoute compile copyFileCompiler @@ -18,7 +33,7 @@ main = hakyll $ do match (fromList ["about.md", "contact.markdown"]) $ do route $ setExtension "html" compile $ pandocCompiler - >>= loadAndApplyTemplate "templates/default.html" defaultContext + >>= loadAndApplyTemplate "templates/default.html" ctx >>= relativizeUrls match "posts/*" $ do @@ -33,9 +48,9 @@ main = hakyll $ do compile $ do posts <- recentFirst =<< loadAll "posts/*" let archiveCtx = - listField "posts" postCtx (return posts) `mappend` - constField "title" "archives" `mappend` - defaultContext + listField "posts" postCtx (return posts) <> + constField "title" "archives" <> + ctx makeItem "" >>= loadAndApplyTemplate "templates/archive.html" archiveCtx @@ -48,9 +63,9 @@ main = hakyll $ do compile $ do posts <- recentFirst =<< loadAll "posts/*" let indexCtx = - listField "posts" postCtx (return posts) `mappend` - constField "title" "home" `mappend` - defaultContext + listField "posts" postCtx (return posts) <> + constField "title" "home" <> + ctx getResourceBody >>= applyAsTemplate indexCtx @@ -63,5 +78,5 @@ main = hakyll $ do -------------------------------------------------------------------------------- postCtx :: Context String postCtx = - dateField "date" "%Y年 %m月 %d日" `mappend` - defaultContext + dateField "date" "%Y年 %m月 %d日" <> + ctx diff --git a/templates/archive.html b/templates/archive.html deleted file mode 100644 index b43eeb2..0000000 --- a/templates/archive.html +++ /dev/null @@ -1,2 +0,0 @@ -Here you can find all my previous posts: -$partial("templates/post-list.html")$