diff --git a/flake.lock b/flake.lock index 6365ce8..6dfb0e4 100644 --- a/flake.lock +++ b/flake.lock @@ -283,6 +283,18 @@ "url": "https://github.com/NixOS/nixpkgs/pull/347353.diff" } }, + "nixpkgs-memos": { + "flake": false, + "locked": { + "narHash": "sha256-UidUaQY+9vo90rNCVInX1E+JbJ1xKFVSTMNRYKQEKpQ=", + "type": "file", + "url": "https://github.com/NixOS/nixpkgs/pull/426687.diff" + }, + "original": { + "type": "file", + "url": "https://github.com/NixOS/nixpkgs/pull/426687.diff" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -295,6 +307,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-linkwarden": "nixpkgs-linkwarden", + "nixpkgs-memos": "nixpkgs-memos", "simple-nixos-mailserver": "simple-nixos-mailserver", "systems": "systems" } diff --git a/flake.nix b/flake.nix index 6e6f6cb..a04ce01 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,10 @@ url = "https://github.com/NixOS/nixpkgs/pull/347353.diff"; flake = false; }; + nixpkgs-memos = { + url = "https://github.com/NixOS/nixpkgs/pull/426687.diff"; + flake = false; + }; # Common Utils Among flake inputs systems.url = "github:nix-systems/default"; @@ -129,6 +133,7 @@ # despite me following guides and examples specific to rust packages. ./patches/librespot-pin.patch inputs.nixpkgs-linkwarden + inputs.nixpkgs-memos ]; }; patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; }); diff --git a/machines/storage/s0/default.nix b/machines/storage/s0/default.nix index 57272e1..bc58395 100644 --- a/machines/storage/s0/default.nix +++ b/machines/storage/s0/default.nix @@ -252,6 +252,7 @@ (mkVirtualHost "todo.s0.neet.dev" "http://localhost:${toString config.services.vikunja.port}") (mkVirtualHost "budget.s0.neet.dev" "http://localhost:${toString config.services.actual.settings.port}") # actual budget (mkVirtualHost "linkwarden.s0.neet.dev" "http://localhost:${toString config.services.linkwarden.port}") + (mkVirtualHost "memos.s0.neet.dev" "http://localhost:${toString config.services.memos.port}") ]; tailscaleAuth = { @@ -274,6 +275,7 @@ "todo.s0.neet.dev" "budget.s0.neet.dev" "linkwarden.s0.neet.dev" + # "memos.s0.neet.dev" # messes up memos /auth route ]; expectedTailnet = "koi-bebop.ts.net"; }; @@ -343,5 +345,11 @@ port = 48072; }; + services.memos = { + enable = true; + address = "127.0.0.1"; + port = 57643; + }; + boot.binfmt.emulatedSystems = [ "aarch64-linux" "armv7l-linux" ]; }