From 623dd63fec1dcb9eacfbc6dbc115ee95cc1ed22f Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sun, 11 Feb 2024 21:21:25 -0500 Subject: [PATCH] Setup OwnTracks frontend and recorder --- flake.lock | 50 +++++++++---------- modules/hosts/nixos/hetznix01/default.nix | 5 +- .../system/common/containers/owntracks.nix | 13 +++++ 3 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 modules/system/common/containers/owntracks.nix diff --git a/flake.lock b/flake.lock index 89a8463..19cce04 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1706261939, - "narHash": "sha256-KQ3Hb3XVSrxOLfiY2D63QD5+LsLwFeY81ZScD4GRp0o=", + "lastModified": 1707385478, + "narHash": "sha256-xwKXoBeiwfp+jqQxt3O0mUxrBXsNfdBn15teMMWbw0U=", "owner": "nix-community", "repo": "disko", - "rev": "c12719812dde4dcbc4119a2b09766a51c9c498d5", + "rev": "15b52c3c8a718253e66f1b92f595dc47873fdfea", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1705659542, - "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1705915768, - "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", + "lastModified": 1706833576, + "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", + "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1706131725, - "narHash": "sha256-HK/maOUUo+4tKL06VSV5szJXTtc7QqcO9F5c0FGi2F8=", + "lastModified": 1707425163, + "narHash": "sha256-nyYw2wwup5wDlZFpXKSZgqNYYnD1gh4q1SUkIb3tRP4=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "dfa162fab581ba293f5faa866e91c553b78a01aa", + "rev": "35122edb29aa12687fc706aca6145868276221e7", "type": "github" }, "original": { @@ -181,27 +181,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1707391491, + "narHash": "sha256-TyDXcq8Z3slMNeyeF+ke0BzISWuM6NrBklr7XyiRbZA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "bc6cb3d59b7aab88e967264254f8c1aa4c0284e9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706287586, - "narHash": "sha256-Hf3QdV2ZeI9MgDNGY3dulFXIU3G+OKp5hL71gQb/nQA=", + "lastModified": 1707505795, + "narHash": "sha256-MGAyxJY1Zo38EuqPoOA/93541/Thxc1IREm0k8/kLqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "205d4e308a7257e3004e384ac9006f1df003a95e", + "rev": "cd9da0019053437d574e060dc2d8fd6c5adbad29", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1706130372, - "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=", + "lastModified": 1707397511, + "narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=", "owner": "mic92", "repo": "sops-nix", - "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68", + "rev": "2168851d58595431ee11ebfc3a49d60d318b7312", "type": "github" }, "original": { diff --git a/modules/hosts/nixos/hetznix01/default.nix b/modules/hosts/nixos/hetznix01/default.nix index 292d6a4..267f51e 100644 --- a/modules/hosts/nixos/hetznix01/default.nix +++ b/modules/hosts/nixos/hetznix01/default.nix @@ -2,8 +2,11 @@ imports = [ ./hardware-configuration.nix ./disk-config.nix + ../../../system/common/containers/owntracks.nix ]; + system.stateVersion = "23.11"; + boot.loader.grub = { # no need to set devices, disko will add all devices that have a EF02 partition to the list already # devices = [ ]; @@ -11,8 +14,6 @@ efiInstallAsRemovable = true; }; - system.stateVersion = "23.11"; - networking = { # Open ports in the firewall. firewall.allowedTCPPorts = [ 22 ]; diff --git a/modules/system/common/containers/owntracks.nix b/modules/system/common/containers/owntracks.nix new file mode 100644 index 0000000..58d475f --- /dev/null +++ b/modules/system/common/containers/owntracks.nix @@ -0,0 +1,13 @@ +{ ... }: { + # Ideas from https://madison-technologies.com/take-your-nixos-container-config-and-shove-it/ + virtualisation.oci-containers.containers = { + # See https://github.com/owntracks/frontend + ot-frontend = { + image = "owntracks/frontend"; + }; + # See https://github.com/owntracks/docker-recorder + ot-recorder = { + image = "owntracks/recorder"; + }; + }; +}