10 files changed, 76 insertions, 6 deletions
diff --git a/modules/terminal/alacritty.nix b/modules/apps/alacritty.nix
index 27a8150..b50e142 100644
--- a/modules/terminal/alacritty.nix
+++ b/modules/apps/alacritty.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.terminal;
+  cfg = config.apps;
 in {
   config = mkIf cfg.alacritty {
     default.terminal = lib.mkDefault "alacritty";
diff --git a/modules/apps/astal.nix b/modules/apps/astal.nix
new file mode 100644
index 0000000..e57263e
--- /dev/null
+++ b/modules/apps/astal.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  config,
+  pkgs,
+  inputs,
+  system,
+  ...
+}: let
+  astal = inputs.self.packages.${system};
+  inherit (lib) mkIf;
+  cfg = config.apps;
+in {
+  config = mkIf cfg.astal {
+    default.appLauncher = lib.mkDefault "astal-launcher";
+
+    home-manager.users.${config.user} = {
+      home.packages = [
+        astal.astal.shell
+        astal.astal.launcher
+      ];
+
+      systemd.user.services.astal = {
+        Unit = {
+          Description = "Custom Gtk Lua Shell.";
+          PartOf = [
+            config.default.session
+            "tray.target"
+          ];
+          After = [config.default.session];
+          ConditionEnvironment = "WAYLAND_DISPLAY";
+        };
+
+        Service = {
+          ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
+          ExecStart = "${astal.astal.shell}/bin/astal-shell";
+          KillMode = "mixed";
+          Restart = "on-failure";
+        };
+
+        Install.WantedBy = [
+          config.default.session
+          "tray.target"
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
new file mode 100644
index 0000000..7100897
--- /dev/null
+++ b/modules/apps/default.nix
@@ -0,0 +1,23 @@
+{lib, ...}: let
+  inherit (lib) mkEnableOption;
+in {
+  imports = [
+    ./waybar
+    ./wofi
+    ./alacritty.nix
+    ./astal.nix
+    ./hyprlock.nix
+    ./kitty.nix
+    ./mako.nix
+  ];
+
+  options.apps = {
+    alacritty = mkEnableOption "Enable the alacritty terminal.";
+    astal = mkEnableOption "Enable the astal gtk shell.";
+    kitty = mkEnableOption "Enable the kitty terminal.";
+    mako = mkEnableOption "Enable the mako notification daemon.";
+    hyprlock = mkEnableOption "Enable the hyprlock lockscreen.";
+    waybar = mkEnableOption "Enable the waybar bar.";
+    wofi = mkEnableOption "Enable the wofi launcher.";
+  };
+}
diff --git a/modules/desktop/hyprlock.nix b/modules/apps/hyprlock.nix
index 8be2856..4a844e3 100644
--- a/modules/desktop/hyprlock.nix
+++ b/modules/apps/hyprlock.nix
@@ -9,7 +9,7 @@
   trans = "rgba(0,0,0,0)";
 
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.apps;
 in {
   config = mkIf cfg.hyprlock {
     default.lockScreen = lib.mkDefault "hyprlock";
diff --git a/modules/terminal/kitty.nix b/modules/apps/kitty.nix
index cee0e72..03f981a 100644
--- a/modules/terminal/kitty.nix
+++ b/modules/apps/kitty.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.terminal;
+  cfg = config.apps;
 in {
   config = mkIf cfg.kitty {
     default.terminal = lib.mkDefault "kitty";
diff --git a/modules/desktop/mako.nix b/modules/apps/mako.nix
index 5a24e56..62e5712 100644
--- a/modules/desktop/mako.nix
+++ b/modules/apps/mako.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.apps;
 in {
   config = mkIf cfg.mako {
     home-manager.users.${config.user} = {
diff --git a/modules/desktop/waybar/default.nix b/modules/apps/waybar/default.nix
index c2d6927..ecbbcd4 100644
--- a/modules/desktop/waybar/default.nix
+++ b/modules/apps/waybar/default.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.apps;
 in {
   config = mkIf cfg.waybar {
     home-manager.users.${config.user} = {
diff --git a/modules/desktop/waybar/style.nix b/modules/apps/waybar/style.nix
index 21a8de5..21a8de5 100644
--- a/modules/desktop/waybar/style.nix
+++ b/modules/apps/waybar/style.nix
diff --git a/modules/desktop/wofi/default.nix b/modules/apps/wofi/default.nix
index aa04495..6036dd1 100644
--- a/modules/desktop/wofi/default.nix
+++ b/modules/apps/wofi/default.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.apps;
 in {
   config = mkIf cfg.wofi {
     default.appLauncher = lib.mkDefault "wofi --show drun --prompt 'Seach Programs'";
diff --git a/modules/desktop/wofi/style.nix b/modules/apps/wofi/style.nix
index 75a0a21..75a0a21 100644
--- a/modules/desktop/wofi/style.nix
+++ b/modules/apps/wofi/style.nix