From 089c3a78659d09b87211e7059d525d1ca27fbb9d Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 13 Jul 2023 01:58:12 +0200 Subject: [PATCH] wbob: reformat configuration --- 1systems/wbob/config.nix | 2 +- 2configs/gui/wbob-kiosk.nix | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/1systems/wbob/config.nix b/1systems/wbob/config.nix index 8e2d565..669f52c 100644 --- a/1systems/wbob/config.nix +++ b/1systems/wbob/config.nix @@ -82,7 +82,7 @@ in { networking.firewall.allowedTCPPorts = [ 3000 influx-port admin-port ]; services.grafana.enable = true; - services.grafana.addr = "0.0.0.0"; + services.grafana.settings.server.http_addr = "0.0.0.0"; services.influxdb.enable = true; systemd.services.influxdb.serviceConfig.LimitNOFILE = 8192; diff --git a/2configs/gui/wbob-kiosk.nix b/2configs/gui/wbob-kiosk.nix index d8cf243..a1442fb 100644 --- a/2configs/gui/wbob-kiosk.nix +++ b/2configs/gui/wbob-kiosk.nix @@ -6,7 +6,14 @@ ]; users.users.kiosk = { - packages = with pkgs;[ chromium vscode spotify tartube-yt-dlp yt-dlp ]; + packages = with pkgs;[ + chromium vscode spotify tartube-yt-dlp yt-dlp + pkgs.gnomeExtensions.appindicator + pkgs.pavucontrol + pkgs.chromium pkgs.firefox + pkgs.kodi + pkgs.guake + ]; group = "kiosk"; isNormalUser = true; uid = 1003; @@ -14,8 +21,6 @@ }; users.groups.kiosk.gid = 989 ; services.xserver = { - - windowManager = lib.mkForce { awesome.enable = false; }; displayManager.gdm.enable = true; displayManager.autoLogin = { enable = true; @@ -27,10 +32,6 @@ # prevent screen from turning off, disable dpms }; - environment.systemPackages = [ - pkgs.gnomeExtensions.appindicator pkgs.pavucontrol pkgs.jellyfin-media-player pkgs.chromium pkgs.firefox pkgs.kodi pkgs.pavucontrol - ]; - services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ]; services.pipewire.systemWide = lib.mkForce false;