From 3eaeb5daebc7c654a03e7619a894d77ecbaf71ec Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 7 Oct 2022 22:52:04 +0200 Subject: [PATCH] renge/grocy: Drop --- machines/renge/configuration.nix | 1 - machines/renge/services/grocy.nix | 37 ------------------------------ users/simon/modules/vdirsyncer.nix | 7 ------ 3 files changed, 45 deletions(-) delete mode 100644 machines/renge/services/grocy.nix diff --git a/machines/renge/configuration.nix b/machines/renge/configuration.nix index 1484d45..2ba11b9 100644 --- a/machines/renge/configuration.nix +++ b/machines/renge/configuration.nix @@ -11,7 +11,6 @@ ./services/element-web.nix ./services/gitea.nix ./services/grafana.nix - ./services/grocy.nix ./services/hedgedoc.nix ./services/invidious ./services/libreddit.nix diff --git a/machines/renge/services/grocy.nix b/machines/renge/services/grocy.nix deleted file mode 100644 index 83707ca..0000000 --- a/machines/renge/services/grocy.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, ... }: - -{ - services.grocy = { - enable = true; - hostName = "grocy.sbruder.de"; - settings = { - currency = "EUR"; - culture = "de"; - calendar = { - firstDayOfWeek = 1; # it certainly isn’t Sunday - }; - }; - }; - - services.nginx.virtualHosts."${config.services.grocy.hostName}" = - let - # workaround for nginx dropping parent headers - # see https://github.com/yandex/gixy/blob/master/docs/en/plugins/addheaderredefinition.md - parentHeaders = lib.concatStringsSep "\n" (lib.filter - (lib.hasPrefix "add_header ") - (lib.splitString "\n" config.services.nginx.commonHttpConfig)); - in - { - locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = '' - ${parentHeaders} - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header Referrer-Policy no-referrer; - access_log off; - ''; - }; -} diff --git a/users/simon/modules/vdirsyncer.nix b/users/simon/modules/vdirsyncer.nix index 5250102..496c150 100644 --- a/users/simon/modules/vdirsyncer.nix +++ b/users/simon/modules/vdirsyncer.nix @@ -98,10 +98,6 @@ in username = "simon@sbruder.de"; passwordCommand = "pass sbruder.de/mail | head -n 1"; }) - (mkWebcalSection { - name = "grocy"; - urlCommand = [ "pass" "sbruder.de/grocy/calendar" ]; - }) ]); "khal/config".text = /* toml */ '' @@ -118,9 +114,6 @@ in path = ${contactsBasePath}/personal/${personalContactsUuid}/ type = birthdays - [[calendar_grocy]] - path = ${calendarBasePath}/grocy/ - [locale] timeformat = %H:%M dateformat = %Y-%m-%d