From ddfb236c6c21ad07125dd6bf7cd11ffd9462252b Mon Sep 17 00:00:00 2001
From: Jakob Lechner <mail@jalr.de>
Date: Tue, 23 May 2023 15:25:48 +0000
Subject: [PATCH] Fix warnings after switching to 23.05

---
 flake.nix                    |  2 +-
 modules/bootloader/grub2.nix |  1 -
 modules/default.nix          |  2 +-
 modules/dnsmasq.nix          | 30 ++++++++++++++++--------------
 modules/sshd.nix             |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index ad298fb..052bac9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,7 +57,7 @@
             };
           };
         };
-        devShell = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
           buildInputs = (with pkgs; [
             black
             just
diff --git a/modules/bootloader/grub2.nix b/modules/bootloader/grub2.nix
index dbceb03..3144bff 100644
--- a/modules/bootloader/grub2.nix
+++ b/modules/bootloader/grub2.nix
@@ -3,6 +3,5 @@
 lib.mkIf (config.myConfig.bootloader == "grub2") {
   boot.loader.grub = {
     enable = true;
-    version = 2;
   };
 }
diff --git a/modules/default.nix b/modules/default.nix
index e654b5e..808c62e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -41,7 +41,7 @@
   ];
 
   config = {
-    boot.cleanTmpDir = true;
+    boot.tmp.cleanOnBoot = true;
 
     security.polkit.enable = true;
   };
diff --git a/modules/dnsmasq.nix b/modules/dnsmasq.nix
index 665ae54..1c0a0b4 100644
--- a/modules/dnsmasq.nix
+++ b/modules/dnsmasq.nix
@@ -5,20 +5,22 @@
     services.dnsmasq = {
       enable = true;
       resolveLocalQueries = true;
-      servers = [
-        "127.0.0.1#9053"
-        "/lechner.zz/192.168.0.1"
-        "/lab.fablab-nea.de/192.168.94.1"
-      ];
-      extraConfig = ''
-        no-resolv
-        interface=lo
-        listen-address=::1
-        listen-address=127.0.0.1
-        bind-interfaces
-        dns-loop-detect
-        neg-ttl=5
-      '';
+      settings = {
+        server = [
+          "127.0.0.1#9053"
+          "/lechner.zz/192.168.0.1"
+          "/lab.fablab-nea.de/192.168.94.1"
+        ];
+        no-resolv = true;
+        interface = "lo";
+        listen-address = [
+          "::1"
+          "127.0.0.1"
+        ];
+        bind-interfaces = true;
+        dns-loop-detect = true;
+        neg-ttl = 5;
+      };
     };
   };
 }
diff --git a/modules/sshd.nix b/modules/sshd.nix
index 4aa1ad6..3ad95f3 100644
--- a/modules/sshd.nix
+++ b/modules/sshd.nix
@@ -1,6 +1,6 @@
 {
   services.openssh = {
     enable = true;
-    passwordAuthentication = false;
+    settings.PasswordAuthentication = false;
   };
 }