diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index 37b65b9..2c94999 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  inputs,
-  pkgs,
-  ...
-}: {
+{inputs, ...}: {
   imports = with inputs; [
     self.modules.shared.nixos
     self.nixosModules.desktop
@@ -13,16 +8,15 @@
   ];
 
   networking = {
-    networkmanager.enable = true;
     hostId = "c7f6c4a1";
     hostName = "dunamis";
   };
 
-  environment.memoryAllocator.provider = "mimalloc";
   system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
 
   desktop.niri.enable = true;
+
   services.displayManager.autoLogin = {
     enable = true;
     user = "user";
diff --git a/hosts/eldrid/configuration.nix b/hosts/eldrid/configuration.nix
index aa25d2d..c90c609 100644
--- a/hosts/eldrid/configuration.nix
+++ b/hosts/eldrid/configuration.nix
@@ -9,17 +9,27 @@
   ];
 
   networking = {
-    networkmanager.enable = true;
     hostId = "14f63637";
     hostName = "eldrid";
   };
 
-  environment.memoryAllocator.provider = "mimalloc";
   system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
 
   desktop.niri.enable = true;
 
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "user";
+  };
+
+  swapDevices = [
+    {
+      device = "/swap/swapfile";
+      size = 8 * 1024; # eight gigs
+    }
+  ];
+
   module = {
     config = {
       laptop.homeRowMods = true;
@@ -30,7 +40,7 @@
     };
     stylix = {
       enable = true;
-      theme = "rose-pine-moon";
+      theme = "gruvbox-dark-pale";
     };
   };
 
@@ -38,11 +48,4 @@
   opentabletdriver.enable = false;
   qmk-vial.enable = true;
   virtual.libvirt.enable = false;
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 8 * 1024; # eight gigs
-    }
-  ];
 }
diff --git a/hosts/legion/configuration.nix b/hosts/legion/configuration.nix
index acd8142..70cfd28 100644
--- a/hosts/legion/configuration.nix
+++ b/hosts/legion/configuration.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  inputs,
-  ...
-}: {
+{inputs, ...}: {
   imports = with inputs; [
     self.modules.shared.nixos
     self.nixosModules.desktop
@@ -13,11 +9,10 @@
   ];
 
   networking = {
-    networkmanager.enable = true;
+    hostId = "45b00123";
     hostName = "legion";
   };
 
-  environment.memoryAllocator.provider = "mimalloc";
   system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
 
diff --git a/hosts/morphius/configuration.nix b/hosts/morphius/configuration.nix
index 8639781..dfb4fc6 100644
--- a/hosts/morphius/configuration.nix
+++ b/hosts/morphius/configuration.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  # pkgs,
-  lib,
-  ...
-}: {
+{inputs, ...}: {
   imports = with inputs; [
     self.nixosModules.desktop
     self.nixosModules.system
@@ -14,23 +9,13 @@
   ];
 
   networking = {
-    networkmanager.enable = true;
     hostId = "bd1b5837";
     hostName = "morphius";
   };
 
-  environment.memoryAllocator.provider = "mimalloc";
   system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
 
-  zramSwap.enable = true;
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 8 * 1024;
-    }
-  ];
-
   desktop.gnome.enable = true;
 
   services.displayManager.autoLogin = {
@@ -38,6 +23,13 @@
     user = "user";
   };
 
+  swapDevices = [
+    {
+      device = "/swap/swapfile";
+      size = 8 * 1024;
+    }
+  ];
+
   module = {
     config = {
       secureBoot = true;
diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix
index dd45bef..b9589db 100644
--- a/hosts/sarien/configuration.nix
+++ b/hosts/sarien/configuration.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  ...
-}: {
+{inputs, ...}: {
   imports = with inputs; [
     self.nixosModules.desktop
     self.nixosModules.system
@@ -14,18 +9,15 @@
   ];
 
   networking = {
-    networkmanager.enable = true;
     hostId = "31150fae";
     hostName = "sarien";
   };
 
-  environment.memoryAllocator.provider = "mimalloc";
   system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
 
-  security.pam.sshAgentAuth.enable = true;
-
   desktop.niri.enable = true;
+
   services.displayManager.autoLogin = {
     enable = true;
     user = "user";
diff --git a/modules/nixos/system/common.nix b/modules/nixos/system/common.nix
index 35d1eac..70a0b9a 100644
--- a/modules/nixos/system/common.nix
+++ b/modules/nixos/system/common.nix
@@ -1,9 +1,13 @@
 {lib, ...}: {
-  environment.variables = {
-    LESS = "-R --mouse";
+  environment = {
+    ldso32 = null;
+    memoryAllocator.provider = "mimalloc";
+    variables = {
+      LESS = "-R --mouse";
+    };
   };
 
-  environment.ldso32 = null;
+  networking.networkmanager.enable = true;
 
   boot.tmp.cleanOnBoot = lib.mkDefault true;