Update actix-web and tokio

Bumps [actix-rt](https://github.com/actix/actix-net) from 1.1.1 to 2.2.0.
- [Release notes](https://github.com/actix/actix-net/releases)
- [Commits](https://github.com/actix/actix-net/compare/rt-1.1.1...rt-v2.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

.cargo/audit.toml

@@ -1 +0,0 @@
-[advisories]

.envrc

@@ -1 +0,0 @@
-eval "$(lorri direnv)"

.github/dependabot.yml

@@ -1,12 +1,10 @@
 version: 2
 updates:
-  - package-ecosystem: cargo
+- package-ecosystem: cargo
-    directory: "/"
+  directory: "/"
-    schedule:
+  schedule:
-      interval: daily
+    interval: daily
-      time: "04:00"
+    time: "04:00"
-    open-pull-requests-limit: 10
+  open-pull-requests-limit: 10
-    assignees:
+  assignees:
-      - vbrandl
+  - vbrandl
-    labels:
-      - dependencies

.github/workflows/audit.yml

@@ -3,19 +3,26 @@ on:
   schedule:
     - cron: '0 1 * * *'
   push:
-    branches:
-      - master
-  pull_request:
     paths:
       - '**/Cargo.toml'
       - '**/Cargo.lock'
-      - ".cargo/audit.toml"
+  pull_request:
 
 jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+
+      - name: Cache cargo registry, index and build directory
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./target
+          key: audit-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
       - uses: actions-rs/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -6,12 +6,8 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  tests:
-    uses: vbrandl/hoc/.github/workflows/rust.yml@master
-
   publish:
     name: Publishing for ${{ matrix.os }}
-    needs: [tests]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -33,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -48,7 +44,7 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             ./target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: release-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cargo build
         uses: actions-rs/cargo@v1
@@ -78,14 +74,3 @@ jobs:
             target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.sha256
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  changelog:
-    name: Update Changelog
-    needs: [tests]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: taiki-e/create-gh-release-action@v1
-        with:
-          changelog: CHANGELOG.md
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust.yml

@@ -1,19 +1,13 @@
-on:
+on: [push, pull_request]
-  workflow_call:
-  push:
-    branches:
-      - master
-  pull_request:
-  schedule:
-    - cron: "0 0 * * *"
 
 jobs:
+
   rustfmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -23,6 +17,15 @@ jobs:
           override: true
           components: rustfmt
 
+      - name: Cache cargo registry, index and build directory
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./target
+          key: rustfmt-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
       - name: Check Formatting
         uses: actions-rs/cargo@v1
         with:
@@ -34,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -45,13 +48,13 @@ jobs:
           components: rustfmt
 
       - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             ./target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: clippy-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Clippy Linting
         uses: actions-rs/cargo@v1
@@ -71,7 +74,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -81,13 +84,13 @@ jobs:
           override: true
 
       - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             ./target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: test-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Run Tests
         uses: actions-rs/cargo@v1

CHANGELOG.md

@@ -1,91 +0,0 @@
-# Changelog
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-
-## [0.29.0] 2023-01-07
-
-### Dependency Updates
-
-* Updated [`badgers`](https://github.com/vbrandl/badgers) from 1.0.0 to 1.1.0 ([#530])
-* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.90 to 1.0.91 ([#531])
-* Updated [`vergen`](https://github.com/rustyhorde/vergen) from 7.3.1 to 7.4.4 ([#533])
-* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.6.2 to 0.7.1 ([#534])
-* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.151 to 1.0.152 ([#535])
-* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.23.0 to 1.23.1 ([#536])
-* Updated [`vergen`](https://github.com/rustyhorde/vergen) from 7.4.4 to 7.5.0 ([#537])
-* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.23.1 to 1.24.1 ([#539])
-
-[#530]: https://github.com/vbrandl/hoc/pull/530
-[#531]: https://github.com/vbrandl/hoc/pull/531
-[#533]: https://github.com/vbrandl/hoc/pull/533
-[#534]: https://github.com/vbrandl/hoc/pull/534
-[#535]: https://github.com/vbrandl/hoc/pull/535
-[#536]: https://github.com/vbrandl/hoc/pull/536
-[#537]: https://github.com/vbrandl/hoc/pull/537
-[#539]: https://github.com/vbrandl/hoc/pull/539
-
-## [0.28.0] 2022-12-18
-
-### Fixes
-
-* Fixed clippy lint `needless_borrow` ([#526])
-
-### Dependency Updates
-
-* Updated [`bytes`](https://github.com/tokio-rs/bytes) from 1.2.1 to 1.3.0 ([#519])
-* Updated [`config`](https://github.com/mehcode/config-rs) from 0.13.2 to 0.13.3 ([#522])
-* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.88 to 1.0.90 ([#527])
-* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.147 to 1.0.151 ([#528])
-
-[#519]: https://github.com/vbrandl/hoc/pull/519
-[#522]: https://github.com/vbrandl/hoc/pull/522
-[#526]: https://github.com/vbrandl/hoc/pull/526
-[#527]: https://github.com/vbrandl/hoc/pull/527
-[#528]: https://github.com/vbrandl/hoc/pull/528
-
-## [0.27.0] 2022-10-21
-
-### Dependency Updates
-
-* Updated [`futures`](https://github.com/rust-lang/futures-rs) from 0.3.24 to 0.3.25 ([#511])
-* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.86 to 1.0.87 ([#510])
-* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.145 to 1.0.147 ([#512])
-* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.6.1 to 0.6.2 ([#513])
-* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.12 to 0.11.13 ([#515])
-* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.21.2 to 1.22.0 ([#516])
-* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.87 to 1.0.88 ([#517])
-
-
-### Fixes
-
-* Fix clippy lint `needless-borrow` ([#514])
-
-[#511]: https://github.com/vbrandl/hoc/pull/511
-[#510]: https://github.com/vbrandl/hoc/pull/510
-[#512]: https://github.com/vbrandl/hoc/pull/512
-[#513]: https://github.com/vbrandl/hoc/pull/513
-[#514]: https://github.com/vbrandl/hoc/pull/514
-[#515]: https://github.com/vbrandl/hoc/pull/515
-[#516]: https://github.com/vbrandl/hoc/pull/516
-[#517]: https://github.com/vbrandl/hoc/pull/517
-
-
-## [0.26.0] 2022-10-03
-
-### Changed
-
-* Updated [`tracing-subscriber`](https://github.com/tokio-rs/tracing) from 0.3.15 to 0.3.16 ([#501])
-* Updated [`tracing`](https://github.com/tokio-rs/tracing) from 0.1.36 to 0.1.37 ([#502])
-* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.85 to 1.0.86 ([#503])
-* Updated [`tracing-bunyan-formatter`](https://github.com/LukeMathWalker/tracing-bunyan-formatter) from 0.3.3 to 0.3.4 ([#504])
-* Updated [`dotenvy`](https://github.com/allan2/dotenvy) from 0.15.5 to 0.15.6 ([#508])
-
-[#501]: https://github.com/vbrandl/hoc/pull/501
-[#502]: https://github.com/vbrandl/hoc/pull/502
-[#503]: https://github.com/vbrandl/hoc/pull/503
-[#504]: https://github.com/vbrandl/hoc/pull/504
-[#508]: https://github.com/vbrandl/hoc/pull/508

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoc"
-version = "0.29.0"
+version = "0.18.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
@@ -13,35 +13,34 @@ path = "src/main.rs"
 name = "hoc"
 
 [dependencies]
-actix-rt = "2.7.0"
+actix-rt = "2.2.0"
-actix-web = "4.2.1"
+actix-web = "4.0.0-beta.8"
-badgers = "1.1.0"
+badge = "0.3.0"
-bytes = "1.3.0"
+bytes = "1.0.1"
-config = { version = "0.13.3", features = ["toml"] }
+config = { version = "0.11.0", features = ["toml"] }
-dotenvy = "0.15.6"
+dotenv = "0.15.0"
-futures = "0.3.25"
+futures = "0.3.17"
-git2 = "0.15.0"
+git2 = "0.13.20"
 lazy_static = "1.4.0"
-mime = "0.3"
 number_prefix = "0.4.0"
-openssl-probe = "0.1.5"
+openssl-probe = "0.1.4"
-reqwest = "0.11.13"
+reqwest = "0.11.4"
-serde = "1.0.152"
+serde = "1.0.126"
-serde_derive = "1.0.137"
+serde_derive = "1.0.123"
-serde_json = "1.0.91"
+serde_json = "1.0.64"
-tracing = "0.1.37"
+tracing = "0.1.26"
-tracing-actix-web = "0.7.1"
+tracing-actix-web = "0.4.0-beta.11"
-tracing-bunyan-formatter = "0.3.4"
+tracing-bunyan-formatter = "0.2.4"
 tracing-futures = "0.2.5"
-tracing-log = "0.1.3"
+tracing-log = "0.1.2"
-tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
+tracing-subscriber = { version = "0.2.19", features = ["registry", "env-filter"] }
 
 [build-dependencies]
-ructe = { version = "0.15.0", features = ["mime03"] }
+ructe = "0.13.4"
-vergen = { version = "7.5.0", default-features = false, features = ["git"] }
+vergen = { version = "5.1.13", default-features = false, features = ["git"] }
 
 [dev-dependencies]
-awc = "3.0.1"
+awc = "3.0.0-beta.7"
-ructe = "0.15.0"
+ructe = "0.13.4"
-tempfile = "3.3.0"
+tempfile = "3.2.0"
-tokio = "1.24.1"
+tokio = "1.11.0"

Dockerfile

@@ -1,13 +1,10 @@
-# FROM ekidd/rust-musl-builder:stable as builder
+FROM ekidd/rust-musl-builder:stable as builder
-FROM clux/muslrust:stable as builder
 
 # create new cargo project
-RUN cargo init --lib
+RUN USER=rust cargo init --lib
-# RUN USER=rust cargo init --lib
 RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
 # copy build config
-# COPY --chown=rust ./Cargo.lock ./Cargo.lock
+COPY --chown=rust ./Cargo.lock ./Cargo.lock
-COPY ./Cargo.lock ./Cargo.lock
 COPY ./Cargo.toml ./Cargo.toml
 # HACK: remove build-dependencies so we have at least some caching
 RUN head -n $(($(grep -n "\[build-dependencies\]" Cargo.toml | cut -f1 -d:) - 1)) Cargo.toml | sed '/build.rs/d' > \
@@ -41,7 +38,6 @@ USER hoc
 # FROM scratch
 # COPY --from=linuxkit/ca-certificates:v0.7 / /
 
-# COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
+COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
-COPY --from=builder /volume/target/x86_64-unknown-linux-musl/release/hoc .
 
 ENTRYPOINT ["/home/hoc/hoc"]

README.md

@@ -19,8 +19,8 @@ The API is as simple as
 https://<host>/<service>/<user>/<repo>
 ```
 
-where `<service>` is one of `gitub`, `gitlab`, `bitbucket` or `sourcehut`. The HoC data can also be received as JSON by
+where `<service>` is one of `gitub`, `gitlab` or `bitbucket`. The HoC data can also be received as JSON by appending
-appending `/json` to the reuqest path:
+`/json` to the reuqest path:
 
 ```
 https://<host>/<service>/<user>/<repo>/json

build.rs

@@ -1,15 +1,15 @@
 extern crate ructe;
 extern crate vergen;
 
-use ructe::{Ructe, RucteError};
+use ructe::Ructe;
 use vergen::{vergen, Config, ShaKind};
 
-fn main() -> Result<(), RucteError> {
+fn main() {
     let mut config = Config::default();
     *config.git_mut().sha_kind_mut() = ShaKind::Short;
     vergen(config).expect("Unable to generate static repo info");
-    let mut ructe = Ructe::from_env()?;
+    Ructe::from_env()
-    let mut statics = ructe.statics()?;
+        .expect("ructe")
-    statics.add_files("static")?;
+        .compile_templates("templates")
-    ructe.compile_templates("templates")
+        .unwrap();
 }

crate-hashes.json

@@ -0,0 +1 @@
+{}

default.nix

@@ -0,0 +1,56 @@
+{ sources ? import ./nix/sources.nix
+, system ? builtins.currentSystem
+}:
+
+let
+  rustOverlay = import "${sources.nixpkgs-mozilla}/rust-overlay.nix";
+  cargo2nixOverlay = import "${sources.cargo2nix}/overlay";
+
+  pkgs = import sources.nixpkgs {
+  # pkgs = import <nixpkgs> {
+    inherit system;
+    overlays = [ cargo2nixOverlay rustOverlay ];
+  };
+
+  rustPkgs = pkgs.rustBuilder.makePackageSet' {
+    rustChannel = "stable";
+    packageFun = import ./Cargo.nix;
+    localPatterns =
+      [
+        ''^(src|tests)(/.*)?''
+        ''[^/]*\.(rs|toml)$''
+        # include other directory from the project repository
+        ''^templates(/.*)?''
+        ''^static(/.*)?''
+        ''^.git.*(/.*)?''
+      ];
+    # packageOverrides
+  };
+in
+rec {
+  inherit rustPkgs;
+  shell = pkgs.mkShell {
+    inputsFrom = pkgs.lib.mapAttrsToList (_: pkg: pkg { }) rustPkgs.noBuild.workspace;
+    nativeBuildInputs = with rustPkgs; [ cargo rustc ];
+  };
+  package = (rustPkgs.workspace.hoc {}).overrideAttrs (drv: {
+      buildInputs = drv.buildInputs or [ ] ++ [ pkgs.git ];
+  });
+  dockerImage =
+    pkgs.dockerTools.buildImage {
+      name = "vbrandl/hits-of-code";
+      tag = package.version;
+
+      contents =
+        [
+          package
+          pkgs.cacert
+          pkgs.gitMinimal
+        ];
+
+      config = {
+        Cmd = [ "/bin/hoc" ];
+        WorkingDir = "/home/hoc";
+      };
+    };
+}

nix/sources.json

@@ -0,0 +1,50 @@
+{
+    "cargo2nix": {
+        "branch": "master",
+        "description": "Convert a Cargo.lock to mkRustCrate statements for import in Nix",
+        "homepage": "",
+        "owner": "tenx-tech",
+        "repo": "cargo2nix",
+        "rev": "7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15",
+        "sha256": "1z7xwk1hbp26aydsk3y07riy0ivwqss06n1470mvdl7allfcd1w5",
+        "type": "tarball",
+        "url": "https://github.com/tenx-tech/cargo2nix/archive/7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "niv": {
+        "branch": "master",
+        "description": "Easy dependency management for Nix projects",
+        "homepage": "https://github.com/nmattia/niv",
+        "owner": "nmattia",
+        "repo": "niv",
+        "rev": "98c74a80934123cb4c3bf3314567f67311eb711a",
+        "sha256": "1w8n54hapd4x9f1am33icvngkqns7m3hl9yair38yqq08ffwg0kn",
+        "type": "tarball",
+        "url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs": {
+        "branch": "nixpkgs-unstable",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "f6bfb371cba2b5a02f200c2747c1fe2c72bd782f",
+        "sha256": "0y3hlbyvznrpr1d2vxj2511hkjg733wdnxfaib3fgy9i9jr8ivzn",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/f6bfb371cba2b5a02f200c2747c1fe2c72bd782f.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs-mozilla": {
+        "branch": "master",
+        "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
+        "homepage": null,
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "e912ed483e980dfb4666ae0ed17845c4220e5e7c",
+        "sha256": "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3",
+        "type": "tarball",
+        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed483e980dfb4666ae0ed17845c4220e5e7c.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

nix/sources.nix

@@ -0,0 +1,134 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; };
+
+  fetch_tarball = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchTarball { inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { inherit (spec) url sha256; };
+
+  fetch_git = spec:
+    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+
+  fetch_builtin-tarball = spec:
+    builtins.trace
+      ''
+        WARNING:
+          The niv type "builtin-tarball" will soon be deprecated. You should
+          instead use `builtin = true`.
+
+          $ niv modify <package> -a type=tarball -a builtin=true
+      ''
+      builtins_fetchTarball { inherit (spec) url sha256; };
+
+  fetch_builtin-url = spec:
+    builtins.trace
+      ''
+        WARNING:
+          The niv type "builtin-url" will soon be deprecated. You should
+          instead use `builtin = true`.
+
+          $ niv modify <package> -a type=file -a builtin=true
+      ''
+      (builtins_fetchurl { inherit (spec) url sha256; });
+
+  #
+  # Various helpers
+  #
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+      if builtins.hasAttr "nixpkgs" sources
+      then sourcesNixpkgs
+      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+        import <nixpkgs> {}
+      else
+        abort
+          ''
+            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+            add a package called "nixpkgs" to your sources.json.
+          '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs spec
+    else if spec.type == "tarball" then fetch_tarball pkgs spec
+    else if spec.type == "git" then fetch_git spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
+    else if spec.type == "builtin-url" then fetch_builtin-url spec
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball { inherit url; }
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl { inherit url; }
+      else
+        fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs (
+      name: spec:
+        if builtins.hasAttr "outPath" spec
+        then abort
+          "The values in sources.json should not have an 'outPath' attribute"
+        else
+          spec // { outPath = fetch config.pkgs name spec; }
+    ) config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? ./sources.json
+    , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
+    , pkgs ? mkPkgs sources
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+in
+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

shell.nix

@@ -1,8 +1 @@
-{ pkgs ? import <nixpkgs> {} }:
+with import ./. { }; shell
-
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    openssl
-    pkg-config
-  ];
-}

src/config.rs

@@ -18,16 +18,21 @@ pub struct Settings {
 }
 
 impl Settings {
+    #[deprecated]
+    pub fn new() -> Result<Self, ConfigError> {
+        Self::load()
+    }
+
     pub fn load() -> Result<Self, ConfigError> {
-        Config::builder()
+        let mut config = Config::new();
-            .add_source(File::with_name("hoc.toml").required(false))
+        config
-            .add_source(Environment::with_prefix("hoc"))
+            .merge(File::with_name("hoc.toml").required(false))?
+            .merge(Environment::with_prefix("hoc"))?
             .set_default("repodir", "./repos")?
             .set_default("cachedir", "./cache")?
             .set_default("workers", 4)?
             .set_default("port", 8080)?
-            .set_default("host", "0.0.0.0")?
+            .set_default("host", "0.0.0.0")?;
-            .build()?
+        config.try_into()
-            .try_deserialize()
     }
 }

src/count.rs

@@ -1,30 +1,27 @@
 use crate::error::Result;
-use std::{
+use std::{fs::read_dir, path::Path, result::Result as StdResult};
-    fs::{read_dir, ReadDir},
-    iter::once,
-    path::Path,
-    result::Result as StdResult,
-};
 
-/// The on disk layout for served repos is `<service>/<user>/<repo>`
-/// so to get the amount of repos, we just have to count everything
-/// in `*/*/*` to get the count.
 #[instrument]
-pub fn count_repositories<P>(repo_path: P) -> Result<usize>
+pub(crate) fn count_repositories<P>(repo_path: P) -> Result<usize>
 where
     P: AsRef<Path> + std::fmt::Debug,
 {
     trace!("Counting repositories");
     std::fs::create_dir_all(&repo_path)?;
-    Ok(once(read_dir(repo_path)?)
+    Ok(read_dir(repo_path)?
-        .flat_map(sub_directories)
+        .filter_map(StdResult::ok)
-        .flat_map(sub_directories)
+        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        .flat_map(sub_directories)
+        .map(|entry| read_dir(entry.path()))
+        .filter_map(StdResult::ok)
+        .flat_map(|dir| {
+            dir.filter_map(StdResult::ok)
+                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        })
+        .map(|entry| read_dir(entry.path()))
+        .filter_map(StdResult::ok)
+        .flat_map(|dir| {
+            dir.filter_map(StdResult::ok)
+                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        })
         .count())
 }
-
-fn sub_directories(dir: ReadDir) -> impl Iterator<Item = ReadDir> {
-    dir.filter_map(StdResult::ok)
-        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        .filter_map(|entry| read_dir(entry.path()).ok())
-}

src/error.rs

@@ -5,7 +5,7 @@ use std::fmt;
 pub(crate) type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug)]
-pub enum Error {
+pub(crate) enum Error {
     Badge(String),
     Client(reqwest::Error),
     Git(git2::Error),

src/lib.rs

@@ -11,7 +11,7 @@ extern crate tracing;
 
 mod cache;
 pub mod config;
-pub mod count;
+mod count;
 mod error;
 mod service;
 mod statics;
@@ -23,8 +23,8 @@ use crate::{
     config::Settings,
     error::{Error, Result},
     service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
-    statics::{CLIENT, VERSION_INFO},
+    statics::{CLIENT, CSS, FAVICON, VERSION_INFO},
-    template::{RepoGeneratorInfo, RepoInfo},
+    template::RepoInfo,
 };
 use actix_web::{
     dev::Server,
@@ -32,7 +32,7 @@ use actix_web::{
     middleware::{self, TrailingSlash},
     web, App, HttpResponse, HttpServer, Responder,
 };
-use badgers::{Badge, BadgeOptions};
+use badge::{Badge, BadgeOptions};
 use git2::{BranchType, Repository};
 use number_prefix::NumberPrefix;
 use std::{
@@ -46,7 +46,6 @@ use std::{
     sync::atomic::Ordering,
     time::{Duration, SystemTime},
 };
-use templates::statics::{self as template_statics, StaticFile};
 use tracing::Instrument;
 
 include!(concat!(env!("OUT_DIR"), "/templates.rs"));
@@ -56,7 +55,6 @@ struct GeneratorForm<'a> {
     service: FormService,
     user: Cow<'a, str>,
     repo: Cow<'a, str>,
-    branch: Option<Cow<'a, str>>,
 }
 
 #[derive(Debug)]
@@ -118,7 +116,7 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str, branch: &str) -> Result<(u64
         "-M".to_string(),
         "--diff-filter=ACDM".to_string(),
     ];
-    let cache = CacheState::read_from_file(cache_dir, branch, &head)?;
+    let cache = CacheState::read_from_file(&cache_dir, branch, &head)?;
     match &cache {
         CacheState::Current { count, commits, .. } => {
             info!("Using cache");
@@ -210,14 +208,14 @@ where
         info!("Deleting cache and repository");
         let cache_dir = format!("{}/{}.json", &state.cache(), repo);
         let repo_dir = format!("{}/{}", &state.repos(), repo);
-        std::fs::remove_file(cache_dir).or_else(|e| {
+        std::fs::remove_file(&cache_dir).or_else(|e| {
             if e.kind() == io::ErrorKind::NotFound {
                 Ok(())
             } else {
                 Err(e)
             }
         })?;
-        std::fs::remove_dir_all(repo_dir).or_else(|e| {
+        std::fs::remove_dir_all(&repo_dir).or_else(|e| {
             if e.kind() == io::ErrorKind::NotFound {
                 Ok(())
             } else {
@@ -439,23 +437,16 @@ async fn generate(
     state: web::Data<State>,
     repo_count: web::Data<AtomicUsize>,
 ) -> Result<HttpResponse> {
+    let repo = format!("{}/{}", params.user, params.repo);
     let mut buf = Vec::new();
-    let repo_info = RepoGeneratorInfo {
-        service: params.service,
-        user: &params.user,
-        repo: &params.repo,
-        branch: params
-            .branch
-            .as_deref()
-            .filter(|s| !s.is_empty())
-            .unwrap_or("master"),
-    };
     templates::generate(
         &mut buf,
         VERSION_INFO,
         repo_count.load(Ordering::Relaxed),
         &state.settings.base_url,
-        &repo_info,
+        params.service.url(),
+        params.service.service(),
+        &repo,
     )?;
 
     Ok(HttpResponse::Ok().content_type("text/html").body(buf))
@@ -471,32 +462,12 @@ async fn async_p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse>
     p404(repo_count)
 }
 
-/// A duration to add to current time for a far expires header.
+fn css() -> HttpResponse {
-static FAR: Duration = Duration::from_secs(180 * 24 * 60 * 60);
+    HttpResponse::Ok().content_type("text/css").body(CSS)
-
-#[get("/static/{filename}")]
-async fn static_file(
-    path: web::Path<String>,
-    repo_count: web::Data<AtomicUsize>,
-) -> Result<HttpResponse> {
-    StaticFile::get(&path)
-        .map(|data| {
-            let far_expires = SystemTime::now() + FAR;
-            HttpResponse::Ok()
-                .insert_header(Expires(far_expires.into()))
-                .content_type(data.mime.clone())
-                .body(data.content)
-        })
-        .map(Result::Ok)
-        .unwrap_or_else(|| p404(repo_count))
 }
 
-#[get("/favicon.ico")]
+fn favicon32() -> HttpResponse {
-async fn favicon32() -> HttpResponse {
+    HttpResponse::Ok().content_type("image/png").body(FAVICON)
-    let data = &template_statics::favicon32_png;
-    HttpResponse::Ok()
-        .content_type(data.mime.clone())
-        .body(data.content)
 }
 
 async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
@@ -506,21 +477,48 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
         web::Data::new(AtomicUsize::new(count::count_repositories(&settings.repodir).unwrap()));
     let state = web::Data::new(State { settings });
     Ok(HttpServer::new(move || {
-        let app = App::new()
+        App::new()
             .app_data(state.clone())
             .app_data(repo_count.clone())
             .wrap(tracing_actix_web::TracingLogger::default())
             .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
             .service(index)
             .service(health_check)
-            .service(static_file)
+            .service(web::resource("/tacit-css.min.css").route(web::get().to(css)))
-            .service(favicon32)
+            .service(web::resource("/favicon.ico").route(web::get().to(favicon32)))
             .service(generate)
-            .default_service(web::to(async_p404));
+            .service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
-        let app = GitHub::register_service(app);
+            .service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
-        let app = Gitlab::register_service(app);
+            .service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
-        let app = Bitbucket::register_service(app);
+            .service(web::resource("/sourcehut/{user}/{repo}").to(calculate_hoc::<Sourcehut>))
-        Sourcehut::register_service(app)
+            .service(
+                web::resource("/github/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<GitHub>)),
+            )
+            .service(
+                web::resource("/gitlab/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<Gitlab>)),
+            )
+            .service(
+                web::resource("/bitbucket/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<Bitbucket>)),
+            )
+            .service(
+                web::resource("/sourcehut/{user}/{repo}/delete")
+                    .route(web::post().to(delete_repo_and_cache::<Sourcehut>)),
+            )
+            .service(web::resource("/github/{user}/{repo}/json").to(json_hoc::<GitHub>))
+            .service(web::resource("/gitlab/{user}/{repo}/json").to(json_hoc::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}/json").to(json_hoc::<Bitbucket>))
+            .service(web::resource("/sourcehut/{user}/{repo}/json").to(json_hoc::<Sourcehut>))
+            .service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
+            .service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
+            .service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
+            .service(web::resource("/github/{user}/{repo}/view").to(overview::<GitHub>))
+            .service(web::resource("/gitlab/{user}/{repo}/view").to(overview::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}/view").to(overview::<Bitbucket>))
+            .service(web::resource("/sourcehut/{user}/{repo}/view").to(overview::<Sourcehut>))
+            .default_service(web::to(async_p404))
     })
     .workers(workers)
     .listen(listener)?

src/main.rs

@@ -3,7 +3,7 @@ use hoc::{config::Settings, telemetry};
 use std::net::TcpListener;
 
 fn init() {
-    dotenvy::dotenv().ok();
+    dotenv::dotenv().ok();
     openssl_probe::init_ssl_cert_env_vars();
 
     telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))

src/service.rs

@@ -1,35 +1,11 @@
-use crate::{calculate_hoc, delete_repo_and_cache, json_hoc, overview};
+pub(crate) trait Service {
-
-use actix_web::{
-    dev::{ServiceFactory, ServiceRequest},
-    web, App,
-};
-
-pub(crate) trait Service: Sized + 'static {
     fn domain() -> &'static str;
     fn url_path() -> &'static str;
     fn commit_url(repo: &str, commit_ref: &str) -> String;
-
-    fn register_service<T>(app: App<T>) -> App<T>
-    where
-        T: ServiceFactory<ServiceRequest, Config = (), Error = actix_web::Error, InitError = ()>,
-    {
-        let url_path = Self::url_path();
-        app.service(
-            web::resource(format!("/{url_path}/{{user}}/{{repo}}")).to(calculate_hoc::<Self>),
-        )
-        .service(
-            web::resource(format!("/{url_path}/{{user}}/{{repo}}/delete"))
-                .route(web::post().to(delete_repo_and_cache::<Self>)),
-        )
-        .service(web::resource(format!("/{url_path}/{{user}}/{{repo}}/json")).to(json_hoc::<Self>))
-        .service(web::resource(format!("/view/{url_path}/{{user}}/{{repo}}")).to(overview::<Self>))
-        .service(web::resource(format!("/{url_path}/{{user}}/{{repo}}/view")).to(overview::<Self>))
-    }
 }
 
-#[derive(Deserialize, Serialize, Clone, Copy)]
+#[derive(Deserialize, Serialize)]
-pub enum FormService {
+pub(crate) enum FormService {
     #[serde(rename = "github")]
     GitHub,
     #[serde(rename = "gitlab")]

src/statics.rs

@@ -7,6 +7,8 @@ pub(crate) const VERSION_INFO: VersionInfo = VersionInfo {
     commit: env!("VERGEN_GIT_SHA_SHORT"),
     version: env!("CARGO_PKG_VERSION"),
 };
+pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");
+pub(crate) const FAVICON: &[u8] = include_bytes!("../static/favicon32.png");
 
 lazy_static! {
     pub(crate) static ref CLIENT: reqwest::Client = reqwest::Client::new();

src/template.rs

@@ -1,5 +1,3 @@
-use crate::service::FormService;
-
 pub struct RepoInfo<'a> {
     pub commit_url: &'a str,
     pub commits: u64,
@@ -11,10 +9,3 @@ pub struct RepoInfo<'a> {
     pub url: &'a str,
     pub branch: &'a str,
 }
-
-pub struct RepoGeneratorInfo<'a> {
-    pub service: FormService,
-    pub user: &'a str,
-    pub repo: &'a str,
-    pub branch: &'a str,
-}

templates/base.rs.html

@@ -1,4 +1,3 @@
-@use super::statics::*;
 @use crate::statics::VersionInfo;
 
 @(title: &str, header: &str, content: Content, version_info: VersionInfo, repo_count: usize)
@@ -10,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="keywords" content="Hits-of-Code, GitHub, Badge" />
     <meta name="description" content="Hits-of-Code Badges for Git repositories" />
-    <link rel="stylesheet" href="/static/@tacit_css_min_css.name" />
+    <link rel="stylesheet" href="/tacit-css.min.css" />
     <title>@title</title>
 </head>
 <body>

templates/generate.rs.html

@@ -1,16 +1,16 @@
 @use super::base;
-@use crate::{statics::VersionInfo, template::RepoGeneratorInfo};
+@use crate::statics::VersionInfo;
 
-@(version_info: VersionInfo, repo_count: usize, base_url: &str, repo_info: &RepoGeneratorInfo)
+@(version_info: VersionInfo, repo_count: usize, base_url: &str, url: &str, service: &str, path: &str)
 
 @:base("Hits-of-Code Badges", "Badge Generator", {
 
 <p>
-Here is the markdown for the badge for <a href="https://@repo_info.service.url()/@repo_info.user/@repo_info.repo">@repo_info.user/@repo_info.repo</a>
+Here is the markdown for the badge for <a href="https://@url/@path">@url/@path</a>
 </p>
 
 <pre>
-[![Hits-of-Code](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch)](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch)
+[![Hits-of-Code](@base_url/@service/@path)](@base_url/@service/@path/view)
 </pre>
 
 <p>
@@ -18,6 +18,6 @@ It will be rendered like this
 </p>
 
 <pre>
-<a href="@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch"><img src="@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch" alt="example badge" /></a>
+<a href="@base_url/@service/@path/view"><img src="@base_url/@service/@path" alt="example badge" /></a>
 </pre>
 }, version_info, repo_count)

templates/index.rs.html

@@ -80,8 +80,6 @@ the lines of
     <input name="user" id="user" type="text" placeholder="user" />
     <label>/</label>
     <input name="repo" id="repo" type="text" placeholder="repository" />
-    <label>:</label>
-    <input name="branch" id="branch" type="text" placeholder="branch (defaults to `master`)" />
     <button type="submit">Generate</button>
 </form>
 

tests/count.rs

@@ -1,66 +0,0 @@
-use hoc::count::count_repositories;
-
-use tempfile::TempDir;
-
-#[test]
-fn no_repos() {
-    let repos = TempDir::new().unwrap();
-    assert_eq!(0, count_repositories(&repos).unwrap())
-}
-
-#[test]
-fn no_repos_for_provider() {
-    let repos = TempDir::new().unwrap();
-    let _provider = TempDir::new_in(&repos).unwrap();
-    assert_eq!(0, count_repositories(&repos).unwrap())
-}
-
-#[test]
-fn no_repos_for_owner() {
-    let repos = TempDir::new().unwrap();
-    let provider = TempDir::new_in(&repos).unwrap();
-    let _owner = TempDir::new_in(&provider).unwrap();
-    assert_eq!(0, count_repositories(&repos).unwrap())
-}
-
-#[test]
-fn one_repo_for_owner() {
-    let repos = TempDir::new().unwrap();
-    let provider = TempDir::new_in(&repos).unwrap();
-    let owner = TempDir::new_in(&provider).unwrap();
-    let _repo = TempDir::new_in(&owner).unwrap();
-    assert_eq!(1, count_repositories(&repos).unwrap())
-}
-
-#[test]
-fn two_repos_for_owner() {
-    let repos = TempDir::new().unwrap();
-    let provider = TempDir::new_in(&repos).unwrap();
-    let owner = TempDir::new_in(&provider).unwrap();
-    let _repo1 = TempDir::new_in(&owner).unwrap();
-    let _repo2 = TempDir::new_in(&owner).unwrap();
-    assert_eq!(2, count_repositories(&repos).unwrap())
-}
-
-#[test]
-fn two_repos_for_two_providers() {
-    let repos = TempDir::new().unwrap();
-    let provider1 = TempDir::new_in(&repos).unwrap();
-    let owner1 = TempDir::new_in(&provider1).unwrap();
-    let _repo1 = TempDir::new_in(&owner1).unwrap();
-    let provider2 = TempDir::new_in(&repos).unwrap();
-    let owner2 = TempDir::new_in(&provider2).unwrap();
-    let _repo2 = TempDir::new_in(&owner2).unwrap();
-    assert_eq!(2, count_repositories(&repos).unwrap())
-}
-
-#[test]
-fn two_subdirs_in_one_repo() {
-    let repos = TempDir::new().unwrap();
-    let provider = TempDir::new_in(&repos).unwrap();
-    let owner = TempDir::new_in(&provider).unwrap();
-    let repo = TempDir::new_in(&owner).unwrap();
-    let _subdir1 = TempDir::new_in(&repo).unwrap();
-    let _subdir2 = TempDir::new_in(&repo).unwrap();
-    assert_eq!(1, count_repositories(&repos).unwrap())
-}

tests/resources.rs

@@ -1,16 +0,0 @@
-mod util;
-
-#[actix_rt::test]
-async fn favicon() {
-    let test_app = util::spawn_app().await;
-
-    let client = awc::Client::default();
-
-    let response = client
-        .get(&format!("{}/favicon.ico", test_app.address))
-        .send()
-        .await
-        .expect("Failed to execute request");
-
-    assert!(response.status().is_success());
-}

tests/util/mod.rs

@@ -14,9 +14,8 @@ lazy_static::lazy_static! {
 
 pub struct TestApp {
     pub address: String,
-    // Those are unused but are hold to be dropped and deleted after the TestApp goes out of scope
+    repo_dir: TempDir,
-    _repo_dir: TempDir,
+    cache_dir: TempDir,
-    _cache_dir: TempDir,
 }
 
 pub async fn spawn_app() -> TestApp {
@@ -27,12 +26,15 @@ pub async fn spawn_app() -> TestApp {
     let port = listener.local_addr().unwrap().port();
     let address = format!("http://127.0.0.1:{}", port);
 
-    let _repo_dir = tempdir().expect("Cannot create repo_dir");
+    let repo_dir = tempdir().expect("Cannot create repo_dir");
-    let _cache_dir = tempdir().expect("Cannot create cache_dir");
+    let cache_dir = tempdir().expect("Cannot create cache_dir");
 
     let mut settings = Settings::load().expect("Failed to read configuration.");
-    settings.repodir = _repo_dir.path().to_path_buf();
+    settings.repodir = repo_dir.path().to_path_buf();
-    settings.cachedir = _cache_dir.path().to_path_buf();
+    settings.cachedir = cache_dir.path().to_path_buf();
+    // configuration.database.database_name = Uuid::new_v4().to_string();
+
+    // let connection_pool = configure_database(&configuration.database).await;
 
     let server = hoc::run(listener, settings)
         .await
@@ -42,7 +44,7 @@ pub async fn spawn_app() -> TestApp {
 
     TestApp {
         address,
-        _repo_dir,
+        repo_dir,
-        _cache_dir,
+        cache_dir,
     }
 }

vm.nix

@@ -0,0 +1,80 @@
+# Nix configuration for a VM to run a custom configured Vim
+#
+# It is intended as an example of building a VM that builds Vim for testing
+# and evaluation purposes. It does not represent a production or secure
+# deployment.
+
+{ sources ? import ./nix/sources.nix
+, pkgs ? import sources.nixpkgs { }
+, callPackage ? pkgs.callPackage
+, config
+, lib
+, ...
+}:
+  # config, pkgs, lib, ... }:
+
+let
+  hoc = pkgs.callPackage ./default.nix { };
+
+  # hoc = cargoNix.rootCrate.build;
+in
+{
+  environment = {
+    systemPackages = with pkgs; [
+      (
+        hoc
+        # import ./default.nix
+      )
+    ];
+  };
+
+
+  networking.hostName = "hoc";   # Define your hostname.
+
+  system.stateVersion = "19.09";    # The version of NixOS originally installed
+
+  # Set security options:
+  security = {
+    sudo = {
+      enable = true;                # Enable sudo
+      wheelNeedsPassword = false;   # Allow wheel members to run sudo without a passowrd
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [ 80 ];
+
+  # List services that you want to enable:
+  services.openssh = {
+    enable = true;                             # Enable the OpenSSH daemon.
+    #permitRootLogin = "yes";                  # Probably want to change this in production
+    #challengeResponseAuthentication = true;   # Probably want to change this in production
+    #passwordAuthentication = true;            # Probably want to change this in production
+    openFirewall = true;
+    hostKeys = [
+      {
+        path = "/etc/ssh/ssh_host_ed25519_key";   # Generate a key for the vm
+        type = "ed25519";                         # Use the current best key type
+      }
+    ];
+  };
+
+  # Users of the Vim VM:
+  users.mutableUsers = false;        # Remove any users not defined in here
+
+  users.users.root = {
+    password = "123456";             # Probably want to change this in production
+  };
+
+  # Misc groups:
+  users.groups.nixos.gid = 1000;
+
+  # NixOS users
+  users.users.nixos = {
+    isNormalUser = true;
+    uid = 1000;
+    group = "nixos";
+    extraGroups = [ "wheel" ];
+    password = "123456";             # Probably want to change this in production
+  };
+
+}