From 6f7991184dc95d54200dc9651fc725dd1b1033c6 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Tue, 27 Feb 2024 19:08:53 +0300
Subject: [PATCH] home/wm: simplify xmonad project settings

---
 home/modules/window_manager/xmonad.nix      |  33 +++++++++++++++++---
 nixos/hosts/home/xmonad_projects.secret.nix | Bin 914 -> 1544 bytes
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/home/modules/window_manager/xmonad.nix b/home/modules/window_manager/xmonad.nix
index 1292284..e14a742 100644
--- a/home/modules/window_manager/xmonad.nix
+++ b/home/modules/window_manager/xmonad.nix
@@ -9,18 +9,41 @@ let
       name = mkOption {
         type = types.str;
       };
-      startHook = mkOption {
-        type = types.lines;
+      workdir = mkOption {
+        type = types.str;
+      };
+      windowCount = mkOption {
+        type = types.ints.positive;
+        default = 1;
+      };
+      terminalCommands = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+      };
+      spawnPrograms = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
       };
     };
-
   };
 
-  mkXmonadProject = { name, startHook }:
+  mkXmonadProjectSpawnProgram = program:
+    "spawn \"${program}\"";
+
+  mkXmonadProjectTerminalCommand = command:
+    "spawn $ terminal' workdir $ Just \"${command}\"";
+
+
+  mkXmonadProject = { name, workdir, windowCount, spawnPrograms, terminalCommands }:
     ''
       Project {
         projectName = "${name}",
-        projectStartHook = ${startHook}
+        projectStartHook =
+          do
+            let workdir = "${workdir}"
+            ${lib.concatStringsSep "\n" (map mkXmonadProjectSpawnProgram spawnPrograms)}
+            ${lib.concatStringsSep "\n" (map mkXmonadProjectTerminalCommand terminalCommands)}
+            replicateM_ ${toString windowCount} $ spawn $ terminal workdir
       }
     '';
 
diff --git a/nixos/hosts/home/xmonad_projects.secret.nix b/nixos/hosts/home/xmonad_projects.secret.nix
index da2efeabae85e028b37803fd6f1420e5eb69d168..81343466560a1216655867751ec4616236cc0936 100644
GIT binary patch
literal 1544
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

literal 914
zcmV;D18w{OM@dveQdv+`08n^jY{91|T4$5!=$L{!+hOKNls&808ggjMeY7Z<h@vlu
z3^%>oQQ2&~d7z;1<dOl*wv6&k5i#UH+`w_}5_HFH!`~4jc@CcyzKFqkWs2P*a~)>d
z&eg~LVR5rC7lrMHlrYWj5PyV@wk<NZ_}t`r*}J0uVNTG2c62g-*wkG26*lXb&3i{c
z9hmOzNH9o!o;AqA8(F;$)CcmkaP>E5buh5@T4<CbD^JcN)G=<OjlkZ@!?V=pKuV-F
z7KdMB{AG(7o?;kWj?;il#&UP&An-tbEax^vLB%vw=Rvw6O>jub&&tmrI=tdV?6qk)
zvH=M2NhbPz69e7Thpl8norzb4gw9s}zu@6TR-r14CDZ9N({i^U(S%`)h%GWEuL#2s
zPd?D^A9WO%%3BfDcS1OM)PjlDVNB&Icg@=PFT0^d!hEMaUgq>`RA8IW(L~}Zp*Ji3
zFbuB^%rv@WsjQ)U97{AkoJ=hAhl&AXKkrlXC!$f5Av`YcS5gY0dJa&RT|;L0X;u4~
zTL}z8JbEQ@AwLB)`q${;woP9Po{g5#{H@tBP9Z9u)F>Kua}n%VuDL-s&kTyAfP`;j
zB^(ib-JAEy=iW+LyX-h|_rwu2_aG6#>ZC*Tyx$(LsJcA{RuyweU!JD#ykJm(LMDsX
zCbo#w7~pT=qQIWT^L+lmMKqN#E-7-l9w+cK4hV`CI*p$iQ0SsX2WPm-7_T13T^hBy
zj~Ek~vpqUp7D-Ekg?1R~u}km0euuL=2g~>xUsT>hr_`%1=5Qct@&ZTx;VLPCU!3u6
z|H0C27*#-%B~Fbs=WCf2bA=?~Jkx_`KYSd=uo=ZiO|M5k>zZOt8^yi_7w1kglx4Xo
zkej1>r)fPHicZ9cP3JKO*LZXo5F4O|E!M_N_f16JPmeamUQvi_dNdnfZEB_%;I^e%
zI?lkbz=wyF6ZV{<*SD9KNrw`%=!$}=!rn-e7>~M*tN!q40HaVpif*GhEJecFGBDR)
zkv|#|rWQF{9?3<rOO?1bJ`CPk5XHZpHiCmvR!-}OeZmmNL*byGT&WlcBnr(3SceZg
zZ7zHDzVGElUJsR@X+DEOw%iwCaOR1}1-^W}(<u8BH5Ez~gA26yOrWMCLu<)y%)}0s
oo5Egj{FQC;8^;R0jPA3-dzd*u#E`lJtB#llY+Y)*jl5;IR<B9DSpWb4