diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index 5a69c11..b480e04 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   imports = with inputs; [
-    self.nixosModules.config
+    self.nixosModules.shared
     self.nixosModules.desktop
     self.nixosModules.system
     ./disko
diff --git a/hosts/eldrid/configuration.nix b/hosts/eldrid/configuration.nix
index c02f599..f621707 100644
--- a/hosts/eldrid/configuration.nix
+++ b/hosts/eldrid/configuration.nix
@@ -1,6 +1,6 @@
 {inputs, ...}: {
   imports = with inputs; [
-    self.nixosModules.config
+    self.nixosModules.shared
     self.nixosModules.desktop
     self.nixosModules.system
     ./disko
diff --git a/hosts/legion/configuration.nix b/hosts/legion/configuration.nix
index f2e85f2..f6b7846 100644
--- a/hosts/legion/configuration.nix
+++ b/hosts/legion/configuration.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   imports = with inputs; [
-    self.nixosModules.config
+    self.nixosModules.shared
     self.nixosModules.desktop
     self.nixosModules.system
     ./disko
diff --git a/hosts/morphius/configuration.nix b/hosts/morphius/configuration.nix
index 39dadea..7fdcaf1 100644
--- a/hosts/morphius/configuration.nix
+++ b/hosts/morphius/configuration.nix
@@ -7,7 +7,7 @@
   imports = with inputs; [
     self.nixosModules.desktop
     self.nixosModules.system
-    self.nixosModules.config
+    self.nixosModules.shared
     ./disko
     ./hardware
     ./misc
diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix
index c2c985b..b67d010 100644
--- a/hosts/sarien/configuration.nix
+++ b/hosts/sarien/configuration.nix
@@ -7,7 +7,7 @@
   imports = with inputs; [
     self.nixosModules.desktop
     self.nixosModules.system
-    self.nixosModules.config
+    self.nixosModules.shared
     ./disko
     ./hardware
     ./misc
@@ -23,7 +23,9 @@
   system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
 
-  desktop.gnome.enable = true;
+  security.pam.sshAgentAuth.enable = true;
+
+  desktop.niri.enable = true;
   services.displayManager.autoLogin = {
     enable = true;
     user = "user";
diff --git a/modules/nixos/config/boot/default.nix b/modules/nixos/shared/boot/default.nix
similarity index 100%
rename from modules/nixos/config/boot/default.nix
rename to modules/nixos/shared/boot/default.nix
diff --git a/modules/nixos/config/boot/lanzaboote.nix b/modules/nixos/shared/boot/lanzaboote.nix
similarity index 100%
rename from modules/nixos/config/boot/lanzaboote.nix
rename to modules/nixos/shared/boot/lanzaboote.nix
diff --git a/modules/nixos/config/boot/loader.nix b/modules/nixos/shared/boot/loader.nix
similarity index 100%
rename from modules/nixos/config/boot/loader.nix
rename to modules/nixos/shared/boot/loader.nix
diff --git a/modules/nixos/config/default.nix b/modules/nixos/shared/default.nix
similarity index 100%
rename from modules/nixos/config/default.nix
rename to modules/nixos/shared/default.nix
diff --git a/modules/nixos/config/hardware/default.nix b/modules/nixos/shared/hardware/default.nix
similarity index 100%
rename from modules/nixos/config/hardware/default.nix
rename to modules/nixos/shared/hardware/default.nix
diff --git a/modules/nixos/config/hardware/facter.nix b/modules/nixos/shared/hardware/facter.nix
similarity index 100%
rename from modules/nixos/config/hardware/facter.nix
rename to modules/nixos/shared/hardware/facter.nix
diff --git a/modules/nixos/config/misc/default.nix b/modules/nixos/shared/misc/default.nix
similarity index 100%
rename from modules/nixos/config/misc/default.nix
rename to modules/nixos/shared/misc/default.nix
diff --git a/modules/nixos/config/misc/slim.nix b/modules/nixos/shared/misc/slim.nix
similarity index 100%
rename from modules/nixos/config/misc/slim.nix
rename to modules/nixos/shared/misc/slim.nix
diff --git a/modules/nixos/config/misc/zram.nix b/modules/nixos/shared/misc/zram.nix
similarity index 100%
rename from modules/nixos/config/misc/zram.nix
rename to modules/nixos/shared/misc/zram.nix
diff --git a/modules/nixos/config/networking/default.nix b/modules/nixos/shared/networking/default.nix
similarity index 100%
rename from modules/nixos/config/networking/default.nix
rename to modules/nixos/shared/networking/default.nix
diff --git a/modules/nixos/config/networking/hosts.nix b/modules/nixos/shared/networking/hosts.nix
similarity index 100%
rename from modules/nixos/config/networking/hosts.nix
rename to modules/nixos/shared/networking/hosts.nix
diff --git a/modules/nixos/config/nix/common.nix b/modules/nixos/shared/nix/common.nix
similarity index 100%
rename from modules/nixos/config/nix/common.nix
rename to modules/nixos/shared/nix/common.nix
diff --git a/modules/nixos/config/nix/default.nix b/modules/nixos/shared/nix/default.nix
similarity index 100%
rename from modules/nixos/config/nix/default.nix
rename to modules/nixos/shared/nix/default.nix
diff --git a/modules/nixos/config/nix/distibuted-build.nix b/modules/nixos/shared/nix/distibuted-build.nix
similarity index 100%
rename from modules/nixos/config/nix/distibuted-build.nix
rename to modules/nixos/shared/nix/distibuted-build.nix
diff --git a/modules/nixos/config/nix/substituters.nix b/modules/nixos/shared/nix/substituters.nix
similarity index 100%
rename from modules/nixos/config/nix/substituters.nix
rename to modules/nixos/shared/nix/substituters.nix
diff --git a/modules/nixos/config/programs.nix b/modules/nixos/shared/programs.nix
similarity index 100%
rename from modules/nixos/config/programs.nix
rename to modules/nixos/shared/programs.nix
diff --git a/modules/nixos/config/security/default.nix b/modules/nixos/shared/security/default.nix
similarity index 100%
rename from modules/nixos/config/security/default.nix
rename to modules/nixos/shared/security/default.nix
diff --git a/modules/nixos/config/services.nix b/modules/nixos/shared/services.nix
similarity index 100%
rename from modules/nixos/config/services.nix
rename to modules/nixos/shared/services.nix
diff --git a/modules/nixos/config/sops.nix b/modules/nixos/shared/sops.nix
similarity index 100%
rename from modules/nixos/config/sops.nix
rename to modules/nixos/shared/sops.nix
diff --git a/modules/nixos/config/users.nix b/modules/nixos/shared/users.nix
similarity index 100%
rename from modules/nixos/config/users.nix
rename to modules/nixos/shared/users.nix