From eb9ba2a7a4d3c234498059764e37af17cb21a647 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 5 Feb 2024 22:46:43 -0500
Subject: [PATCH] refactor(greetd): move ags conf into ags module

---
 .../greetd.js => ags/config/greeter.ts}       | 10 +-
 modules/ags/config/js/utils.js                |  4 +-
 modules/greetd/default.nix                    | 92 +++++++++++--------
 3 files changed, 64 insertions(+), 42 deletions(-)
 rename modules/{greetd/greetd.js => ags/config/greeter.ts} (84%)

diff --git a/modules/greetd/greetd.js b/modules/ags/config/greeter.ts
similarity index 84%
rename from modules/greetd/greetd.js
rename to modules/ags/config/greeter.ts
index f41ecd58..2d0df2e2 100644
--- a/modules/greetd/greetd.js
+++ b/modules/ags/config/greeter.ts
@@ -3,18 +3,20 @@ const greetd = await Service.import('greetd');
 const name = Widget.Entry({
     placeholder_text: 'Username',
     on_accept: () => password.grab_focus(),
-})
+});
 
 const password = Widget.Entry({
     placeholder_text: 'Password',
     visibility: false,
     on_accept: () => {
         greetd.login(name.text || '', password.text || '', 'Hyprland')
-            .catch(err => response.label = JSON.stringify(err))
+            .catch((err) => {
+                response.label = JSON.stringify(err);
+            });
     },
-})
+});
 
-const response = Widget.Label()
+const response = Widget.Label();
 
 const win = Widget.Window({
     css: 'background-color: transparent;',
diff --git a/modules/ags/config/js/utils.js b/modules/ags/config/js/utils.js
index 2a5be44e..e38ff949 100644
--- a/modules/ags/config/js/utils.js
+++ b/modules/ags/config/js/utils.js
@@ -32,7 +32,9 @@ export const transpileTypeScript = async(host) => {
         '--external', '*/fzf.es.js',
     ]).catch(print);
 
-    watchAndCompileSass(host);
+    if (host !== 'greeter') {
+        watchAndCompileSass(host);
+    }
 
     // The file is going to be there after transpilation
     // @ts-ignore
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index 8d149c58..0605ac2e 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -11,45 +11,40 @@
   isNvidia = config.hardware.nvidia.modesetting.enable;
   isTouchscreen = config.hardware.sensor.iio.enable;
 
-  hyprland =
-    config
-    .home-manager
-    .users
-    .${mainUser}
-    .wayland
-    .windowManager
-    .hyprland
-    .finalPackage;
-  hyprBin = "${hyprland}/bin";
-
+  hyprland = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
   ags = config.home-manager.users.${mainUser}.programs.ags.package;
-  agsBin = "${ags}/bin";
 
   # Show Regreet on all monitors
-  dupeMonitors = pkgs.writeShellScriptBin "dupeMonitors" ''
-    main="${mainMonitor}"
-    names=($(${hyprBin}/hyprctl -j monitors | ${pkgs.jq}/bin/jq -r '.[] .description'))
+  dupeMonitors = pkgs.writeShellApplication {
+    name = "dupeMonitors";
+    runtimeInputs = [hyprland pkgs.jq];
+    text = ''
+      main="${mainMonitor}"
+      names="($(hyprctl -j monitors | jq -r '.[] .description'))"
 
-    if [[ "$main" == "null" ]]; then
-        main="''${names[0]}"
-    fi
+      if [[ "$main" == "null" ]]; then
+          main="''${names[0]}"
+      fi
 
-    for (( i=0; i<''${#names[@]}; i++ )); do
+      for (( i=0; i<''${#names[@]}; i++ )); do
 
-        name=$(echo "''${names[$i]}" | sed 's/.*(\(.*\))/\1/')
-        desc=$(echo "''${names[$i]}" | sed 's/ (.*//')
+          # shellcheck disable=SC2001
+          name=$(echo "''${names[$i]}" | sed 's/.*(\(.*\))/\1/')
+          # shellcheck disable=SC2001
+          desc=$(echo "''${names[$i]}" | sed 's/ (.*//')
 
-        if [[ "$name" != "$main" && "desc:$desc" != "$main" ]]; then
-          ${hyprBin}/hyprctl keyword monitor "$name",preferred,auto,1,mirror,"$main"
-        fi
-    done
-  '';
+          if [[ "$name" != "$main" && "desc:$desc" != "$main" ]]; then
+              hyprctl keyword monitor "$name",preferred,auto,1,mirror,"$main"
+          fi
+      done
+    '';
+  };
 
   # Check if user wants the greeter only on main monitor
   setupMonitors =
     if (mainMonitor != "null" && !greetdDupe)
-    then "${hyprBin}/hyprctl dispatch focusmonitor ${mainMonitor}"
-    else "${dupeMonitors}/bin/dupeMonitors";
+    then "hyprctl dispatch focusmonitor ${mainMonitor}"
+    else "dupeMonitors";
 
   # Setup Hyprland as the greeter's compositor
   hyprConf =
@@ -68,8 +63,7 @@
 
         "${readFile ./hyprland.conf}\n"
 
-        "exec-once = ${agsBin}/ags -b greeter --config ${./greetd.js};"
-        "    ${hyprBin}/hyprctl dispatch exit"
+        "exec-once = ags -b greeter; hyprctl dispatch exit"
       ]));
 in {
   # Add home folder for home-manager to work
@@ -84,11 +78,35 @@ in {
       ../../home/theme.nix
     ];
 
-    home.packages = with pkgs; [
-      swww
-      gtk3
-      glib
-    ];
+    home = {
+      packages = [
+        hyprland
+        ags
+        dupeMonitors
+        pkgs.bun
+        pkgs.sassc
+        pkgs.swww
+        pkgs.gtk3
+        pkgs.glib
+      ];
+
+      file = {
+        ".config/ags" = {
+          source = ../ags/config;
+          recursive = true;
+        };
+
+        ".config/ags/config.js".text =
+          /*
+          javascript
+          */
+          ''
+            import { transpileTypeScript } from './js/utils.js';
+
+            export default (await transpileTypeScript('greeter')).default;
+          '';
+      };
+    };
 
     vars = config.vars;
     home.stateVersion = "24.05";
@@ -108,12 +126,12 @@ in {
       enable = true;
       settings = {
         default_session = {
-          command = "${hyprBin}/Hyprland --config ${hyprConf}";
+          command = "Hyprland --config ${hyprConf}";
           user = "greeter";
         };
 
         initial_session = {
-          command = "${hyprBin}/Hyprland";
+          command = "Hyprland";
           user = mainUser;
         };
       };