commit c6028a1722e616140a994eba39a6a9f5e42b788d
parent ecaf04d6d6e11de0ae2fbf795eeeb3c3d4a0f23e
Author: beau hilton <cbeauhilton@gmail.com>
Date: Thu, 19 Oct 2023 10:56:41 -0500
more faffing w devenv
Diffstat:
4 files changed, 128 insertions(+), 28 deletions(-)
diff --git a/.devenv/profile b/.devenv/profile
@@ -1 +1 @@
-/nix/store/1cvnbj69iabx679m4mm85wk4dwkfnxfp-devenv-profile
-\ No newline at end of file
+/nix/store/fq8b0ncl7w8l94slqp3cxqlam913zvln-devenv-profile
+\ No newline at end of file
diff --git a/flake.lock b/flake.lock
@@ -5,18 +5,20 @@
"flake-compat": "flake-compat",
"nix": "nix",
"nixpkgs": "nixpkgs",
+ "poetry2nix": "poetry2nix",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
- "lastModified": 1697058441,
- "narHash": "sha256-gjtW+nkM9suMsjyid63HPmt6WZQEvuVqA5cOAf4lLM0=",
+ "lastModified": 1696601469,
+ "narHash": "sha256-aPaqodzzoG7QWq2DVpy1XzTWYT2O4eL+MUcjsmYnWmo=",
"owner": "cachix",
"repo": "devenv",
- "rev": "55294461a62d90c8626feca22f52b0d3d0e18e39",
+ "rev": "4a056a3b1d3607e9f83ede7dd69bbefe518017b6",
"type": "github"
},
"original": {
"owner": "cachix",
+ "ref": "python-rewrite",
"repo": "devenv",
"type": "github"
}
@@ -53,11 +55,45 @@
"type": "github"
}
},
+ "flake-compat_3": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
+ "lastModified": 1689068808,
+ "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
@@ -71,9 +107,9 @@
"type": "github"
}
},
- "flake-utils_2": {
+ "flake-utils_3": {
"inputs": {
- "systems": "systems_2"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1685518550,
@@ -128,6 +164,7 @@
},
"nix": {
"inputs": {
+ "flake-compat": "flake-compat_2",
"lowdown-src": "lowdown-src",
"nixpkgs": [
"devenv",
@@ -136,27 +173,49 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1676545802,
- "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
+ "lastModified": 1692895818,
+ "narHash": "sha256-lfIz37c24QpkwAHJCDHrDNtQyMBdxq7RWG5sojbtARU=",
"owner": "domenkozar",
"repo": "nix",
- "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
+ "rev": "ca8a41cfc176dc7adad02ab756f6faef6e90ff1f",
"type": "github"
},
"original": {
"owner": "domenkozar",
- "ref": "relaxed-flakes",
+ "ref": "devenv-2.17",
"repo": "nix",
"type": "github"
}
},
+ "nix-github-actions": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "poetry2nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1688870561,
+ "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1678875422,
- "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
+ "lastModified": 1692808169,
+ "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
+ "rev": "9201b5ff357e781bf014d0330d18555695df7ba8",
"type": "github"
},
"original": {
@@ -168,8 +227,8 @@
},
"nixpkgs-python": {
"inputs": {
- "flake-compat": "flake-compat_2",
- "flake-utils": "flake-utils_2",
+ "flake-compat": "flake-compat_3",
+ "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
},
"locked": {
@@ -250,13 +309,36 @@
"type": "github"
}
},
+ "poetry2nix": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nix-github-actions": "nix-github-actions",
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1692876271,
+ "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=",
+ "owner": "nix-community",
+ "repo": "poetry2nix",
+ "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "poetry2nix",
+ "type": "github"
+ }
+ },
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
"devenv",
"flake-compat"
],
- "flake-utils": "flake-utils",
+ "flake-utils": "flake-utils_2",
"gitignore": "gitignore",
"nixpkgs": [
"devenv",
@@ -265,11 +347,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1688056373,
- "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=",
+ "lastModified": 1692274144,
+ "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7",
+ "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
"type": "github"
},
"original": {
@@ -283,7 +365,7 @@
"devenv": "devenv",
"nixpkgs": "nixpkgs_2",
"nixpkgs-python": "nixpkgs-python",
- "systems": "systems_3"
+ "systems": "systems_4"
}
},
"systems": {
@@ -330,6 +412,21 @@
"repo": "default",
"type": "github"
}
+ },
+ "systems_4": {
+ "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",
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,8 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
systems.url = "github:nix-systems/default";
- devenv.url = "github:cachix/devenv";
+ #devenv.url = "github:cachix/devenv";
+ devenv.url = "github:cachix/devenv/python-rewrite";
nixpkgs-python.url = "github:cachix/nixpkgs-python"; # required to set Python version
};
@@ -19,7 +20,8 @@
...
} @ inputs: let
forEachSystem = nixpkgs.lib.genAttrs (import systems);
- in {
+ in {
+ devenv-up = self.devShells.x86_64-linux.default.config.procfileScript;
devShells =
forEachSystem
(system: let
@@ -35,17 +37,17 @@
pandoc
soupault
silver-searcher
+ simple-http-server
];
languages.ocaml = {enable = true;};
- languages.python = {enable = true;};
enterShell = ''
rm -rf ./build
soupault --debug
+ #simple-http-server --index --nocache -p 8999 -o ./build
+ #ag -l | entr -s 'soupault'
'';
processes = {
- server.exec = "python -m http.server 8999 --directory build";
- open-browser.exec = "$BROWSER http://localhost:8999";
- rebuild.exec = "ag -l | entr -s 'soupault'";
+ rebuild.exec = "ag -l | entr -n -s 'soupault'";
};
}
];
diff --git a/soupault.toml b/soupault.toml
@@ -33,6 +33,7 @@ md = 'pandoc -f commonmark+smart -t html --no-highlight --lua-filter=helpers/cma
[custom_options]
site_url = "https://beauhilton.com"
+
[index]
index = true
sort_descending = true
@@ -42,7 +43,6 @@ dump_json = "index.json"
section = "posts"
date_formats = ["%F"]
-
[index.fields.title]
selector = ["h1"]
@@ -86,6 +86,7 @@ index_template = """
{% endfor %}
"""
+
[widgets.escape-html-in-pre]
widget = "escape-html"
selector = ".raw-html"
