diff --git a/host/configuration.nix b/host/configuration.nix index b3646c8..333830a 100644 --- a/host/configuration.nix +++ b/host/configuration.nix @@ -12,6 +12,7 @@ ./../nixosModules/nextcloud.nix ./../nixosModules/wakapi.nix ./../nixosModules/eko.nix + ./../nixosModules/wallabag.nix ]; boot.loader.grub = { @@ -54,6 +55,7 @@ nextcloud.enable = false; wakapi.enable = true; eko.enable = true; + wallabag.enable = true; # Automatically pull this config from git autoUpdate.enable = true; diff --git a/nixosModules/actual-budget.nix b/nixosModules/actual-budget.nix index e187460..9118713 100644 --- a/nixosModules/actual-budget.nix +++ b/nixosModules/actual-budget.nix @@ -19,6 +19,7 @@ # Make sure acme module is active for the "kyren.codes" ssl cert acme.enable = true; + services.nginx.enable = true; services.nginx.virtualHosts."budget.kyren.codes" = { useACMEHost = "kyren.codes"; forceSSL = true; diff --git a/nixosModules/eko.nix b/nixosModules/eko.nix index 5515bc7..a7b0509 100644 --- a/nixosModules/eko.nix +++ b/nixosModules/eko.nix @@ -16,7 +16,10 @@ ]; }; - # Make sure the "eko" user has access to /srv/eko + environment.sessionVariables = rec { + WALLABAG_DATA = "$HOME/wallabag"; + }; + systemd.tmpfiles.rules = [ "d /srv/eko 0750 eko eko" ]; diff --git a/nixosModules/gitea.nix b/nixosModules/gitea.nix index ee4047d..3b81f1d 100644 --- a/nixosModules/gitea.nix +++ b/nixosModules/gitea.nix @@ -15,6 +15,7 @@ # Make sure acme module is active for the "kyren.codes" ssl cert acme.enable = true; + services.nginx.enable = true; services.nginx.virtualHosts."git.kyren.codes" = { useACMEHost = "kyren.codes"; forceSSL = true; diff --git a/nixosModules/nextcloud.nix b/nixosModules/nextcloud.nix index 17ad488..8d86b8d 100644 --- a/nixosModules/nextcloud.nix +++ b/nixosModules/nextcloud.nix @@ -19,6 +19,7 @@ # Make sure acme module is active for the "kyren.codes" ssl cert acme.enable = true; + services.nginx.enable = true; services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { forceSSL = true; useACMEHost = "kyren.codes"; diff --git a/nixosModules/wallabag.nix b/nixosModules/wallabag.nix new file mode 100644 index 0000000..18e3c2c --- /dev/null +++ b/nixosModules/wallabag.nix @@ -0,0 +1,19 @@ +{ pkgs, lib, config, ... }: { + + options = { + wallabag.enable = lib.mkEnableOption "enables wallabag"; + }; + + config = lib.mkIf config.wallabag.enable { + users.groups.wallabag = { }; + users.users.wallabag = { + createHome = false; + isNormalUser = true; + group = "wallabag"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7P9K9D5RkBk+JCRRS6AtHuTAc6cRpXfRfRMg/Kyren" + ]; + }; + + }; +}