diff --git a/flake.lock b/flake.lock index 7002eb6..9db06f5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,155 +1,88 @@ { "nodes": { - "ema": { - "flake": false, - "locked": { - "lastModified": 1661699475, - "narHash": "sha256-2324LDzNNZGItJ4hI8SGUyZ8PZK0xHtRWnAFXlCX8UQ=", - "owner": "srid", - "repo": "ema", - "rev": "be89ffe306a15ab4a16494c8593d989fabcc4486", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "master", - "repo": "ema", - "type": "github" - } - }, - "emanote": { + "html-nix": { "inputs": { - "ema": "ema", - "flake-parts": "flake-parts", - "haskell-flake": "haskell-flake", - "heist-extra": "heist-extra", - "nixpkgs": "nixpkgs_2", - "tailwind": "tailwind" + "nixpkgs": "nixpkgs", + "parts": "parts" }, "locked": { - "lastModified": 1666637280, - "narHash": "sha256-cgSfsSPyxz2fSeQfOjHDhbn9nQ23wDV2SW31A4VnMVU=", - "owner": "srid", - "repo": "emanote", - "rev": "1d3f9f7572626b52e1fea723cf0a5fb634858d85", - "type": "github" + "lastModified": 1680754735, + "narHash": "sha256-9BxKrDWg7K2ESUysFrbdLNz3qvY3zCQ7vC61hBRaJqI=", + "ref": "refs/heads/master", + "rev": "ef1ad056acdb43aa3390c83048c67295d391b4b2", + "revCount": 65, + "type": "git", + "url": "https://git.gaze.systems/dusk/html.nix.git" }, "original": { - "owner": "srid", - "repo": "emanote", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1661009076, - "narHash": "sha256-phAE40gctVygRq3G3B6LhvD7u2qdQT21xsz8DdRDYFo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "850d8a76026127ef02f040fb0dcfdb8b749dd9d9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "haskell-flake": { - "locked": { - "lastModified": 1661726764, - "narHash": "sha256-YzzOoff6m3W4g4B0E8xd3omvOhEVuRu/Rdvnmy2H6Jc=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "3c27b5ba2eafc52f4bed232a8ff74cf0a5a99375", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "haskell-flake", - "type": "github" - } - }, - "heist-extra": { - "flake": false, - "locked": { - "lastModified": 1663962912, - "narHash": "sha256-AxzbGM1/l4Sm6zI5aunMA3cbdlDNHBecROKTaAEawxU=", - "owner": "srid", - "repo": "heist-extra", - "rev": "29c719ded6606da19c21b182cf465b9620cda0b2", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "heist-extra", - "type": "github" + "type": "git", + "url": "https://git.gaze.systems/dusk/html.nix.git" } }, "nixpkgs": { "locked": { - "lastModified": 1665848363, - "narHash": "sha256-3Jow1YxzPtQnck1bAAvbVxgRH4gNnkIdw871Vm6UtAU=", + "lastModified": 1680668850, + "narHash": "sha256-mQMg13yRsS0LXVzaeoSPwqgPO6yhkGzGewPgMSqXSv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83b198a2083774844962c854f811538323f9f7b1", + "rev": "4a65e9f64e53fdca6eed31adba836717a11247d2", "type": "github" }, "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "type": "github" + }, + "original": { + "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, "root": { "inputs": { - "emanote": "emanote", - "flake-parts": [ - "emanote", - "flake-parts" - ], + "html-nix": "html-nix", "nixpkgs": [ - "emanote", + "html-nix", "nixpkgs" + ], + "parts": [ + "html-nix", + "parts" ] } - }, - "tailwind": { - "flake": false, - "locked": { - "lastModified": 1665932648, - "narHash": "sha256-YM/6pnBi8MymRHrPheiKrtL9FZPLeeTp/evd3O/0CkI=", - "owner": "srid", - "repo": "tailwind-haskell", - "rev": "7aaaf2282d02846890904f1c23610ddea98d91b6", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "master", - "repo": "tailwind-haskell", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c6bcf8b..73b5e2a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,24 +1,44 @@ { - nixConfig.extra-substituters = "https://cache.garnix.io"; - nixConfig.extra-trusted-public-keys = "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="; - inputs = { - emanote.url = "github:srid/emanote"; - nixpkgs.follows = "emanote/nixpkgs"; - flake-parts.follows = "emanote/flake-parts"; + html-nix.url = "git+https://git.gaze.systems/dusk/html.nix.git"; + nixpkgs.follows = "html-nix/nixpkgs"; + parts.follows = "html-nix/parts"; }; - outputs = inputs@{self, flake-parts, nixpkgs, ...}: - flake-parts.lib.mkFlake { inherit self; } { + outputs = inputs @ {parts, ...}: + parts.lib.mkFlake {inherit inputs;} (topArgs: { systems = ["x86_64-linux"]; - imports = [inputs.emanote.flakeModule]; - perSystem = {self', ...}: { - emanote.sites."blog" = { - layers = [./.]; - layersString = ["."]; - }; - packages.default = self'.packages.blog; - apps.default = self'.apps.blog; + imports = [inputs.html-nix.flakeModule]; + perSystem = { + config, + lib, + ... + }: let + l = lib // builtins; + html-nix = config.html-nix.lib; + site = local: + html-nix.mkSiteFrom { + inherit local; + src = ./src; + config = { + baseurl = "https://gaze.systems"; + title = "dusk's place"; + iconPath = "resources/icon.png"; + siteLang = "en"; + }; + templater = ctx: + l.pipe ctx [ + topArgs.config.html-nix.lib.templaters.simple + (ctx: + l.recursiveUpdate ctx { + site."resources"."icon.png" = ./src/resources/icon.png; + }) + ]; + }; + dev = html-nix.mkServeFromSite (site true); + in { + packages.site = html-nix.mkSitePathFrom (site false); + apps.site.program = "${dev}/bin/serve"; }; - }; -} \ No newline at end of file + }); +} diff --git a/index.yaml b/index.yaml deleted file mode 100644 index 3a45675..0000000 --- a/index.yaml +++ /dev/null @@ -1,11 +0,0 @@ -page: - siteTitle: gaze.systems - siteName: gaze.systems - -template: - iconUrl: resources/GazeOfficeIcon.webp - theme: purple - urlStrategy: pretty - layout: - base: - bodyClass: bg-black diff --git a/posts/Hello world!.md b/posts/Hello world!.md deleted file mode 100644 index 6533344..0000000 --- a/posts/Hello world!.md +++ /dev/null @@ -1,3 +0,0 @@ -First! - -- [ ] actually write something proper diff --git a/projects.md b/projects.md deleted file mode 100644 index 0ef8322..0000000 --- a/projects.md +++ /dev/null @@ -1,66 +0,0 @@ -# Projects - -## Projects I contribute(d) to - -- [nixpkgs](https://github.com/NixOS/nixpkgs) - - The Nix Packages collection for the [Nix package manager](https://github.com/NixOS/nix). - - Package maintainer. - -## Projects I maintain - -- [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. - - `rust-nix-templater` is a utility to create / generate Rust projects with Nix files and CI set up. - -- [linemd](https://github.com/yusdacra/linemd) - - A no dependency, no std, simple and lightweight markdown parser and renderer (to HTML and SVG). - -- [dream2nix](https://github.com/nix-community/dream2nix) - -## Projects I used to work on - -- [Harmony Rust SDK](https://github.com/harmony-development/harmony_rust_sdk) - - Rust library that implements the Harmony protocol, and builds a client API on top of it. - -- [scherzo](https://github.com/harmony-development/scherzo) - - Harmony server implementation written in Rust, using sled as database and warp as HTTP server. - -- [Crust](https://github.com/harmony-development/crust) - - Harmony client written in Rust, using iced as GUI framework. - -- [hrpc-rs](https://github.com/harmony-development/hrpc-rs) - - [hrpc](https://github.com/harmony-development/hrpc) implementation in Rust. - -- [Harmony Protocol](https://github.com/harmony-development) - - Various contributions to the reference server impl and the protocol itself. - - Maintaining a server and client implementation, along with Rust ecosystem. - -- [Veloren](https://gitlab.com/veloren/veloren) and it's [Book](https://gitlab.com/veloren/book) - - Veloren is a multiplayer voxel RPG written in Rust. - - My main contributions are for rendering and UI. Also maintaining build files for the Nix package manager and the Turkish translation. And added some guides to the book. - -- [iced](https://github.com/hecrj/iced) - - A cross-platform GUI library for Rust, inspired by Elm. - -- [Icy Matrix](https://gitlab.com/yusdacra/icy_matrix) - - A Matrix chat client built with Rust. - - Uses `iced` for GUI. - -- [Hakkero Kernel](https://gitlab.com/hakkero-os/hakkero) - - Learning project to create a micro-kernel that runs on x86, arm and risc-v. - - Current goal is to support webassembly and be able to run everything in ring 0, thanks to it's sandboxing features. - -- [treeculler](https://gitlab.com/yusdacra/treeculler) - - A Rust crate for working with frustum and occlusion culling. - -- [bevy_networking_delivery](https://gitlab.com/yusdacra/bevy_prototype_networking_delivery) - - A Rust crate for Bevy game engine that implements a simple `Delivery` based networking layer. - -- [kIDE](https://gitlab.com/yusdacra/kide) - - Opinionated configuration for kakoune text editor, focusing on an IDE-like experience. - -- [FlutterEnhancements](https://github.com/yusdacra/FlutterEnhancements) - - Basic Flutter support for Sublime Text 3. - -- [Neonment](https://gitlab.com/yusdacra/neonment) - - Neonment is a first person hero shooter. Name is subject to change. diff --git a/index.md b/src/index.md similarity index 77% rename from index.md rename to src/index.md index b9e3172..6e23987 100644 --- a/index.md +++ b/src/index.md @@ -1,11 +1,10 @@ # About Hi, I'm dusk (aka yusdacra)! This is where I post about stuff. -Feel free to send an e-mail or DM me on Matrix / Discord if you have anything to ask. +Feel free to send an e-mail or DM me on Matrix if you have anything to ask. + Contact: - Matrix: [@dusk:gaze.systems](https://matrix.to/#/@dusk:gaze.systems) - - Discord: dusk\#7476 - E-Mail: y.bera003.06@pm.me - GitHub: - Gitea: @@ -13,7 +12,7 @@ Feel free to send an e-mail or DM me on Matrix / Discord if you have anything to ## Bio I love using Nix / NixOS for any kind of purpose, but mainly for DevOps. -I also use Rust for my hobby or other more serious projects. +I also use Rust and Zig for my hobby or other more serious projects. I work at [Platonic Systems](https://platonic.systems). diff --git a/notes/exporting ssh key from gpg.md b/src/posts/_exporting ssh key from gpg.md similarity index 93% rename from notes/exporting ssh key from gpg.md rename to src/posts/_exporting ssh key from gpg.md index 604dca0..a99271c 100644 --- a/notes/exporting ssh key from gpg.md +++ b/src/posts/_exporting ssh key from gpg.md @@ -1,7 +1,3 @@ ---- -tags: [gpg,ssh] ---- - - gpg --export-secret-ssh-key doesn't work - gpg --export-ssh-key works to export public key diff --git a/src/resources/icon.png b/src/resources/icon.png new file mode 100644 index 0000000..03afbf6 Binary files /dev/null and b/src/resources/icon.png differ diff --git a/resources/GazeOfficeIcon.webp b/src/resources/icon.webp similarity index 100% rename from resources/GazeOfficeIcon.webp rename to src/resources/icon.webp diff --git a/templates/components/backlinks.tpl b/templates/components/backlinks.tpl deleted file mode 100644 index 49487e0..0000000 --- a/templates/components/backlinks.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -
-
Links to this page
- -
-
\ No newline at end of file diff --git a/templates/components/breadcrumbs.tpl b/templates/components/breadcrumbs.tpl deleted file mode 100644 index b54dc0f..0000000 --- a/templates/components/breadcrumbs.tpl +++ /dev/null @@ -1,47 +0,0 @@ - \ No newline at end of file diff --git a/templates/components/context.tpl b/templates/components/context.tpl deleted file mode 100644 index b9cee0c..0000000 --- a/templates/components/context.tpl +++ /dev/null @@ -1,24 +0,0 @@ -
- -
- - - - - - - - - - - - - - - - - - -
-
-
\ No newline at end of file diff --git a/templates/components/footer.tpl b/templates/components/footer.tpl deleted file mode 100644 index e79005d..0000000 --- a/templates/components/footer.tpl +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/templates/components/metadata.tpl b/templates/components/metadata.tpl deleted file mode 100644 index e679b41..0000000 --- a/templates/components/metadata.tpl +++ /dev/null @@ -1,16 +0,0 @@ - -
- - - - - # - - - -
-
\ No newline at end of file diff --git a/templates/components/note-title.tpl b/templates/components/note-title.tpl deleted file mode 100644 index 198c567..0000000 --- a/templates/components/note-title.tpl +++ /dev/null @@ -1,6 +0,0 @@ -

- - - -

\ No newline at end of file diff --git a/templates/components/pandoc.tpl b/templates/components/pandoc.tpl deleted file mode 100644 index 1deafe6..0000000 --- a/templates/components/pandoc.tpl +++ /dev/null @@ -1,107 +0,0 @@ - - -

- -

-
- - - - - - - - - - - - - - - - -
-
- -
-
- -
- -
-
- -
- -
-
- -
-
-
-
-
-
-
- - - - - - - -
-
Footnotes
- -
-
- . -
-
- -
-
-
-
-
- - -
    - -
  • - -
  • -
    -
-
- -
    - -
  • - -
  • -
    -
-
- - - - - - - - -
-

-

-

-

-

-
-
- -
\ No newline at end of file diff --git a/templates/components/sidebar-tree.tpl b/templates/components/sidebar-tree.tpl deleted file mode 100644 index 5c9eac1..0000000 --- a/templates/components/sidebar-tree.tpl +++ /dev/null @@ -1,80 +0,0 @@ - - - font-bold text-${theme}-600 hover:underline - - - - font-bold hover:underline - - hover:underline - - - hover:underline - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - -
- - - - - - - -
\ No newline at end of file diff --git a/templates/layouts/book.tpl b/templates/layouts/book.tpl deleted file mode 100644 index 826010c..0000000 --- a/templates/layouts/book.tpl +++ /dev/null @@ -1,82 +0,0 @@ - - -
- - - -
- - - - -
-
- - -
- - -
- - -
-
-
- -
-
-
\ No newline at end of file diff --git a/templates/special/base.tpl b/templates/special/base.tpl deleted file mode 100644 index 278c121..0000000 --- a/templates/special/base.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -
-
-

- -

-
- -
-
- -
-
-
\ No newline at end of file diff --git a/templates/special/index.tpl b/templates/special/index.tpl deleted file mode 100644 index c1b45c5..0000000 --- a/templates/special/index.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - -
- - - -
-
-
\ No newline at end of file diff --git a/templates/special/tagindex.tpl b/templates/special/tagindex.tpl deleted file mode 100644 index 56f5d66..0000000 --- a/templates/special/tagindex.tpl +++ /dev/null @@ -1,75 +0,0 @@ - - -
- -
- - -
- - - - - - - - - - - (+) - - - -
-
-
- - -
- - - - - - - - - -
-
-
-
-
-
-
\ No newline at end of file diff --git a/templates/special/tasks.tpl b/templates/special/tasks.tpl deleted file mode 100644 index 59d3896..0000000 --- a/templates/special/tasks.tpl +++ /dev/null @@ -1,51 +0,0 @@ - - -
-
- - -
-
- - -
  • - - - - \ -
  • -
    -
    - -
    - - - -
    -
    -
    - - -
    - - - - - - - - - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    \ No newline at end of file