diff options
| -rw-r--r-- | configuration.nix | 3 | ||||
| -rw-r--r-- | modules/glance.nix | 19 | ||||
| -rw-r--r-- | modules/webserver.nix | 16 |
3 files changed, 7 insertions, 31 deletions
diff --git a/configuration.nix b/configuration.nix index 8450378..7f55737 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,8 +18,10 @@ ./modules/caldav.nix ./modules/vaultwarden.nix ./modules/pdf.nix + ./modules/atuin.nix #./modules/silverbullet.nix Commented out: silverbullet 0.9 doesn't work with deno 2+ ./modules/monit.nix + ./modules/shopping-list.nix ./modules/glance.nix ]; @@ -33,7 +35,6 @@ lazygit neovim - htop ]; system.copySystemConfiguration = true; diff --git a/modules/glance.nix b/modules/glance.nix index df16754..027fa2c 100644 --- a/modules/glance.nix +++ b/modules/glance.nix @@ -34,12 +34,6 @@ in { type = "calendar"; } - { - type = "iframe"; - title = "Mensa"; - source = "https://krinitsin.com/mensa/"; - height = 350; - } ]; } { @@ -71,7 +65,7 @@ in { title = "Git"; url = "https://git.krinitsin.com"; - icon = "si:git"; + icon = "/assets/git.png"; } { title = "Mealie"; @@ -81,7 +75,7 @@ in { title = "PDF"; url = "https://pdf.krinitsin.com"; - icon = "di:stirling-pdf"; + icon = "/assets/stirling-pdf.png"; } { title = "Polaris"; @@ -103,17 +97,12 @@ in title = "Shopping List"; url = "https://krinitsin.com/shopping/"; check-url = "https://google.com"; - icon = "/assets/monit.png"; - } - { - title = "Mensa"; - url = "https://krinitsin.com/mensa/"; - icon = "/assets/monit.png"; + icon = "/assets/shopping-list.png"; } { title = "Webmail"; url = "https://webmail.krinitsin.com"; - icon = "si:roundcube"; + icon = "/assets/roundcube.png"; } ]; type = "monitor"; diff --git a/modules/webserver.nix b/modules/webserver.nix index ac95ddf..755a37a 100644 --- a/modules/webserver.nix +++ b/modules/webserver.nix @@ -10,14 +10,6 @@ enableACME = true; root = "/var/www/krinitsin.com"; serverAliases = [ "www.krinitsin.com" ]; - - locations."/shopping/".basicAuthFile = "/secret/shopping_auth"; - locations."/shopping/api/" = { - proxyPass = "http://127.0.0.1:5000"; - basicAuthFile = "/secret/shopping_auth"; - }; - - locations."/mensa/api/".proxyPass = "http://127.0.0.1:5000"; }; }; }; @@ -27,13 +19,7 @@ defaults.email = "christian@krinitsin.xyz"; }; - systemd.services.flask-backend = { - enable = true; - wantedBy = ["multi-user.target"]; - serviceConfig.ExecStart = ''/var/flask-backend/result/bin/app.py''; - }; - - networking.firewall.allowedTCPPorts = [ 80 443 5000 ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; services.monit.config = '' check process nginx with pidfile /var/run/nginx/nginx.pid |