feat: switch to html nix

This commit is contained in:
dusk 2021-05-16 23:23:08 +03:00
parent ef59ed3601
commit 166d7a8e72
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
13 changed files with 112 additions and 61 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
public result

View File

@ -1,15 +1,17 @@
image: yusdacra/website:latest image: yusdacra/nix-flake:latest
variables: before_script:
GIT_SUBMODULE_STRATEGY: recursive - . /bin/pre-build.sh
pages: pages:
stage: deploy stage: deploy
script: script:
- zola build - nix build -L --show-trace
artifacts: artifacts:
paths: paths:
- public - result
only: only:
- master - master
after_script:
- ./bin/post-build.sh

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "themes/after-dark"]
path = themes/after-dark
url = https://github.com/yusdacra/after-dark.git

View File

@ -1,31 +1 @@
# The URL the site will be built for title = "yusdacra's stuff"
base_url = "https://yusdacra.gitlab.io"
title = "yusdacra's stuff"
# Whether to automatically compile all Sass files in the sass directory
compile_sass = true
# Whether to do syntax highlighting
# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
highlight_code = true
# Whether to build a search index to be used later on by a JavaScript library
build_search_index = true
generate_rss = true
check_external_links = true
taxonomies = [
{name = "categories", rss = true},
{name = "tags", rss = true},
]
theme = "after-dark"
[extra]
# Put all your custom variables here
after_dark_menu = [
{ name = "posts", url = "$BASE_URL" },
{ name = "about me", url = "$BASE_URL/info/about" },
{ name = "projects", url = "$BASE_URL/info/projects" },
]

View File

@ -1,4 +0,0 @@
+++
title = "posts"
paginate_by = 5
+++

View File

@ -1,2 +0,0 @@
+++
+++

View File

@ -1,3 +0,0 @@
FROM alpine:edge
RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing zola

64
flake.lock Normal file
View File

@ -0,0 +1,64 @@
{
"nodes": {
"flakeUtils": {
"locked": {
"lastModified": 1620759905,
"narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"htmlNix": {
"inputs": {
"flakeUtils": [
"flakeUtils"
],
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1621196554,
"narHash": "sha256-8VI+5fOItvoX0oVLi0aUfrZ+SIJ76M2yHoJ/kerNvdk=",
"owner": "yusdacra",
"repo": "html.nix",
"rev": "27f5d1bd67e5f0a74b713acd49a2e8e5ef5b3c36",
"type": "github"
},
"original": {
"owner": "yusdacra",
"repo": "html.nix",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1621084586,
"narHash": "sha256-raHuJ7ohDLDPqohJzZxhaER7sSh4/1xR6YcUYMj3c3E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e83b3f3394834c41c0d25017f6808d65c3d6f880",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flakeUtils": "flakeUtils",
"htmlNix": "htmlNix"
}
}
},
"root": "root",
"version": 7
}

31
flake.nix Normal file
View File

@ -0,0 +1,31 @@
{
inputs = {
htmlNix = {
url = "github:yusdacra/html.nix";
inputs.flakeUtils.follows = "flakeUtils";
};
flakeUtils.url = "github:numtide/flake-utils";
};
outputs = { htmlNix, flakeUtils, ... }@inputs:
with flakeUtils.lib;
eachDefaultSystem (system:
let
lib = htmlNix.lib.${system};
ownTemplater = x: x;
site = lib.pkgsLib.mkSiteFrom { src = ./.; templater = context: ownTemplater (lib.templaters.basic context); };
in
rec {
apps = {
website = mkApp {
drv = lib.pkgsLib.mkServeFromSite site;
name = "serve";
};
};
packages = {
website = lib.pkgsLib.mkSitePath site;
};
defaultPackage = packages.website;
defaultApp = apps.website;
});
}

View File

@ -1,6 +1,4 @@
+++ # # About
title = "about me"
+++
Hello. This is where I post about stuff. Hello. This is where I post about stuff.
Feel free to send an e-mail or DM me on Matrix if you have anything to ask. Feel free to send an e-mail or DM me on Matrix if you have anything to ask.
@ -12,11 +10,11 @@ Feel free to send an e-mail or DM me on Matrix if you have anything to ask.
- GitLab: <https://gitlab.com/yusdacra> - GitLab: <https://gitlab.com/yusdacra>
- GitHub: <https://github.com/yusdacra> - GitHub: <https://github.com/yusdacra>
## Bio ## ## Bio
I mainly work with Rust and Dart (with Flutter). My main areas of interest are I mainly work with Rust and Nix. My main areas of interest are
embedded, operating systems and game development, although I'm open to embedded, operating systems and game development, although I'm open to
anything else as well. I also work with C++ (mostly for Arduino), anything else as well. I also work with Flutter, C++ (mostly for Arduino),
GDScript (for Godot Engine), Kotlin (for my application's native Android GDScript (for Godot Engine), Kotlin (for my application's native Android
needs that Flutter can't satisfy, mostly backend). I have worked with C# and Unity needs that Flutter can't satisfy, mostly backend). I have worked with C# and Unity
for about 5 years. for about 5 years.

View File

@ -1,8 +1,6 @@
+++ # # Projects
title = "projects"
+++
## Projects I contribute(d) to ## ## Projects I contribute(d) to
- [Veloren](https://gitlab.com/veloren/veloren) and it's [Book](https://gitlab.com/veloren/book) - [Veloren](https://gitlab.com/veloren/veloren) and it's [Book](https://gitlab.com/veloren/book)
- Veloren is a multiplayer voxel RPG written in Rust. - Veloren is a multiplayer voxel RPG written in Rust.
@ -21,7 +19,7 @@ title = "projects"
---- ----
## Projects I maintain ## ## Projects I maintain
- [rust-nix-templater](https://github.com/yusdacra/rust-nix-templater) and [nix-cargo-integration](https://github.com/yusdacra/nix-cargo-integration) - [rust-nix-templater](https://github.com/yusdacra/rust-nix-templater) and [nix-cargo-integration](https://github.com/yusdacra/nix-cargo-integration)
- `nix-cargo-integration` allows easy and convenient integration of Cargo projects with Nix. - `nix-cargo-integration` allows easy and convenient integration of Cargo projects with Nix.

View File

@ -0,0 +1 @@
First!

@ -1 +0,0 @@
Subproject commit 5f60774597cf6b5e2b480989ad296023e36da450