Fix remaining warnings for config changes between 24.05 and 24.11 on …

…dulu
Dillonb · Dec 7, 2024 · a27d7d8 · a27d7d8
1 parent 5b3d525
commit a27d7d8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/nix/hosts/dulu/configuration.nix b/nix/hosts/dulu/configuration.nix
@@ -55,7 +55,7 @@
   nixpkgs.config.permittedInsecurePackages = [
     "aspnetcore-runtime-6.0.36"
   ];
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver
@@ -69,18 +69,17 @@
 
   services.samba = {
     enable = true;
-    securityType = "user";
     openFirewall = true;
 
-    settings.global = {
-      "workgroup" = "DGB";
-      "server string" = "smbnix";
-      "netbios name" = "smbnix";
-      "server role" = "standalone server";
-      "map to guest" = "bad user";
-    };
-
-    shares = {
+    settings = {
+      global = {
+        security = "user";
+        "workgroup" = "DGB";
+        "server string" = "smbnix";
+        "netbios name" = "smbnix";
+        "server role" = "standalone server";
+        "map to guest" = "bad user";
+      };
       zpool = {
         path = "/zpool";
         browseable = "yes";

diff --git a/nix/hosts/dulu/pihole.nix b/nix/hosts/dulu/pihole.nix
@@ -1,26 +1,29 @@
 { ... }:
 {
-  docker-containers.pihole = {
-    image = "pihole/pihole:2024.07.0";
+  virtualisation.oci-containers = {
+    backend = "docker";
+    containers.pihole = {
+      image = "pihole/pihole:2024.07.0";
 
-    ports = [
-      "53:53/tcp"
-      "53:53/udp"
-      "3080:80"
-    ];
+      ports = [
+        "53:53/tcp"
+          "53:53/udp"
+          "3080:80"
+      ];
 
-    volumes = [
-      "/var/lib/pihole/pihole:/etc/pihole/"
-      "/var/lib/pihole/dnsmasq.d:/etc/dnsmasq.d/"
-    ];
+      volumes = [
+        "/var/lib/pihole/pihole:/etc/pihole/"
+          "/var/lib/pihole/dnsmasq.d:/etc/dnsmasq.d/"
+      ];
 
-    extraDockerOptions = [
-      "--cap-add=NET_ADMIN"
-      "--dns=127.0.0.1"
-      "--dns=8.8.4.4"
-    ];
+      extraOptions = [
+        "--cap-add=NET_ADMIN"
+          "--dns=127.0.0.1"
+          "--dns=8.8.4.4"
+      ];
 
-    workdir = "/var/lib/pihole/";
+      workdir = "/var/lib/pihole/";
+    };
   };
 
   networking.firewall = {