From 0bbea5954ccd625e8383ccd60490d0ac1bb4eac8 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 28 Jul 2022 12:36:55 +0200 Subject: [PATCH] pre-commit synapse --- flake.lock | 30 +++++++++++++------------- hosts.nix | 6 ++++++ nixos/hosts/bastion/configuration.nix | 4 ++++ nixos/hosts/hedgedoc/configuration.nix | 6 +++--- nixos/hosts/synapse/configuration.nix | 24 +++++++++++++++++++++ 5 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 nixos/hosts/synapse/configuration.nix diff --git a/flake.lock b/flake.lock index 876e5cf..954eac3 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1656722469, - "narHash": "sha256-NGSX4B4hQzJcNGMZU4FO+V7AZiJHWGNR5PqwJvOSIyI=", + "lastModified": 1658094154, + "narHash": "sha256-9g9hZ27VxPDqOM+v+JUVV5XkYCjnu7yWrOPV/zIgBYA=", "owner": "zhaofengli", "repo": "colmena", - "rev": "fbf25faa241edf4b2285eefe383770ef0851e443", + "rev": "5d2f12851596678316ed1f0b53ff1ec624d5ebac", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1656727679, - "narHash": "sha256-Bx4/yN/tYpWxdjq0Sed8O2SOcwRKA6c0ZAERgF51GbI=", + "lastModified": 1658982026, + "narHash": "sha256-P5SjpQsfmLWKqmFUewkYgW3vd7UW5gBtatw2ZYJ3+N4=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "434a0cadd7195cedd0e26fb606980c4f586cb70b", + "rev": "30a8e061a1cd578dae6f54172d6932dfb075e765", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656461576, - "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", + "lastModified": 1658826464, + "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c", + "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1655492394, - "narHash": "sha256-bmiET3gLIv6T3+jPJi0hm9GurjwrddlmtuxTpFDYJZw=", + "lastModified": 1657869996, + "narHash": "sha256-RWgKXjdAm+kpk45uKnJMcjNcxzmLyRbg5XAH7aLEruU=", "owner": "serokell", "repo": "serokell.nix", - "rev": "ca5235bd249a64991d2e813084aea5d521ca0088", + "rev": "599cef82b41643f529a23e5be3955f567c979ec0", "type": "github" }, "original": { @@ -389,11 +389,11 @@ "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1652704544, - "narHash": "sha256-UTKE33tYgCmDszaVyWA33a8mtegM5xfH4fH8w4y6TxA=", + "lastModified": 1657226504, + "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "f8d6d1f87b6177e3bc674c29f247bdbf897ba274", + "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", "type": "github" }, "original": { diff --git a/hosts.nix b/hosts.nix index a4d23b3..196efae 100644 --- a/hosts.nix +++ b/hosts.nix @@ -126,6 +126,12 @@ ip = "10.42.42.26"; mac = "CE:6E:96:87:18:1B"; } + { + hostname = "bookwyrm"; + ip = "10.42.42.27"; + mac = "9E:8A:6C:39:27:DE"; + nix = false; + } { hostname = "nuc"; ip = "10.42.42.42"; diff --git a/nixos/hosts/bastion/configuration.nix b/nixos/hosts/bastion/configuration.nix index ce4b96c..c26cc8f 100644 --- a/nixos/hosts/bastion/configuration.nix +++ b/nixos/hosts/bastion/configuration.nix @@ -6,9 +6,13 @@ let fix-vscode = pkgs.writeScriptBin "fix-vscode" '' #!${pkgs.stdenv.shell} + # Check if vscode-server dir exists if [[ -d "$HOME/.vscode-server/bin" ]]; then + # For every bin folder within for versiondir in "$HOME"/.vscode-server/bin/*; do + # Remove bundled node (dynamic links are borked for nix) rm "$versiondir/node" + # symlink node form the nixpkg ln -s "${pkgs.nodejs-16_x}/bin/node" "$versiondir/node" done fi diff --git a/nixos/hosts/hedgedoc/configuration.nix b/nixos/hosts/hedgedoc/configuration.nix index c3d0429..dbb8dd3 100644 --- a/nixos/hosts/hedgedoc/configuration.nix +++ b/nixos/hosts/hedgedoc/configuration.nix @@ -26,7 +26,7 @@ in environment.noXlibs = lib.mkForce false; - networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.configuration.port ]; + networking.firewall.allowedTCPPorts = [ config.services.hedgedoc.settings.port ]; vault-secrets.secrets.hedgedoc = { }; @@ -46,7 +46,7 @@ in services.hedgedoc = { enable = true; environmentFile = "${vs.hedgedoc}/environment"; - configuration = { + settings = { host = "0.0.0.0"; port = 3000; sessionSecret = "$SESSION_SECRET"; @@ -54,7 +54,7 @@ in protocolUseSSL = true; hsts.enable = true; allowOrigin = [ - config.services.hedgedoc.configuration.domain + config.services.hedgedoc.settings.domain "hedgedoc" ]; allowAnonymous = false; diff --git a/nixos/hosts/synapse/configuration.nix b/nixos/hosts/synapse/configuration.nix new file mode 100644 index 0000000..0d25540 --- /dev/null +++ b/nixos/hosts/synapse/configuration.nix @@ -0,0 +1,24 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = [ ]; + + networking.hostName = "synapse"; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.11"; # Did you read the comment? + + # Additional packages + environment.systemPackages = with pkgs; [ ]; + + networking.firewall.allowedTCPPorts = [ ]; +}