diff --git a/nixos/ags/home.nix b/nixos/ags/home.nix
new file mode 100644
index 0000000..dc3f237
--- /dev/null
+++ b/nixos/ags/home.nix
@@ -0,0 +1,45 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.my.ags;
+in {
+  imports = [inputs.ags.homeManagerModules.default];
+
+  options.my.ags = {
+    enable = mkEnableOption "ags";
+  };
+
+  config = mkIf cfg.enable {
+    programs.ags = {
+      enable = true;
+
+      extraPackages = with pkgs; [
+        bun
+        which
+        fzf
+        # inputs.matugen.packages.${system}.default
+        slurp
+        wf-recorder
+        wl-clipboard
+        wayshot
+        swappy
+        hyprpicker
+        pavucontrol
+        networkmanager
+        gtk3
+      ];
+    };
+
+    home.packages = with pkgs; [
+      brightnessctl
+      fd
+      dart-sass
+      swww
+    ];
+  };
+}
diff --git a/nixos/hyprland/home.nix b/nixos/hyprland/home.nix
index d29285e..d8620d5 100644
--- a/nixos/hyprland/home.nix
+++ b/nixos/hyprland/home.nix
@@ -17,6 +17,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    my.ags.enable = true;
     my.wofi.enable = true;
 
     home.packages = with pkgs; [
@@ -47,6 +48,7 @@ in {
         };
         exec-once = [
           "hyprctl setcursor Adwaita 24"
+          "ags"
           "swaybg -i /home/michael/Photos/wallpaper.jpg"
           "hypridle"
         ];
diff --git a/user/environments/nixos/home.nix b/user/environments/nixos/home.nix
index 4ef8f66..a70fec6 100644
--- a/user/environments/nixos/home.nix
+++ b/user/environments/nixos/home.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ../../modules/ags
     ../../modules/dev.nix
     ../../modules/firefox.nix
     ../../modules/fonts.nix
diff --git a/user/modules/ags/default.nix b/user/modules/ags/default.nix
deleted file mode 100644
index adab4d1..0000000
--- a/user/modules/ags/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = [inputs.ags.homeManagerModules.default];
-
-  programs.ags = {
-    enable = true;
-
-    extraPackages = with pkgs; [
-      bun
-      which
-      dart-sass
-      fd
-      fzf
-      brightnessctl
-      swww
-      # inputs.matugen.packages.${system}.default
-      slurp
-      wf-recorder
-      wl-clipboard
-      wayshot
-      swappy
-      hyprpicker
-      pavucontrol
-      networkmanager
-      gtk3
-    ];
-  };
-}