From db4f08ccd7fa0320e98e8eb80fb190a366818e87 Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 12 Jan 2024 14:04:38 +0100 Subject: [PATCH] added flake --- .gitignore | 3 +- flake.lock | 61 ++++++++++++++++++ flake.nix | 20 ++++++ all.keys => src/all.keys | 0 {assets => src/assets}/css/c.css | 0 {assets => src/assets}/css/style.css | 0 {assets => src/assets}/font.woff2 | Bin {assets => src/assets}/js/app.js | 0 {assets => src/assets}/media/whatwhat-av1.mp4 | Bin {assets => src/assets}/media/whatwhat-avc.mp4 | Bin emily.pub => src/emily.pub | 0 index.html => src/index.html | 0 snaki.keys => src/snaki.keys | 0 13 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 flake.lock create mode 100644 flake.nix rename all.keys => src/all.keys (100%) rename {assets => src/assets}/css/c.css (100%) rename {assets => src/assets}/css/style.css (100%) rename {assets => src/assets}/font.woff2 (100%) rename {assets => src/assets}/js/app.js (100%) rename {assets => src/assets}/media/whatwhat-av1.mp4 (100%) rename {assets => src/assets}/media/whatwhat-avc.mp4 (100%) rename emily.pub => src/emily.pub (100%) rename index.html => src/index.html (100%) rename snaki.keys => src/snaki.keys (100%) diff --git a/.gitignore b/.gitignore index c14f0fe..8cfc419 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -other/** +src/other/** +result diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..03fe2ca --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..45f59ba --- /dev/null +++ b/flake.nix @@ -0,0 +1,20 @@ +{ + description = "kyouma.net website"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + inputs.flake-utils.url = "github:numtide/flake-utils"; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in rec { + packages.kyouma-www = pkgs.stdenv.mkDerivation { + pname = "kyouma-www"; + version = self.shortRev or (toString self.lastModifiedDate); + src = ./.; + buildPhase = ''''; + installPhase = ''cp -r src $out''; + }; + packages.default = packages.kyouma-www; + }); +} diff --git a/all.keys b/src/all.keys similarity index 100% rename from all.keys rename to src/all.keys diff --git a/assets/css/c.css b/src/assets/css/c.css similarity index 100% rename from assets/css/c.css rename to src/assets/css/c.css diff --git a/assets/css/style.css b/src/assets/css/style.css similarity index 100% rename from assets/css/style.css rename to src/assets/css/style.css diff --git a/assets/font.woff2 b/src/assets/font.woff2 similarity index 100% rename from assets/font.woff2 rename to src/assets/font.woff2 diff --git a/assets/js/app.js b/src/assets/js/app.js similarity index 100% rename from assets/js/app.js rename to src/assets/js/app.js diff --git a/assets/media/whatwhat-av1.mp4 b/src/assets/media/whatwhat-av1.mp4 similarity index 100% rename from assets/media/whatwhat-av1.mp4 rename to src/assets/media/whatwhat-av1.mp4 diff --git a/assets/media/whatwhat-avc.mp4 b/src/assets/media/whatwhat-avc.mp4 similarity index 100% rename from assets/media/whatwhat-avc.mp4 rename to src/assets/media/whatwhat-avc.mp4 diff --git a/emily.pub b/src/emily.pub similarity index 100% rename from emily.pub rename to src/emily.pub diff --git a/index.html b/src/index.html similarity index 100% rename from index.html rename to src/index.html diff --git a/snaki.keys b/src/snaki.keys similarity index 100% rename from snaki.keys rename to src/snaki.keys