From e77d72e6ca20e26e5b8db1262cc38ee7e17e487e Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 20 May 2023 22:31:36 +0200
Subject: [PATCH] add trilium to technology stack

---
 flake.nix                                    | 1 +
 nixos/components/network/tinc/private.nix    | 2 ++
 nixos/machines/chungus/hass.nix              | 3 +++
 nixos/machines/chungus/network-wireguard.nix | 2 +-
 nixos/machines/chungus/trilium.nix           | 3 ++-
 nixos/machines/cream/packages.nix            | 2 +-
 nixos/system/all/packages.nix                | 2 ++
 nixos/system/desktop/packages.nix            | 2 ++
 8 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2e6210c..3d5cee2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -152,6 +152,7 @@
                   legacy = nixpkgs-legacy.legacyPackages.${pkgs.system};
                   polygon-art = polygon-art.packages.${pkgs.system};
                   landingpage = landingpage.packages.${pkgs.system}.plain;
+                  trilium-server = nixpkgs-unstable.legacyPackages.${pkgs.system}.trilium-server;
                 })
               ];
             };
diff --git a/nixos/components/network/tinc/private.nix b/nixos/components/network/tinc/private.nix
index bd88fa2..5a618ae 100644
--- a/nixos/components/network/tinc/private.nix
+++ b/nixos/components/network/tinc/private.nix
@@ -39,6 +39,8 @@ let
     "tdarr.chungus" = hosts.chungus;
     "trilium.chungus" = hosts.chungus;
     "tts.chungus" = hosts.chungus;
+    # cream
+    "trilium.cream" = hosts.cream;
   };
   network = "private";
 in
diff --git a/nixos/machines/chungus/hass.nix b/nixos/machines/chungus/hass.nix
index 0397905..fc91de5 100644
--- a/nixos/machines/chungus/hass.nix
+++ b/nixos/machines/chungus/hass.nix
@@ -13,4 +13,7 @@
   networking.firewall.allowedTCPPorts = [ 8123 ];
   networking.firewall.allowedUDPPorts = [ 8123 ];
 
+  networking.firewall.interfaces.wg0.allowedTCPPorts = [ 8123 ];
+  networking.firewall.interfaces.wg0.allowedUDPPorts = [ 8123 ];
+
 }
diff --git a/nixos/machines/chungus/network-wireguard.nix b/nixos/machines/chungus/network-wireguard.nix
index 982f8ec..7d20cee 100644
--- a/nixos/machines/chungus/network-wireguard.nix
+++ b/nixos/machines/chungus/network-wireguard.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ... }:
 {
-  networking.firewall.trustedInterfaces = [ "wg0" ];
+  # networking.firewall.trustedInterfaces = [ "wg0" ];
   networking.firewall.allowedUDPPorts = [ 51820 ];
   sops.secrets.wireguard_private = { };
 
diff --git a/nixos/machines/chungus/trilium.nix b/nixos/machines/chungus/trilium.nix
index 6c70c12..d7747df 100644
--- a/nixos/machines/chungus/trilium.nix
+++ b/nixos/machines/chungus/trilium.nix
@@ -1,5 +1,6 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
+
   services.trilium-server = {
     enable = true;
     dataDir = "/srv/trilium";
diff --git a/nixos/machines/cream/packages.nix b/nixos/machines/cream/packages.nix
index f8727a2..51c1947 100644
--- a/nixos/machines/cream/packages.nix
+++ b/nixos/machines/cream/packages.nix
@@ -104,7 +104,7 @@ in
     steam-run
 
     bitwarden
-    trilium-desktop
+    unstable.trilium-desktop
     nginx-config-formatter
 
     sensu-go-cli
diff --git a/nixos/system/all/packages.nix b/nixos/system/all/packages.nix
index 7dd9afd..f98fcae 100644
--- a/nixos/system/all/packages.nix
+++ b/nixos/system/all/packages.nix
@@ -89,6 +89,8 @@ in
     tmux
     screen
 
+    tcpdump
+
     duc
 
     memoryUsage
diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix
index 6a0deac..51bebeb 100644
--- a/nixos/system/desktop/packages.nix
+++ b/nixos/system/desktop/packages.nix
@@ -329,6 +329,8 @@ in
       pkgconf
       cairo
 
+      wireshark
+
     ] ++ (map pandocScript (lib.cartesianProductOfSets {
       inputFormat = [ "man" "markdown" "mediawiki" ];
       outputFormat = [ "mediawiki" "docbook5" "html5" "man" "jira" "markdown" ];