From a0926c393ce9674b514d32b5e3482c57edc28821 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 17 Dec 2024 22:22:13 -0600
Subject: [PATCH 1/2] services/skhd: cleanup

---
 modules/services/skhd/default.nix | 45 ++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/modules/services/skhd/default.nix b/modules/services/skhd/default.nix
index 1f5d0cf6..69c28a1a 100644
--- a/modules/services/skhd/default.nix
+++ b/modules/services/skhd/default.nix
@@ -1,26 +1,29 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.services.skhd;
-in
 
+  inherit (lib) mkOption types;
+in
 {
-  options = {
-    services.skhd.enable = mkOption {
+  options.services.skhd = {
+    enable = mkOption {
       type = types.bool;
       default = false;
       description = "Whether to enable the skhd hotkey daemon.";
     };
 
-    services.skhd.package = mkOption {
+    package = mkOption {
       type = types.package;
       default = pkgs.skhd;
       description = "This option specifies the skhd package to use.";
     };
 
-    services.skhd.skhdConfig = mkOption {
+    skhdConfig = mkOption {
       type = types.lines;
       default = "";
       example = "alt + shift - r   :   chunkc quit";
@@ -28,19 +31,25 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
-
-    environment.etc."skhdrc".text = cfg.skhdConfig;
+  config = lib.mkIf cfg.enable {
+    environment = {
+      systemPackages = [ cfg.package ];
+      etc."skhdrc".text = cfg.skhdConfig;
+    };
 
     launchd.user.agents.skhd = {
       path = [ config.environment.systemPath ];
 
-      serviceConfig.ProgramArguments = [ "${cfg.package}/bin/skhd" ]
-        ++ optionals (cfg.skhdConfig != "") [ "-c" "/etc/skhdrc" ];
-      serviceConfig.KeepAlive = true;
-      serviceConfig.ProcessType = "Interactive";
+      serviceConfig = {
+        ProgramArguments =
+          [ "${cfg.package}/bin/skhd" ]
+          ++ lib.optionals (cfg.skhdConfig != "") [
+            "-c"
+            "/etc/skhdrc"
+          ];
+        KeepAlive = true;
+        ProcessType = "Interactive";
+      };
     };
-
   };
 }

From 14bf3ebeaf32fafbb4490b7da314e8378038b81b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 17 Dec 2024 22:24:22 -0600
Subject: [PATCH 2/2] services/skhd: add logfile

---
 modules/services/skhd/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/services/skhd/default.nix b/modules/services/skhd/default.nix
index 69c28a1a..a2dea31b 100644
--- a/modules/services/skhd/default.nix
+++ b/modules/services/skhd/default.nix
@@ -29,6 +29,20 @@ in
       example = "alt + shift - r   :   chunkc quit";
       description = "Config to use for {file}`skhdrc`.";
     };
+
+    errorLogFile = mkOption {
+      type = types.path;
+      default = "/tmp/skhd.err.log";
+      example = "/Users/khaneliman/Library/Logs/skhd.log";
+      description = "Path to the error log file.";
+    };
+
+    outLogFile = mkOption {
+      type = types.path;
+      default = "/tmp/skhd.out.log";
+      example = "/Users/khaneliman/Library/Logs/skhd.log";
+      description = "Path to the stdout log file.";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -49,6 +63,8 @@ in
           ];
         KeepAlive = true;
         ProcessType = "Interactive";
+        StandardErrorPath = cfg.errorLogFile;
+        StandardOutPath = cfg.outLogFile;
       };
     };
   };