chore: fix deprecations/attribute moves

johnae · Aug 17, 2024 · 7604075 · 7604075
1 parent 9a23ad6
commit 7604075
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/hosts/x86_64-linux/eris.nix b/hosts/x86_64-linux/eris.nix
@@ -63,7 +63,7 @@
         };
         addresses = [
           {
-            addressConfig.Address = "10.100.100.1/24";
+            Address = "10.100.100.1/24";
           }
         ];
       };

diff --git a/hosts/x86_64-linux/prometheus.nix b/hosts/x86_64-linux/prometheus.nix
@@ -178,7 +178,7 @@
         };
         addresses = [
           {
-            addressConfig.Address = "10.100.2.1/24";
+            Address = "10.100.2.1/24";
           }
         ];
       };

diff --git a/hosts/x86_64-linux/sirius.nix b/hosts/x86_64-linux/sirius.nix
@@ -147,7 +147,7 @@
         };
         addresses = [
           {
-            addressConfig.Address = "10.100.1.1/24";
+            Address = "10.100.1.1/24";
           }
         ];
       };

diff --git a/profiles/pamu2f.nix b/profiles/pamu2f.nix
@@ -17,12 +17,12 @@
       userConfigs
     ));
 in {
-  security.pam.u2f.cue = true;
-  security.pam.u2f.origin = "pam://1337";
-  security.pam.u2f.appId = "pam://9000";
-  security.pam.u2f.enable = true;
-  security.pam.u2f.control = "required";
-  security.pam.u2f.authFile = writeU2fKeys u2fMappings;
+  security.pam.u2f.settings.cue = true;
+  security.pam.u2f.settings.origin = "pam://1337";
+  security.pam.u2f.settings.appid = "pam://9000";
+  security.pam.u2f.settings.enable = true;
+  security.pam.u2f.settings.control = "required";
+  security.pam.u2f.settings.authfile = writeU2fKeys u2fMappings;
 
   assertions = [
     {

diff --git a/profiles/workstation.nix b/profiles/workstation.nix
@@ -80,7 +80,7 @@
   services.printing.drivers = [pkgs.gutenprint];
   services.ipp-usb.enable = true;
 
-  services.dbus.packages = with pkgs; [gcr dconf gnome.sushi];
+  services.dbus.packages = with pkgs; [gcr dconf sushi];
   services.udev.packages = with pkgs; [gnome.gnome-settings-daemon];
 
   environment.etc."systemd/sleep.conf".text = "HibernateDelaySec=8h";

diff --git a/users/profiles/workstation.nix b/users/profiles/workstation.nix
@@ -32,7 +32,7 @@ in {
   home.packages = with pkgs; [
     element-desktop-wayland
     gimp
-    gnome.nautilus
+    nautilus
     kanshi
     lswt
     mako
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ @@
             };
             addresses = [
               {
-                addressConfig.Address = "10.100.100.1/24";
+                Address = "10.100.100.1/24";
               }
             ];
           };
@@ Expand Down @@