diff --git a/outputs.nix b/outputs.nix index 7cad915..7be2f10 100644 --- a/outputs.nix +++ b/outputs.nix @@ -53,7 +53,7 @@ utils.lib.eachDefaultSystem ( installPhase = '' mkdir -p "$out/dist" - cp -a dist/. "$out/dist" + cp -a _site/. "$out/dist" ''; }; in { diff --git a/site.hs b/site.hs index cb2bb83..c08ed25 100644 --- a/site.hs +++ b/site.hs @@ -1,11 +1,11 @@ -------------------------------------------------------------------------------- {-# LANGUAGE OverloadedStrings #-} -import Data.Monoid (mappend) -import Data.List (sortBy) -import Data.Ord (comparing) +import Control.Monad (forM_, liftM) +import Data.List (sortBy) +import Data.Monoid (mappend) +import Data.Ord (comparing) import Hakyll -import Control.Monad (liftM, forM_) -import System.FilePath (takeBaseName) +import System.FilePath (takeBaseName) -------------------------------------------------------------------------------- main :: IO () @@ -42,10 +42,6 @@ main = hakyll $ do tags <- buildTags "posts/*" (fromCapture "tags/*.html") - match "posts/*" $ version "meta" $ do - route $ setExtension "html" - compile getResourceBody - match "posts/*" $ do route $ setExtension "html" compile $ do @@ -121,8 +117,8 @@ feedConfig = FeedConfiguration { feedTitle = "Skeleton Site" , feedDescription = "you should set this feed description" , feedAuthorName = "set this name" - , feedAuthorEmail = "kolectiva@reciproka.co" - , feedRoot = "https://skeleton.reciproka.co" + , feedAuthorEmail = "kolektivo@reciproka.net" + , feedRoot = "https://skeleton.reciproka.dev" } -------------------------------------------------------------------------------- @@ -131,7 +127,7 @@ siteCtx :: Context String siteCtx = baseCtx `mappend` constField "site_description" "Skeleton Site" `mappend` - constField "site-url" "https://skeleton.reciproka.co" `mappend` + constField "site-url" "https://skeleton.reciproka.dev" `mappend` constField "tagline" "you should set this tag line" `mappend` constField "site-title" "Skeleton Site" `mappend` constField "copy-year" "2024" `mappend` @@ -139,7 +135,7 @@ siteCtx = defaultContext baseCtx = - constField "baseurl" "https://skeleton.reciproka.co" + constField "baseurl" "https://skeleton.reciproka.dev" -------------------------------------------------------------------------------- diff --git a/skeleton-web.cabal b/skeleton-web.cabal index bbeba42..5dba143 100644 --- a/skeleton-web.cabal +++ b/skeleton-web.cabal @@ -8,5 +8,6 @@ executable site build-depends: base == 4.* , hakyll == 4.16.* , filepath == 1.5.* + , pandoc ghc-options: -threaded default-language: Haskell2010