diff --git a/flake.nix b/flake.nix
index 7ee97e5..b404cbb 100755
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
      };  
     hyprland.url = "github:hyprwm/Hyprland";
+    flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs = { self, nixpkgs, home-manager, hyprland, ... }:
+  outputs = { self, nixpkgs, home-manager, hyprland, flake-utils, ... }:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
@@ -22,13 +23,18 @@
         tsuki = lib.nixosSystem {
           inherit system;
           modules = [
-            ./hosts/tsuki/default.nix
+            ./hosts/tsuki
             hyprland.nixosModules.default
             {programs.hyprland.enable = true;}
             home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.notoh = import ./modules/home/home.nix;
+            home-manager.users.notoh = {
+              imports = [
+                hyprland.homeManagerModules.default
+                ./modules/home/home.nix
+              ];
+            };
           }
         ];
       };
@@ -37,7 +43,7 @@
         hime = lib.nixosSystem {
           inherit system;
           modules = [
-            ./hosts/hime/default.nix
+            ./hosts/hime
         ];
       };
     };
diff --git a/modules/home/home.nix b/modules/home/home.nix
index df21f4a..dc2d32c 100755
--- a/modules/home/home.nix
+++ b/modules/home/home.nix
@@ -11,8 +11,10 @@ imports = [
   ./dunst
   ./helix
   ./git
+  ./lazygit
   ./lf
   ./waybar
+  ./wayland/hyprland
 ];
  systemd.user.startServices = "sd-switch";
  programs.home-manager.enable = true;
diff --git a/modules/home/wayland/default.nix b/modules/home/wayland/default.nix
index 59f234d..a8e8f3f 100644
--- a/modules/home/wayland/default.nix
+++ b/modules/home/wayland/default.nix
@@ -81,3 +81,4 @@ let
 
 }
 
+
diff --git a/modules/home/wayland/hyprland/config.nix b/modules/home/wayland/hyprland/config.nix
index 3e5abd1..9226162 100644
--- a/modules/home/wayland/hyprland/config.nix
+++ b/modules/home/wayland/hyprland/config.nix
@@ -1,7 +1,5 @@
 {
   config,
-  pkgs,
-  default,
   ...
 }: {
   wayland.windowManager.hyprland.extraConfig = ''