chore(ignore-revs): Ignore reformat commit

style(treewide): Switch to nixfmt
chore(server): Read package details from Cargo.toml
2025-11-20 15:51:06 +08:00 · 2025-11-20 15:50:56 +08:00 · 2025-11-20 15:41:11 +08:00 · 2025-11-20 15:40:14 +08:00 · 2025-11-20 15:40:11 +08:00
11 changed files with 674 additions and 592 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -0,0 +1,2 @@
+# Switch to nixfmt formatting
+82c1d22d3dd74fb5da489162a9d4caba9ab3baba
--- a/flake.lock
+++ b/flake.lock
@ -2,16 +2,18 @@
  "nodes": {
    "dream2nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "purescript-overlay": "purescript-overlay",
        "pyproject-nix": "pyproject-nix"
      },
      "locked": {
-        "lastModified": 1735160684,
-        "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=",
+        "lastModified": 1763413832,
+        "narHash": "sha256-dkqBwDXiv8MPoFyIvOuC4bVubAP+TlVZUkVMB78TTSg=",
        "owner": "nix-community",
        "repo": "dream2nix",
-        "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4",
+        "rev": "5658fba3a0b6b7d5cb0460b949651f64f644a743",
        "type": "github"
      },
      "original": {
@ -28,11 +30,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1737181903,
-        "narHash": "sha256-lvp77MhGzSN+ICd0MugppCjQR6cmlM2iAC5cjy2ZsaA=",
+        "lastModified": 1763621140,
+        "narHash": "sha256-nx0zy/+yR57FwloXmatf3CaXgzA4zJqIFbplnpaKn/Y=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "ac79bb490b8c1af4bbc587b84c76f9527d6b14f7",
+        "rev": "d4e14d370b4763c67ea02a39f01f5366297d61cb",
        "type": "github"
      },
      "original": {
@ -59,34 +61,15 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1729850857,
-        "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257",
-        "type": "github"
+        "lastModified": 1763334038,
+        "narHash": "sha256-3FzFzhmeuKK2dLv6pm6rC1QTcukVe+xcLpKOrE5Fx5g=",
+        "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.812880.4c8cdd5b1a63/nixexprs.tar.xz?lastModified=1763334038&rev=4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1737165118,
-        "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
      }
    },
    "purescript-overlay": {
@ -113,18 +96,22 @@
      }
    },
    "pyproject-nix": {
-      "flake": false,
+      "inputs": {
+        "nixpkgs": [
+          "dream2nix",
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1702448246,
-        "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=",
-        "owner": "davhau",
+        "lastModified": 1752481895,
+        "narHash": "sha256-luVj97hIMpCbwhx3hWiRwjP2YvljWy8FM+4W9njDhLA=",
+        "owner": "pyproject-nix",
        "repo": "pyproject.nix",
-        "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb",
+        "rev": "16ee295c25107a94e59a7fc7f2e5322851781162",
        "type": "github"
      },
      "original": {
-        "owner": "davhau",
-        "ref": "dream2nix",
+        "owner": "pyproject-nix",
        "repo": "pyproject.nix",
        "type": "github"
      }
@ -133,17 +120,17 @@
      "inputs": {
        "dream2nix": "dream2nix",
        "fenix": "fenix",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
      }
    },
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1737140097,
-        "narHash": "sha256-m4SN8DeKzsP10EQFS7+2zgGfCrMhTfTt1H0QRNesD08=",
+        "lastModified": 1763555010,
+        "narHash": "sha256-SG8PRrLir8RkXdyBm/NnuUo3WqS7HW6ltJLZnAWjBjA=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "f61bfa4d7feb84d07538d361fe77d34a29e3b375",
+        "rev": "636c3aa24ec6762347c334c030b5034c351d6e05",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -2,8 +2,11 @@
  description = "tlater.net web server";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    dream2nix.url = "github:nix-community/dream2nix";
+    nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
+    dream2nix = {
+      url = "github:nix-community/dream2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

    fenix = {
      url = "github:nix-community/fenix";
@ -11,70 +14,77 @@
    };
  };

-  outputs = {
-    self,
-    nixpkgs,
-    dream2nix,
-    fenix,
-  }: let
-    # At the moment, we only deploy to x86_64-linux. Update when we
-    # care about another platform.
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-    fenixPkgs = fenix.packages.${system};
-    ownPkgs = self.packages.${system};
-  in {
-    packages.${system} = dream2nix.lib.importPackages {
-      projectRoot = ./.;
-      projectRootFile = "flake.nix";
-      packagesDir = ./packages;
-      packageSets = {
-        nixpkgs = pkgs;
-        fenix = fenixPkgs;
-      };
-    };
-
-    apps.${system} = {
-      default = let
-        inherit (ownPkgs) server templates;
-        inherit (pkgs) writeShellScript;
-      in {
-        type = "app";
-        program = builtins.toString (writeShellScript "tlaternet-webserver" ''
-          ${server}/bin/tlaternet-webserver --template-directory ${templates}
-        '');
+  outputs =
+    {
+      self,
+      nixpkgs,
+      dream2nix,
+      fenix,
+    }:
+    let
+      # At the moment, we only deploy to x86_64-linux. Update when we
+      # care about another platform.
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+      fenixPkgs = fenix.packages.${system};
+      ownPkgs = self.packages.${system};
+    in
+    {
+      packages.${system} = dream2nix.lib.importPackages {
+        projectRoot = ./.;
+        projectRootFile = "flake.nix";
+        packagesDir = ./packages;
+        packageSets = {
+          nixpkgs = pkgs;
+          fenix = fenixPkgs;
+        };
      };

-      update = let
-        update-script = pkgs.callPackage ./nix/update.nix {inherit self;};
-      in {
-        type = "app";
-        program = "${update-script}/bin/update";
+      apps.${system} = {
+        default =
+          let
+            inherit (ownPkgs) server templates;
+            inherit (pkgs) writeShellScript;
+          in
+          {
+            type = "app";
+            program = builtins.toString (
+              writeShellScript "tlaternet-webserver" ''
+                ${server}/bin/tlaternet-webserver --template-directory ${templates}
+              ''
+            );
+          };
+
+        update =
+          let
+            update-script = pkgs.callPackage ./nix/update.nix { inherit self; };
+          in
+          {
+            type = "app";
+            program = "${update-script}/bin/update";
+          };
      };
-    };

-    nixosModules.default = import ./nix/module.nix {inherit self system;};
+      nixosModules.default = import ./nix/module.nix { inherit self system; };

-    devShells.${system} = {
-      server = pkgs.mkShell {
-        packages = [
-          (fenixPkgs.stable.withComponents [
-            "rustc"
-            "cargo"
-            "rustfmt"
-            "rust-std"
-            "rust-docs"
-            "clippy"
-            "rust-src"
-            "rust-analysis"
-          ])
-          fenixPkgs.rust-analyzer
-        ];
+      devShells.${system} = {
+        server = pkgs.mkShell {
+          packages = [
+            (fenixPkgs.stable.withComponents [
+              "rustc"
+              "cargo"
+              "rustfmt"
+              "rust-std"
+              "rust-docs"
+              "clippy"
+              "rust-src"
+              "rust-analysis"
+            ])
+            fenixPkgs.rust-analyzer
+          ];
+        };
      };
-    };

-    checks.${system} = import ./nix/checks {
-      inherit self pkgs;
+      checks.${system} = import ./nix/checks { inherit self pkgs; };
    };
-  };
 }
--- a/nix/checks/default.nix
+++ b/nix/checks/default.nix
@ -1,9 +1,8 @@
+{ pkgs, self }:
+let
+  callPackage = pkgs.lib.callPackageWith (pkgs // { inherit self; });
+in
 {
-  pkgs,
-  self,
-}: let
-  callPackage = pkgs.lib.callPackageWith (pkgs // {inherit self;});
-in {
-  lintNix = callPackage ./lint-nix.nix {};
-  openHomepage = callPackage ./open-homepage.nix {};
+  lintNix = callPackage ./lint-nix.nix { };
+  openHomepage = callPackage ./open-homepage.nix { };
 }
--- a/nix/checks/lint-nix.nix
+++ b/nix/checks/lint-nix.nix
@ -2,26 +2,31 @@
  self,
  lib,
  stdenv,
-  alejandra,
+  nixfmt-rfc-style,
  deadnix,
  statix,
-}: let
+}:
+let
  inherit (lib) sourceFilesBySuffices;
 in
-  stdenv.mkDerivation {
-    dontPatch = true;
-    dontConfigure = true;
-    dontBuild = true;
-    dontInstall = true;
-    doCheck = true;
+stdenv.mkDerivation {
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontInstall = true;
+  doCheck = true;

-    name = "lint-nix";
-    src = sourceFilesBySuffices self [".nix"];
-    checkInputs = [alejandra deadnix statix];
-    checkPhase = ''
-      mkdir -p $out
-      alejandra --check . | tee $out/alejandra.log
-      deadnix --fail | tee $out/deadnix.log
-      statix check | tee $out/statix.log
-    '';
-  }
+  name = "lint-nix";
+  src = sourceFilesBySuffices self [ ".nix" ];
+  checkInputs = [
+    nixfmt-rfc-style
+    deadnix
+    statix
+  ];
+  checkPhase = ''
+    mkdir -p $out
+    nixfmt --strict --check . | tee $out/nixfmt.log
+    deadnix --fail | tee $out/deadnix.log
+    statix check | tee $out/statix.log
+  '';
+}
--- a/nix/checks/open-homepage.nix
+++ b/nix/checks/open-homepage.nix
@ -1,19 +1,16 @@
-{
-  self,
-  nixosTest,
-}:
+{ self, nixosTest }:
 nixosTest {
  name = "open-homepage";

  nodes = {
    # Host with just the default configuration
    defaults = {
-      imports = [self.nixosModules.default];
+      imports = [ self.nixosModules.default ];
      services.tlaternet-webserver.enable = true;
    };

    host = {
-      imports = [self.nixosModules.default];
+      imports = [ self.nixosModules.default ];

      services.tlaternet-webserver = {
        enable = true;
@ -23,10 +20,10 @@ nixosTest {
        };
      };

-      networking.firewall.allowedTCPPorts = [8080];
+      networking.firewall.allowedTCPPorts = [ 8080 ];
    };

-    client = {};
+    client = { };
  };

  testScript = ''
--- a/nix/module.nix
+++ b/nix/module.nix
@ -1,18 +1,14 @@
-{
-  self,
-  system,
-}: {
-  config,
-  lib,
-  ...
-}: let
+{ self, system }:
+{ config, lib, ... }:
+let
  inherit (lib) mkEnableOption mkIf mkOption;
  inherit (lib.types) str int;
  inherit (lib.strings) escapeShellArgs;
  inherit (self.packages.${system}) server templates;

  cfg = config.services.tlaternet-webserver;
-in {
+in
+{
  options = {
    services.tlaternet-webserver = {
      enable = mkEnableOption "tlaternet web server";
@ -35,8 +31,8 @@ in {
  config = mkIf cfg.enable {
    systemd.services.tlaternet-webserver = {
      description = "tlaternet webserver";
-      wantedBy = ["multi-user.target"];
-      after = ["network.target"];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];

      script = escapeShellArgs [
        "${server}/bin/tlaternet-webserver"
@ -60,14 +56,21 @@ in {
        ProtectKernelModules = true;
        ProtectKernelLogs = true;
        ProtectControlGroups = true;
-        RestrictAddressFamilies = ["AF_UNIX" "AF_INET" "AF_INET6"];
+        RestrictAddressFamilies = [
+          "AF_UNIX"
+          "AF_INET"
+          "AF_INET6"
+        ];
        RestrictNamespaces = true;
        LockPersonality = true;
        MemoryDenyWriteExecute = true;
        RestrictRealtime = true;
        RestrictSUIDSGID = true;
        SystemCallArchitectures = "native";
-        SystemCallFilter = ["@system-service" "~@privileged @resources @setuid @keyring"];
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged @resources @setuid @keyring"
+        ];
      };
    };
  };
--- a/nix/update.nix
+++ b/nix/update.nix
@ -6,20 +6,25 @@
  git,
  nix,
  yq-go,
-}: let
+}:
+let
  selfPackages = self.packages.${system};
  inherit (selfPackages.server.config.deps) cargo;
  inherit (selfPackages.templates.config.deps) npm;

  npm-check-updates =
-    (builtins.elemAt (lib.attrValues
-      selfPackages.templates.config.nodejs-granular-v3.deps.npm-check-updates)
-    0)
-    .package-func
-    .result;
+    (builtins.elemAt (lib.attrValues selfPackages.templates.config.nodejs-granular-v3.deps.npm-check-updates) 0)
+    .package-func.result;
 in
-  writeShellApplication {
-    name = "update";
-    runtimeInputs = [cargo git nix npm npm-check-updates yq-go];
-    text = builtins.readFile ./scripts/update.sh;
-  }
+writeShellApplication {
+  name = "update";
+  runtimeInputs = [
+    cargo
+    git
+    nix
+    npm
+    npm-check-updates
+    yq-go
+  ];
+  text = builtins.readFile ./scripts/update.sh;
+}
--- a/packages/server/Cargo.lock
+++ b/packages/server/Cargo.lock
--- a/packages/server/default.nix
+++ b/packages/server/default.nix
@ -1,16 +1,26 @@
-{dream2nix, ...}: {
+{ dream2nix, lib, ... }:
+{
  imports = [
    dream2nix.modules.dream2nix.rust-cargo-lock
    dream2nix.modules.dream2nix.rust-cargo-vendor
    dream2nix.modules.dream2nix.rust-crane
  ];

-  deps = {fenix, ...}: {
-    deps.cargo = fenix.stable.minimalToolchain;
-  };
+  deps =
+    { fenix, ... }:
+    {
+      deps.cargo = fenix.stable.minimalToolchain;
+    };

-  name = "tlaternet-webserver";
-  version = "0.1.0";
+  inherit
+    ((lib.pipe ./Cargo.toml [
+      builtins.readFile
+      builtins.fromTOML
+    ]).package
+    )
+    name
+    version
+    ;

  mkDerivation = {
    src = ./.;
--- a/packages/templates/default.nix
+++ b/packages/templates/default.nix
@ -3,28 +3,37 @@
  config,
  lib,
  ...
-}: {
+}:
+{
  imports = [
    dream2nix.modules.dream2nix.nodejs-package-json-v3
    dream2nix.modules.dream2nix.nodejs-granular-v3
    dream2nix.modules.dream2nix.nodejs-devshell-v3
  ];

-  deps = {nixpkgs, ...}: {
-    inherit (nixpkgs) pkg-config runCommandLocal rsync vips yj;
-  };
+  deps =
+    { nixpkgs, ... }:
+    {
+      inherit (nixpkgs)
+        pkg-config
+        runCommandLocal
+        rsync
+        vips
+        yj
+        ;
+    };

  name = "tlaternet-templates";
  version = "0.1.0";

  mkDerivation = {
-    src = config.deps.runCommandLocal "source" {nativeBuildInputs = [config.deps.yj];} ''
+    src = config.deps.runCommandLocal "source" { nativeBuildInputs = [ config.deps.yj ]; } ''
      cp -r ${./.} $out/
      chmod -R u+w $out
      yj < $out/package.yaml > $out/package.json
    '';

-    nativeBuildInputs = [config.deps.yj];
+    nativeBuildInputs = [ config.deps.yj ];

    # The default phase (which is hidden in `preInstallPhases`) will
    # copy the full node_modules directory to the output, and symlink
@ -32,7 +41,7 @@
    #
    # Since this package's output is static HTML/JS, we do not want
    # that.
-    preInstallPhases = lib.mkForce [];
+    preInstallPhases = lib.mkForce [ ];
    installPhase = ''
      cp -r dist $out
    '';
Author	SHA1	Message	Date
Tristan Daniël Maat	a9da311993	chore(ignore-revs): Ignore reformat commit	2025-11-20 15:51:06 +08:00
Tristan Daniël Maat	82c1d22d3d	style(treewide): Switch to nixfmt	2025-11-20 15:50:56 +08:00
Tristan Daniël Maat	4b0e6f0a8c	chore(server): Read package details from `Cargo.toml`	2025-11-20 15:41:11 +08:00
Tristan Daniël Maat	92e3fc6602	update(Cargo.lock): Update rust inputs	2025-11-20 15:40:14 +08:00
Tristan Daniël Maat	a3ae52dea8	update(flake.lock): Update flake inputs	2025-11-20 15:40:11 +08:00