From 7976a8c9ec75a995a0ef47931a65f51c16dd85b2 Mon Sep 17 00:00:00 2001 From: Bun Date: Wed, 30 Apr 2025 00:25:08 -0400 Subject: [PATCH] Update flake.lock --- flake.lock | 42 +++++++++---------- hosts/midas/services/default.nix | 1 - modules/system/services/server/default.nix | 1 - .../services/server/trilium/default.nix | 14 ------- .../services/server/trilium/nginx/default.nix | 11 ----- 5 files changed, 21 insertions(+), 48 deletions(-) delete mode 100644 modules/system/services/server/trilium/default.nix delete mode 100644 modules/system/services/server/trilium/nginx/default.nix diff --git a/flake.lock b/flake.lock index a3867eb5..90e059ac 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1745224732, - "narHash": "sha256-0OWgbEKhpMLpk3WQi3ugOwxWW4Y6JVpKiQ+o0nuNzus=", + "lastModified": 1745812220, + "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", "owner": "nix-community", "repo": "disko", - "rev": "1770bf1ae5da05564f86b969ef21c7228cc1a70b", + "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", "type": "github" }, "original": { @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -266,11 +266,11 @@ ] }, "locked": { - "lastModified": 1745389204, - "narHash": "sha256-gGP+nJ513TrZVL3gbri6iJgMUnNwQz+ntGQE/T5H5rs=", + "lastModified": 1745487384, + "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "25ef314fdbff45e1ec790416f1ddb030bcd2af61", + "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1745287043, - "narHash": "sha256-y8DH++s3Zt9LDCRDp7+tehFaeLs4WXRxnR3lFC5qbuY=", + "lastModified": 1745978367, + "narHash": "sha256-sBBdYbDTM8cZknj+3wwb05xOx/Di2cCtu/XQqz4U6u4=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "9c4b4690ea3a1f7233e7f9d3bdfa88e464f77d57", + "rev": "e5d5c68e28c3d2f03110f316be380bf90d5a54b7", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745353885, - "narHash": "sha256-pPO6GlommUHHbjIilUCBeZdHI4SUyGfTJFBrT6rKhfk=", + "lastModified": 1745985483, + "narHash": "sha256-XyNOPt8aXO9PIsCYlWE+3ESQh6az5/x5R28Bg8tOFf8=", "owner": "nix-community", "repo": "NUR", - "rev": "8bb84605f2d228a466a10b97fa8aa2dc2995cd7d", + "rev": "0f15df49e568d98995e0e8f9cf048ce36722409f", "type": "github" }, "original": { @@ -525,11 +525,11 @@ }, "stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745868005, + "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "330d0a4167924b43f31cc9406df363f71b768a02", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "unstable": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix index 62d64889..683391b3 100644 --- a/hosts/midas/services/default.nix +++ b/hosts/midas/services/default.nix @@ -14,7 +14,6 @@ nginx.enable = true; owncast.enable = true; transmission.enable = true; - trilium-server.enable = true; vaultwarden.enable = true; webserver.enable = true; diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix index ec51d8b1..6e2a762f 100644 --- a/modules/system/services/server/default.nix +++ b/modules/system/services/server/default.nix @@ -16,7 +16,6 @@ ./nginx ./owncast ./transmission - ./trilium ./vaultwarden ]; } diff --git a/modules/system/services/server/trilium/default.nix b/modules/system/services/server/trilium/default.nix deleted file mode 100644 index 0031d005..00000000 --- a/modules/system/services/server/trilium/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - imports = [ ./nginx ]; - - config = lib.mkIf config.services.transmission.enable { - services.trilium-server = { - package = pkgs.trilium-next-server; - instanceName = "NixFox Notes"; - port = 8012; - noBackup = true; - }; - environment.persistence."/persist".directories = [ "/var/lib/trilium" ]; - }; -} diff --git a/modules/system/services/server/trilium/nginx/default.nix b/modules/system/services/server/trilium/nginx/default.nix deleted file mode 100644 index b5e3a156..00000000 --- a/modules/system/services/server/trilium/nginx/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, ... }: -{ - services.nginx.virtualHosts."notes.nixfox.ca" = lib.mkIf config.services.vaultwarden.enable { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8012"; - proxyWebsockets = true; - }; - }; -}