diff --git a/host/configuration.nix b/host/configuration.nix index 333830a..b3646c8 100644 --- a/host/configuration.nix +++ b/host/configuration.nix @@ -12,7 +12,6 @@ ./../nixosModules/nextcloud.nix ./../nixosModules/wakapi.nix ./../nixosModules/eko.nix - ./../nixosModules/wallabag.nix ]; boot.loader.grub = { @@ -55,7 +54,6 @@ 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 9118713..e187460 100644 --- a/nixosModules/actual-budget.nix +++ b/nixosModules/actual-budget.nix @@ -19,7 +19,6 @@ # 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 a7b0509..5515bc7 100644 --- a/nixosModules/eko.nix +++ b/nixosModules/eko.nix @@ -16,10 +16,7 @@ ]; }; - environment.sessionVariables = rec { - WALLABAG_DATA = "$HOME/wallabag"; - }; - + # Make sure the "eko" user has access to /srv/eko systemd.tmpfiles.rules = [ "d /srv/eko 0750 eko eko" ]; diff --git a/nixosModules/gitea.nix b/nixosModules/gitea.nix index 3b81f1d..ee4047d 100644 --- a/nixosModules/gitea.nix +++ b/nixosModules/gitea.nix @@ -15,7 +15,6 @@ # 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 8d86b8d..17ad488 100644 --- a/nixosModules/nextcloud.nix +++ b/nixosModules/nextcloud.nix @@ -19,7 +19,6 @@ # 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 deleted file mode 100644 index 18e3c2c..0000000 --- a/nixosModules/wallabag.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ 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" - ]; - }; - - }; -}