diff --git a/nixos/flake.lock b/nixos/flake.lock index 6d6ac302..a6d440fd 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -109,11 +109,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735597925, - "narHash": "sha256-znyKiXlrkPL+2xQwAR6G4/DKCgsutyIPo+d1dGeh2W4=", + "lastModified": 1735689283, + "narHash": "sha256-LOZRScnB8Q9ylmlXnt2j2v4Aj1b5JZTdSeKYaFL1RDw=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "478fe3917c2882a1c321f9d1eec808b71698974d", + "rev": "60611b8a4a1d5b3c1097cce85eb0311de0696cfa", "type": "github" }, "original": { @@ -505,11 +505,11 @@ ] }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -998,11 +998,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1735745492, + "narHash": "sha256-Vs2IkQx4uDv2YehZ1sCw9K+kuMrBa3opnkGJJhMPNPo=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "9a9fef316ad191b3086edda465e850af282de4e0", "type": "github" }, "original": { @@ -1060,23 +1060,6 @@ "type": "path" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1715853528, - "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.8.1", - "repo": "libgit2", - "type": "github" - } - }, "lsp": { "flake": false, "locked": { @@ -1154,17 +1137,16 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1735586022, - "narHash": "sha256-17Wosqogo+6QMddJ8qo5C9NZug8QRuFO59KyTP/XfFw=", + "lastModified": 1735677698, + "narHash": "sha256-L0G5igB2xXUQwKhU5aRfRtrhDJfJ3PkOUcvXnQM2+kI=", "owner": "NixOS", "repo": "nix", - "rev": "61c3559116f0dccdd0c69cb35f411f2d6016c41a", + "rev": "4f3960ea260f95a36a204d0d57d60ead66c3b194", "type": "github" }, "original": { @@ -1358,16 +1340,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1734359947, + "narHash": "sha256-1Noao/H+N8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "48d12d5e70ee91fe8481378e540433a7303dbf6a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix index 4daecf13..3417b5cb 100644 --- a/nixos/machines/biskcomp.nix +++ b/nixos/machines/biskcomp.nix @@ -1,4 +1,4 @@ -{ pkgs, forEachUser, config, ... }: +{ pkgs, lib, forEachUser, config, ... }: let biskcomp-nginx-hostnames = "192.168.1.44 railbird.ai 1896Folsom.duckdns.org biskcomp.local 0.0.0.0 67.162.131.71"; in { @@ -104,10 +104,16 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { + ExecStart = ''${pkgs.runtimeShell} -l -c "${lib.getExe' pkgs.emacs "emacs"} --load /home/imalison/.emacs.d/org-api.el --daemon=org-api"''; + RemainAfterExit = true; Restart = "on-failure"; User = "imalison"; }; - ExecStart = "${pkgs.emacs} --load /home/imalison/org-api.el --daemon=org-api"; + }; + + age.secrets.org-api-passwords = { + file = ../secrets/org-api-passwords.age; + owner = "nginx"; }; services.nginx = { @@ -116,10 +122,13 @@ in recommendedGzipSettings = true; recommendedTlsSettings = true; virtualHosts = { - "org-mode.1896folsom.duckdns.org" = { + "org-mode.1896Folsom.duckdns.org" = { enableACME = true; forceSSL = true; - locations."/".proxyPass = "http://localhost:2025"; + locations."/" = { + proxyPass = "http://localhost:2025"; + basicAuthFile = config.age.secrets.org-api-passwords.path; + }; }; "gitlab.railbird.ai" = { enableACME = true;