diff --git a/flake.lock b/flake.lock index 3427827..05b55b5 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1735895235, - "narHash": "sha256-MtsfkMikkPjnZUMqsqXQ29cHzlRD2lMe27jXua28cHU=", + "lastModified": 1735634086, + "narHash": "sha256-DTcB/kBZULyJztXXnH3OVF5LHLl+O670DuLZZNUMnNo=", "owner": "catppuccin", "repo": "nix", - "rev": "b326f48f17023fc0060590ba299d55f7da8350a5", + "rev": "63290ea1d2a28e65195017ed78a81cfc242ef0df", "type": "github" }, "original": { @@ -156,11 +156,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1735895739, - "narHash": "sha256-TBhp9fnocT3QTjcXO6RZlxrmY1lUN34rDptMNM6gOfA=", + "lastModified": 1735809468, + "narHash": "sha256-ahutc7YYOSqOPPkzyWLYjPJ//TsPHm3u/u82VDfzPKg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f056a3b82aa523aa3b3a033fe8ffe77d29461079", + "rev": "d467023596c548b43277215365020906697c00a2", "type": "github" }, "original": { @@ -412,14 +412,15 @@ "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -582,11 +583,11 @@ ] }, "locked": { - "lastModified": 1735900408, - "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -1039,6 +1040,22 @@ "type": "github" } }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1682134069, @@ -1266,7 +1283,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1731363552, @@ -1517,11 +1534,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1735827994, + "narHash": "sha256-Y3IBRGmza5YKiHgNwEbVQkETQPir+lrJj4ErbVHktO0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "246639a1ec081bb40941a25e9eb8481a66d71b49", "type": "github" }, "original": { diff --git a/hmModules/tremotesf/default.nix b/hmModules/tremotesf/default.nix index f1959c4..4078e06 100644 --- a/hmModules/tremotesf/default.nix +++ b/hmModules/tremotesf/default.nix @@ -16,10 +16,7 @@ }; Service = { - ExecStart = pkgs.writeShellScript "start-tremotesf.sh" '' - sleep 5 - ${lib.getExe pkgs.tremotesf} --minimized - ''; + ExecStart = "${lib.getExe' pkgs.coreutils "sleep"} 5 && ${lib.getExe pkgs.tremotesf} --minimized"; Restart = "on-failure"; RestartSec = 3; }; diff --git a/modules/paperless/default.nix b/modules/paperless/default.nix index e1e01fb..4918ed7 100644 --- a/modules/paperless/default.nix +++ b/modules/paperless/default.nix @@ -22,17 +22,4 @@ environment.persistence."/persist".directories = [ config.services.paperless.dataDir ]; - - imports = [ ../nginx-base ]; - - services.nginx.virtualHosts."paper.aciceri.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${builtins.toString config.services.paperless.port}"; - }; - extraConfig = '' - client_max_body_size 50000M; - ''; - }; } diff --git a/modules/sisko-proxy/default.nix b/modules/sisko-proxy/default.nix index 353af1b..c6c1a7b 100644 --- a/modules/sisko-proxy/default.nix +++ b/modules/sisko-proxy/default.nix @@ -47,6 +47,13 @@ proxyWebsockets = true; }; }; + "paper.aciceri.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${builtins.toString config.services.paperless.port}"; + }; + }; # "${config.services.nextcloud.hostName}" = { # forceSSL = true; # enableACME = true;