I fixed it
This commit is contained in:
parent
7ac00530e6
commit
70443d8216
6
.envrc
6
.envrc
|
@ -1,2 +1,4 @@
|
|||
watch_file shell.nix
|
||||
use nix
|
||||
# reload when these files change
|
||||
export TRITON_DONT_SOURCE_PROFILE=1
|
||||
watch_file flake.nix
|
||||
use_flake
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import lume from "https://deno.land/x/lume@v1.6.4/mod.ts";
|
||||
import postcss from "https:/deno.land/x/lume@v1.6.4/plugins/postcss.ts";
|
||||
import lume from "lume/mod.ts";
|
||||
import postcss from "lume/plugins/postcss.ts";
|
||||
|
||||
const markdown = { options: { breaks: true } };
|
||||
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
name: Hanna Deuss
|
||||
pronouns: she/her
|
||||
role: Visual Artist
|
||||
contactOptions:
|
||||
- name: mail
|
||||
value: hmd@miom.space
|
||||
link: 'mailto:hmd@miom.space'
|
|
@ -1,7 +0,0 @@
|
|||
name: Helena Geisler
|
||||
pronouns: she/her
|
||||
role: Artist, Writer, Scientist
|
||||
contactOptions:
|
||||
- name: mail
|
||||
value: hsg@miom.space
|
||||
link: 'mailto:hsg@miom.space'
|
7
_data/people/klz.yml
Normal file
7
_data/people/klz.yml
Normal file
|
@ -0,0 +1,7 @@
|
|||
name: Katharina Lenz
|
||||
pronouns: she/her
|
||||
role:
|
||||
contactOptions:
|
||||
- name: mail
|
||||
value: klz@miom.space
|
||||
link: 'mailto:klz@miom.space'
|
7
_data/people/ks.yml
Normal file
7
_data/people/ks.yml
Normal file
|
@ -0,0 +1,7 @@
|
|||
name: Katharina Schreiber
|
||||
pronouns: she/her
|
||||
role:
|
||||
contactOptions:
|
||||
- name: mail
|
||||
value: ks@miom.space
|
||||
link: 'mailto:ks@miom.space'
|
7
_data/people/lv.yml
Normal file
7
_data/people/lv.yml
Normal file
|
@ -0,0 +1,7 @@
|
|||
name: Lea Vieler
|
||||
pronouns: she/her
|
||||
role:
|
||||
contactOptions:
|
||||
- name: mail
|
||||
value: lv@miom.space
|
||||
link: 'mailto:lv@miom.space'
|
7
_data/people/sd.yml
Normal file
7
_data/people/sd.yml
Normal file
|
@ -0,0 +1,7 @@
|
|||
name: Slavica Dretvić
|
||||
pronouns: she/her
|
||||
role:
|
||||
contactOptions:
|
||||
- name: mail
|
||||
value: lv@miom.space
|
||||
link: 'mailto:lv@miom.space'
|
12
deno.json
Normal file
12
deno.json
Normal file
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"importMap": "import_map.json",
|
||||
"tasks": {
|
||||
"lume": "echo \"import 'lume/cli.ts';\" | deno run --unstable -A -",
|
||||
"build": "deno task lume",
|
||||
"serve": "deno task lume -s"
|
||||
},
|
||||
"compilerOptions": {
|
||||
"jsx": "react-jsx",
|
||||
"jsxImportSource": "npm:react"
|
||||
}
|
||||
}
|
95
flake.lock
Normal file
95
flake.lock
Normal file
|
@ -0,0 +1,95 @@
|
|||
{
|
||||
"nodes": {
|
||||
"devshell": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1677411038,
|
||||
"narHash": "sha256-pxUh5tQozXw7ohX6mc7EhUriFR/kqWMnVS1fdohfKBs=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "7389b00da0c6b0e58aa514a239f4b08086d2a164",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1677342105,
|
||||
"narHash": "sha256-kv1fpkfCJGb0M+LZaCHFUuIS9kRIwyVgupHu86Y28nc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b1f87ca164a9684404c8829b851c3586c4d9f089",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"tritonshell-module": "tritonshell-module"
|
||||
}
|
||||
},
|
||||
"tritonshell-module": {
|
||||
"inputs": {
|
||||
"devshell": [
|
||||
"devshell"
|
||||
],
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675336609,
|
||||
"narHash": "sha256-PEsx4vXs0jOpnfHrWGDcpirhyEGMCuVo70Zr9KEvN+s=",
|
||||
"ref": "main",
|
||||
"rev": "4ce3a32dac5909b09eabcf66761e6e37bf457dcf",
|
||||
"revCount": 55,
|
||||
"type": "git",
|
||||
"url": "https://git.greenbaum.cloud/dev/tritonshell"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.greenbaum.cloud/dev/tritonshell"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
59
flake.nix
Normal file
59
flake.nix
Normal file
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
description = "devs & ops environment for nix'ing with triton";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
devshell.url = "github:numtide/devshell";
|
||||
devshell.inputs.flake-utils.follows = "flake-utils";
|
||||
devshell.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
tritonshell-module.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main";
|
||||
tritonshell-module.inputs.devshell.follows = "devshell";
|
||||
tritonshell-module.inputs.flake-utils.follows = "flake-utils";
|
||||
tritonshell-module.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, flake-utils, devshell, tritonshell-module, nixpkgs }:
|
||||
flake-utils.lib.simpleFlake {
|
||||
inherit self nixpkgs;
|
||||
name = "miom.space";
|
||||
preOverlays = [ devshell.overlay ];
|
||||
shell = { pkgs }:
|
||||
let
|
||||
google-font-downloader = pkgs.writeShellScriptBin "google-font-downloader" ''
|
||||
echo "Attempting to fetch $1"
|
||||
${pkgs.nodejs}/bin/npx google-font-downloader -- $1
|
||||
rm ./_includes/styles/typography.css
|
||||
echo "/* To regenerate this file, run $ google-font-downloader '$1' */" >> ./_includes/styles/typography.css
|
||||
echo "" >> ./_includes/styles/typography.css
|
||||
cat ./google-fonts-*.css >> ./_includes/styles/typography.css
|
||||
rm ./google-fonts-*.css
|
||||
'';
|
||||
in
|
||||
pkgs.devshell.mkShell {
|
||||
imports = [ tritonshell-module.devshellModules.x86_64-linux.tritonshell ];
|
||||
# Now the tritonshell environment nix module options are available
|
||||
environment = {
|
||||
enable = true;
|
||||
# CUSTOMIZE if desired, default options are:
|
||||
#cnsBaseDomain = "greenbaum.zone";
|
||||
#dataCenters = [ "cgn-1" "lev-1" ];
|
||||
#mantaDomain = "eu-central.manta.greenbaum.cloud";
|
||||
#tritonApiDomain = "api.greenbaum.cloud";
|
||||
};
|
||||
|
||||
# Add additional packages you'd like to be available in your devshell
|
||||
# PATH here
|
||||
devshell.packages = with pkgs; [
|
||||
deno
|
||||
google-font-downloader
|
||||
];
|
||||
bash.extra = ''
|
||||
export NVIM_USE_DENOLS=1
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
7
import_map.json
Normal file
7
import_map.json
Normal file
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"imports": {
|
||||
"lume/": "https://deno.land/x/lume@v1.12.1/",
|
||||
"react/jsx-runtime": "https://deno.land/x/lume@v1.12.1/deps/react_runtime.ts",
|
||||
"react": "https://deno.land/x/lume@v1.12.1/deps/react.ts"
|
||||
}
|
||||
}
|
|
@ -1,2 +0,0 @@
|
|||
User-agent: *
|
||||
Disallow: /
|
|
@ -1,13 +1,9 @@
|
|||
{ pkgs ? import <nixpkgs> {},
|
||||
nightingale-pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/f7949198dcff52265b322ca8abf7450610e7e49e.tar.gz") {},
|
||||
unstable ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") {}
|
||||
}:
|
||||
{ pkgs ? import <nixpkgs> {} }:
|
||||
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
nightingale-pkgs.docker-compose
|
||||
nodejs-16_x
|
||||
unstable.deno
|
||||
deno
|
||||
nodePackages.json
|
||||
nodePackages.triton
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue