From 1ff76f80c39fd928416430852a8e9efad9983370 Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Fri, 6 Mar 2026 02:04:11 -0800 Subject: merge --- .pre-commit-config.yaml | 2 +- blog/acausal.org | 1 - blog/automation.org | 1 - blog/horses.org | 1 - blog/manifesto-1.org | 1 - blog/nixos.org | 1 - blog/private_keys.org | 1 - blog/stem.org | 1 - blog/tech-bros.org | 1 - blog/voting.org | 1 - blog/you_dont_matter.org | 1 - flake.nix | 6 ++++++ index.org | 1 - mindmap/index.org | 1 - 14 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82f8cc4..c1051aa 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/c35nadk9gd4bkknx86jhbkfmn4cgknnm-pre-commit-config.json \ No newline at end of file +/nix/store/a28hy0i13pkfg8msb1qcacdf4zfb2ygs-pre-commit-config.json \ No newline at end of file diff --git a/blog/acausal.org b/blog/acausal.org index ed6ad6f..5ee0150 100644 --- a/blog/acausal.org +++ b/blog/acausal.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t diff --git a/blog/automation.org b/blog/automation.org index 4e0841a..c79cba1 100644 --- a/blog/automation.org +++ b/blog/automation.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t * Introduction diff --git a/blog/horses.org b/blog/horses.org index b55d66d..16b728c 100644 --- a/blog/horses.org +++ b/blog/horses.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t diff --git a/blog/manifesto-1.org b/blog/manifesto-1.org index 9145033..73ec6ae 100644 --- a/blog/manifesto-1.org +++ b/blog/manifesto-1.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t diff --git a/blog/nixos.org b/blog/nixos.org index eb7ff0c..0473a31 100644 --- a/blog/nixos.org +++ b/blog/nixos.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t * Introduction diff --git a/blog/private_keys.org b/blog/private_keys.org index 50fd16a..37a2c87 100644 --- a/blog/private_keys.org +++ b/blog/private_keys.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t diff --git a/blog/stem.org b/blog/stem.org index 62a140b..15e0544 100644 --- a/blog/stem.org +++ b/blog/stem.org @@ -2,7 +2,6 @@ #+author: Preston Pan #+description: My own concatenative programming language #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t diff --git a/blog/tech-bros.org b/blog/tech-bros.org index 2d027c0..a5b452a 100644 --- a/blog/tech-bros.org +++ b/blog/tech-bros.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t * Introduction diff --git a/blog/voting.org b/blog/voting.org index fcb6db5..3c5d5e8 100644 --- a/blog/voting.org +++ b/blog/voting.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t * Introduction diff --git a/blog/you_dont_matter.org b/blog/you_dont_matter.org index 7bed3ec..efa4ca3 100644 --- a/blog/you_dont_matter.org +++ b/blog/you_dont_matter.org @@ -9,7 +9,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t * Introduction diff --git a/flake.nix b/flake.nix index c9884eb..f97c2f7 100644 --- a/flake.nix +++ b/flake.nix @@ -92,12 +92,18 @@ fi pass_filenames = false; always_run = true; entry = "${pkgs.writeShellScript "deploy-spontaneity-hook" '' +exec < /dev/tty BRANCH=$(git branch --show-current) if [ "$BRANCH" != "main" ]; then exit 0 fi echo "Pushing to main detected. Deploying to ${spontaneityHost}..." +export NIX_SSHOPTS="-t" +nixos-rebuild switch --flake .#spontaneity \ + --target-host ${spontaneityUser}@${spontaneityHost} + --ask-sudo-password --sudo + if [ $? -eq 0 ]; then echo "Deployment successful!" else diff --git a/index.org b/index.org index 71b9ab7..c4b0bf0 100644 --- a/index.org +++ b/index.org @@ -10,7 +10,6 @@ #+html_head: #+html_head: #+html_head: -#+html_head: #+language: en #+OPTIONS: broken-links:t #+OPTIONS: html-preamble:nil diff --git a/mindmap/index.org b/mindmap/index.org index 6e8512c..ab3c1d9 100644 --- a/mindmap/index.org +++ b/mindmap/index.org @@ -3,7 +3,6 @@ #+author: Preston Pan #+date: <2023-06-10 Sat> #+html_head: -#+html_head: * Introducing: the Mindmap Do you want to know everything like me and be a smart person instead of dumb? -- cgit v1.3