diff --git a/hosts/niflheim/default.nix b/hosts/niflheim/default.nix
index 4cd1416..a5c1e87 100644
--- a/hosts/niflheim/default.nix
+++ b/hosts/niflheim/default.nix
@@ -46,11 +46,13 @@
   # Create media group
   users.groups.media = { };
 
-  users.users.root.hashedPasswordFile = config.sops.secrets."linux/root".path;
-  users.users.root.openssh.authorizedKeys.keys = [
-    # desktop
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFDz59Mf8DGoOjluY9T4FNFaOvXH1s/VVZ9awHcyNVHJ"
-    #laptop
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlJo3xdypmwSS2lsHCzf6GsqyEGvr+HzvbU+TGuPjmA"
-  ];
+  users.users.root = {
+    hashedPasswordFile = config.sops.secrets."linux/root".path;
+    openssh.authorizedKeys.keys = [
+      # desktop
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFDz59Mf8DGoOjluY9T4FNFaOvXH1s/VVZ9awHcyNVHJ"
+      # laptop
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlJo3xdypmwSS2lsHCzf6GsqyEGvr+HzvbU+TGuPjmA"
+    ];
+  };
 }
diff --git a/hosts/niflheim/networking.nix b/hosts/niflheim/networking.nix
index 2101e65..c3d7c9d 100644
--- a/hosts/niflheim/networking.nix
+++ b/hosts/niflheim/networking.nix
@@ -38,9 +38,10 @@
         hostKeys = [ /etc/ssh/ssh_initrd_ed25519_key ];
       };
     };
+    systemd.network = {
+      enable = true;
+      # Network configuration i.e. when we unlock machines with openssh in the initrd
+      networks."10-uplink" = config.systemd.network.networks."10-uplink";
+    };
   };
-
-  boot.initrd.systemd.network.enable = true;
-  # Network configuration i.e. when we unlock machines with openssh in the initrd
-  boot.initrd.systemd.network.networks."10-uplink" = config.systemd.network.networks."10-uplink";
 }
diff --git a/hosts/personal/nix.nix b/hosts/personal/nix.nix
index 99b34c9..fcc9025 100644
--- a/hosts/personal/nix.nix
+++ b/hosts/personal/nix.nix
@@ -1,7 +1,9 @@
 { lib, ... }:
 
 {
-  nix.daemonIOSchedClass = "idle";
-  nix.daemonIOSchedPriority = 7;
-  nix.daemonCPUSchedPolicy = "idle";
+  nix = {
+    daemonIOSchedClass = "idle";
+    daemonIOSchedPriority = 7;
+    daemonCPUSchedPolicy = "idle";
+  };
 }
diff --git a/hosts/server/nix.nix b/hosts/server/nix.nix
index b46006f..cac7002 100644
--- a/hosts/server/nix.nix
+++ b/hosts/server/nix.nix
@@ -1,7 +1,9 @@
 { lib, ... }:
 
 {
-  nix.daemonIOSchedClass = "best-effort";
-  nix.daemonIOSchedPriority = 4;
-  nix.daemonCPUSchedPolicy = "batch";
+  nix = {
+    daemonIOSchedClass = "best-effort";
+    daemonIOSchedPriority = 4;
+    daemonCPUSchedPolicy = "batch";
+  };
 }
diff --git a/modules/nixos/nginx-ext.nix b/modules/nixos/nginx-ext.nix
index 242eecf..84c5fc6 100644
--- a/modules/nixos/nginx-ext.nix
+++ b/modules/nixos/nginx-ext.nix
@@ -68,7 +68,7 @@ in
         }
         // attrsets.mapAttrs' (
           app: opts:
-          nameValuePair ("${app}.${cfg.basedomain}") {
+          nameValuePair "${app}.${cfg.basedomain}" {
             forceSSL = true;
             useACMEHost = cfg.basedomain;
             locations = {
diff --git a/users/alapshin/home/home.nix b/users/alapshin/home/home.nix
index 0cc4dfd..8df6d73 100644
--- a/users/alapshin/home/home.nix
+++ b/users/alapshin/home/home.nix
@@ -8,10 +8,11 @@
   ...
 }:
 {
-  home.stateVersion = "23.11";
-
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
+  home = {
+    username = username;
+    stateVersion = "23.11";
+    homeDirectory = "/home/${username}";
+  };
 
   imports =
     [