diff --git a/flake.nix b/flake.nix
index 41e5029..d249326 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,8 @@
             };
           };
           home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true; 
+          home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.alyx = ./home;
         }
       ];
@@ -59,6 +60,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.maya = ./home;
         }
       ];
@@ -81,6 +83,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true; 
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.alyx = ./home;
         }
       ];
@@ -103,6 +106,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.maya = ./home;
         }
       ];
@@ -124,6 +128,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.maya = ./home;
         }
       ];
@@ -148,6 +153,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.alyx = ./home;
         }
       ];
@@ -169,6 +175,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.maya = ./home;
         }
       ];
@@ -195,6 +202,7 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.alyx = ./home;
         }
       ];
@@ -218,9 +226,35 @@
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+	  home-manager.sharedModules = [{ imports = with inputs; [ nix-index-database.hmModules.nix-index nixvim.homeManagerModules.nixvim catppuccin.homeModules.catppuccin niri.homeModules.niri ];}];
           home-manager.users.alyx = ./home;
         }
       ];
     };
+    homeConfigurations.generic = home-manager.lib.homeManagerConfiguration {
+      pkgs = import nixpkgs; # { system = "x86_64-linux"; overlays = [inputs.nixgl.overlay]; };
+      modules = [ ./home ];
+      extraSpecialArgs = { 
+        inherit inputs; 
+        vars = {
+          isNixOS = false;
+          class = "laptop";
+          user = "maya";
+	  useSyncthing = true;
+        };
+      };
+    };
+    systemConfigs.default = system-manager.lib.makeSystemConfig {
+      modules = [
+        inputs.nix-system-graphics.systemModules.default
+        ({
+          config = {
+            nixpkgs.hostPlatform = "x86_64-linux";
+            system-manager.allowAnyDistro = true;
+            system-graphics.enable = true;
+          };
+        })
+      ];
+    };
   };
 }
diff --git a/home/default.nix b/home/default.nix
index ba715c7..ecc9ccb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,15 +1,8 @@
 {config, pkgs, lib, inputs, vars, ...}:{
   imports = [
-    #home-manager modules
-    inputs.nix-index-database.hmModules.nix-index
-    inputs.nixvim.homeManagerModules.default
-    inputs.catppuccin.homeModules.catppuccin
-    inputs.niri.homeModules.niri
     #aux files to make finding specific things easier
     ./theming.nix
     ./nixvim
-    #./sway.nix
-    #./hyprland.nix
     ./niri.nix
     ./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways
   ];