From 88005ad291239c47798487d5a6a680514a4b578b Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Fri, 24 Nov 2023 22:07:16 +0100
Subject: [PATCH] silence some eval warning

---
 home-manager-modules/waybar/default.nix |  2 +-
 machines/core-security/default.nix      |  2 +-
 machines/fischer/default.nix            | 16 +++++++++-------
 machines/tower/default.nix              | 18 ++++++++++--------
 modules/drone/default.nix               |  2 +-
 users/default.nix                       |  2 +-
 users/julien.nix                        |  2 +-
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/home-manager-modules/waybar/default.nix b/home-manager-modules/waybar/default.nix
index fbc273d..a326115 100644
--- a/home-manager-modules/waybar/default.nix
+++ b/home-manager-modules/waybar/default.nix
@@ -7,7 +7,7 @@ with lib;
   options.luj.programs.waybar = {
     enable = mkEnableOption "Enable waybar";
     interfaceName = mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
     };
   };
 
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index 3476571..85f5b26 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -101,7 +101,7 @@
   services.keycloak = {
     enable = true;
     database.createLocally = true;
-    database.passwordFile = "/run/secrets/keycloak";
+    database.hashedPasswordFile = "/run/secrets/keycloak";
     settings = {
       hostname = "auth.julienmalka.me";
       hostname-admin-url = "https://auth.julienmalka.me";
diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix
index ce2befd..83fef7d 100644
--- a/machines/fischer/default.nix
+++ b/machines/fischer/default.nix
@@ -133,13 +133,15 @@
     settings.options.urAccepted = -1;
     overrideDevices = true;
     overrideFolders = true;
-    devices = {
-      "tower" = { id = "XEPZZIP-GX73OKE-KNGZA47-XWWGI5G-LNXPU57-BMLXK5M-VNGS5UQ-ZFIZSAK"; };
-    };
-    folders = {
-      "dev" = {
-        path = "/home/julien/dev";
-        devices = [ "tower" ];
+    settings = {
+      devices = {
+        "tower" = { id = "XEPZZIP-GX73OKE-KNGZA47-XWWGI5G-LNXPU57-BMLXK5M-VNGS5UQ-ZFIZSAK"; };
+      };
+      folders = {
+        "dev" = {
+          path = "/home/julien/dev";
+          devices = [ "tower" ];
+        };
       };
     };
   };
diff --git a/machines/tower/default.nix b/machines/tower/default.nix
index 645819e..c2b3ac6 100644
--- a/machines/tower/default.nix
+++ b/machines/tower/default.nix
@@ -171,14 +171,16 @@
     group = "users";
     overrideDevices = true;
     overrideFolders = true;
-    devices = {
-      "fischer" = { id = "MHV2PGN-GAHQMV5-ITXGNQS-IRJC3XL-OQIHVUX-JVKBZ6Z-33XHE7H-NC6H5AE"; };
-    };
-    folders = {
-      "dev" = {
-        # Name of folder in Syncthing, also the folder ID
-        path = "/home/julien/dev"; # Which folder to add to Syncthing
-        devices = [ "fischer" ]; # Which devices to share the folder with
+    settings = {
+      devices = {
+        "fischer" = { id = "MHV2PGN-GAHQMV5-ITXGNQS-IRJC3XL-OQIHVUX-JVKBZ6Z-33XHE7H-NC6H5AE"; };
+      };
+      folders = {
+        "dev" = {
+          # Name of folder in Syncthing, also the folder ID
+          path = "/home/julien/dev"; # Which folder to add to Syncthing
+          devices = [ "fischer" ]; # Which devices to share the folder with
+        };
       };
     };
   };
diff --git a/modules/drone/default.nix b/modules/drone/default.nix
index 478570f..2f7e791 100644
--- a/modules/drone/default.nix
+++ b/modules/drone/default.nix
@@ -22,7 +22,7 @@ in
         createHome = true;
         home = "/home/drone";
         extraGroups = [ drone config.users.groups.keys.name ];
-        passwordFile = config.sops.secrets.user-julien-password.path;
+        hashedPasswordFile = config.sops.secrets.user-julien-password.path;
       };
       users.groups.drone = { };
       luj.hmgr.drone.luj.programs.git.enable = true;
diff --git a/users/default.nix b/users/default.nix
index a84bcb0..d1fef31 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -12,7 +12,7 @@
     home = "/root";
     shell = lib.mkForce config.users.defaultUserShell;
     group = "root";
-    passwordFile = config.sops.secrets.user-root-password.path;
+    hashedPasswordFile = config.sops.secrets.user-root-password.path;
     openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa+7n7kNzb86pTqaMn554KiPrkHRGeTJ0asY1NjSbpr julien@tower" ];
   };
 
diff --git a/users/julien.nix b/users/julien.nix
index 4fa1c9c..139287a 100644
--- a/users/julien.nix
+++ b/users/julien.nix
@@ -7,7 +7,7 @@
     home = "/home/julien";
     extraGroups = [ "wheel" config.users.groups.keys.name "filerun" "networkmanager" "davfs2" "adbusers" "audio" ];
     shell = pkgs.zsh;
-    passwordFile = config.sops.secrets.user-julien-password.path;
+    hashedPasswordFile = config.sops.secrets.user-julien-password.path;
   };