diff --git a/programs/installed.nix b/programs/installed.nix index 227c0b4..cae900e 100644 --- a/programs/installed.nix +++ b/programs/installed.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - wget curl vim nano zsh fzf tmux + wget curl vim nano zsh fzf tmux nextcloud ]; imports = diff --git a/services/nextcloud.nix b/services/nextcloud.nix index c28b670..ffe3779 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -1,10 +1,13 @@ { config, pkgs, ... }: { + + environment.systemPackages = with pkgs; [ nextcloud ]; + services.nginx.virtualHosts."cloud.stubbe.rocks" = { enableACME = true; forceSSL = true; - root = /etc/per-user-pkgs/nextcloud; + root = pkgs.nextcloud; extraConfig = '' # Add headers to serve security related headers # Before enabling Strict-Transport-Security headers please read into this @@ -138,5 +141,5 @@ ''; }; - services.nginx.upstreams.php-handler.servers = ["unix:/run/php-fpm/php-fpm.sock"]; +# services.nginx.upstreams.php-handler.servers = ["unix:/run/php-fpm/php-fpm.sock"]; } diff --git a/users.nix b/users.nix index d7c38ac..dafb7c2 100644 --- a/users.nix +++ b/users.nix @@ -13,6 +13,6 @@ in defaultUserShell = pkgs.zsh; extraUsers.sshuser = myPublicSshKeys // { isNormalUser = true; home = "/home/sshuser";}; extraUsers.nextcloud = myPublicSshKeys // { isNormalUser = true; home = "/home/nextcloud"; group = "nextcloud";}; - extraGroups.nexdcloud.name = "nextcloud"; + extraGroups.nexdcloud.name = "nextcloud"; }; }