diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index 3773d59..c4eed5f 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -5,14 +5,13 @@
   ...
 }: {
   imports = with inputs; [
+    chaotic.nixosModules.default
+    self.nixosModules.desktop
+    self.nixosModules.system
     ./hardware-conf.nix
     ./users.nix
     ./programs.nix
     ./stylix.nix
-    chaotic.nixosModules.default
-    stylix.nixosModules.stylix
-    self.nixosModules.desktop
-    self.nixosModules.system
   ];
   desktop = {
     niri.enable = true;
diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix
index aab900e..b55c129 100644
--- a/hosts/dunamis/stylix.nix
+++ b/hosts/dunamis/stylix.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.stylix.nixosModules.stylix
+  ];
   environment.systemPackages = with pkgs; [
     #papirus-icon-theme
     nerd-fonts.iosevka
diff --git a/hosts/dunamis/users/user/flatpak.nix b/hosts/dunamis/users/user/flatpak.nix
index 9087fd7..07f0202 100644
--- a/hosts/dunamis/users/user/flatpak.nix
+++ b/hosts/dunamis/users/user/flatpak.nix
@@ -1,4 +1,7 @@
-{
+{inputs, ...}: {
+  imports = [
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak
+  ];
   services.flatpak = {
     enable = true;
     remotes = [
diff --git a/hosts/dunamis/users/user/home-configuration.nix b/hosts/dunamis/users/user/home-configuration.nix
index 1d64e0a..9ab0c91 100644
--- a/hosts/dunamis/users/user/home-configuration.nix
+++ b/hosts/dunamis/users/user/home-configuration.nix
@@ -1,8 +1,5 @@
 {inputs, ...}: {
   imports = with inputs; [
-    nix-flatpak.homeManagerModules.nix-flatpak
-    nixvim.homeManagerModules.nixvim
-    walker.homeManagerModules.default
     self.homeModules.desktop
     self.homeModules.programs
     ./programs.nix
diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix
index 708163e..fa1c9d8 100644
--- a/hosts/sarien/configuration.nix
+++ b/hosts/sarien/configuration.nix
@@ -5,14 +5,13 @@
   ...
 }: {
   imports = with inputs; [
-    ./hardware-conf.nix
-    ./users.nix
-    ./programs.nix
-    ./system/main.nix
-    ./stylix.nix
     chaotic.nixosModules.default
     self.nixosModules.desktop
     self.nixosModules.system
+    ./hardware-conf.nix
+    ./users.nix
+    ./programs.nix
+    ./stylix.nix
   ];
   desktop = {
     hyprland.enable = true;
diff --git a/hosts/sarien/users/user/flatpak.nix b/hosts/sarien/users/user/flatpak.nix
index ad2cd10..23f31e6 100644
--- a/hosts/sarien/users/user/flatpak.nix
+++ b/hosts/sarien/users/user/flatpak.nix
@@ -1,4 +1,7 @@
-{
+{inputs, ...}: {
+  imports = [
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak
+  ];
   services.flatpak = {
     enable = true;
     remotes = [
diff --git a/hosts/sarien/users/user/home-configuration.nix b/hosts/sarien/users/user/home-configuration.nix
index 1d14bcd..83fccc0 100644
--- a/hosts/sarien/users/user/home-configuration.nix
+++ b/hosts/sarien/users/user/home-configuration.nix
@@ -1,8 +1,5 @@
 {inputs, ...}: {
   imports = with inputs; [
-    nix-flatpak.homeManagerModules.nix-flatpak
-    nixvim.homeManagerModules.nixvim
-    walker.homeManagerModules.default
     self.homeModules.desktop
     self.homeModules.programs
     ./programs.nix
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 57a9121..6f3a927 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -1,5 +1,6 @@
-{
+{inputs, ...}: {
   imports = [
+    inputs.walker.homeManagerModules.default
     ./common/xdg-userdirs.nix
     ./hyprland/default.nix
     ./niri/default.nix
diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix
index 964f959..ea7f0cd 100644
--- a/modules/home/desktop/hyprland/default.nix
+++ b/modules/home/desktop/hyprland/default.nix
@@ -1,8 +1,9 @@
 {
+  osConfig,
   config,
+  inputs,
   pkgs,
   lib,
-  osConfig,
   ...
 }: let
   cfg = config.desktop.hyprland;
diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix
index d373089..68db3ed 100644
--- a/modules/home/desktop/niri/default.nix
+++ b/modules/home/desktop/niri/default.nix
@@ -1,8 +1,9 @@
 {
+  osConfig,
   config,
+  inputs,
   pkgs,
   lib,
-  osConfig,
   ...
 }:
 with lib; let
diff --git a/modules/home/programs/editor/neve.nix b/modules/home/programs/editor/neve.nix
index 6477381..9509e5d 100644
--- a/modules/home/programs/editor/neve.nix
+++ b/modules/home/programs/editor/neve.nix
@@ -8,6 +8,9 @@
 with lib; let
   cfg = config.editor.neve;
 in {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
   options = {
     editor.neve.enable =
       mkEnableOption "enable neve neovim distribution";