diff --git a/programs/zsh.nix b/programs/zsh.nix index b4a40fb..6930310 100644 --- a/programs/zsh.nix +++ b/programs/zsh.nix @@ -1,19 +1,11 @@ { config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - zsh-git-prompt - ]; - - programs.zsh = { enable = true; autosuggestions.enable = true; enableCompletion = true; syntaxHighlighting.enable = true; - interactiveShellInit = '' - source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh - ''; }; diff --git a/services/enabled.nix b/services/enabled.nix index eb96260..34eeae6 100644 --- a/services/enabled.nix +++ b/services/enabled.nix @@ -14,7 +14,7 @@ ./resilio.nix # ./sks.nix ./gitea.nix - ./nexus.nix +# ./nexus.nix # ./wireguard.nix #./mqtt.nix # ./jitsi.nix @@ -24,5 +24,6 @@ # ./hydra.nix ./postgres.nix ./xkcd-password.nix + ./morss.nix ]; } diff --git a/services/gitea.nix b/services/gitea.nix index 216c35f..629a6db 100644 --- a/services/gitea.nix +++ b/services/gitea.nix @@ -11,7 +11,6 @@ services.postgresql.enable = true; services.gitea = { enable = true; - useWizard = true; repositoryRoot = "/var/lib/gitea/gitea-repositories"; lfs.enable = true; # package = pkgs.gitea.override rec { diff --git a/services/morss.nix b/services/morss.nix new file mode 100644 index 0000000..8982302 --- /dev/null +++ b/services/morss.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + services.nginx.virtualHosts."morss.stubbe.rocks" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://localhost:8000"; + }; + + +} diff --git a/services/postgres.nix b/services/postgres.nix index 6201e50..f7535f0 100644 --- a/services/postgres.nix +++ b/services/postgres.nix @@ -4,6 +4,6 @@ # used for gitea and nextcloud services.postgresql = { enable = true; - package = pkgs.postgresql_13; + package = pkgs.postgresql_18; }; }