From 7bf0b6e7dbfc9e49426ab85984ac42cf9ac20faa Mon Sep 17 00:00:00 2001
From: Alexandre LUCAZEAU <lucazeau.alexandre@gmail.com>
Date: Wed, 21 Jun 2023 19:15:44 +0000
Subject: [PATCH] Upgrade sup.atlanticaweb.fr to 23.05

---
 hosts/sup/configuration.nix | 4 +++-
 modules/grafana.nix         | 8 +++++---
 modules/users.nix           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hosts/sup/configuration.nix b/hosts/sup/configuration.nix
index 20e991a..03607c9 100644
--- a/hosts/sup/configuration.nix
+++ b/hosts/sup/configuration.nix
@@ -2,14 +2,16 @@
   imports = [
     ./hardware-configuration.nix
     ./firewall-services.nix
+    ./VPN.nix
     ../modules/users.nix
     ../modules/common.nix
     ../modules/smtp.nix
     ../modules/grafana.nix
+    ../docker/podman.nix
     
   ];
   system.stateVersion = "22.05";
-  boot.cleanTmpDir = true;
+  boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
   networking.hostName = "sup";
   services.openssh.enable = true;
diff --git a/modules/grafana.nix b/modules/grafana.nix
index 766c589..3695e9b 100644
--- a/modules/grafana.nix
+++ b/modules/grafana.nix
@@ -5,9 +5,11 @@
   {
   services.grafana = {
       enable = true;
-      domain = "sup.atlanticaweb.fr";
-      port = 2342;
-      addr = "192.168.10.108";
+      settings.server = {
+        domain = "sup.atlanticaweb.fr";
+        http_port = 2342;
+        http_addr = "192.168.10.108";
+	};
   };
   services.prometheus = {
     enable = true;
diff --git a/modules/users.nix b/modules/users.nix
index c0bfc71..cccbb57 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -10,7 +10,7 @@
 	createHome = true;
         home = "/home/alexandre";
         description = "Alexandre LUCAZEAU";
-        extraGroups = [ "wheel" ];
+        extraGroups = [ "wheel" "docker" "plocate" ];
         group = "alexandre";
         shell = pkgs.fish;
 	openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKUA1RW6JwZasspAp8qmFRFnlV5WXjhLfStAAkM+KYLv lucazeau.alexandre@gmail.com" ];