refactor

modules/capabilities/terminal.nix

@@ -1,6 +1,7 @@
 { lib, config, ... }:
 let
-  facts = config.facts;
+  kanagawa = import ./_kanagawa.nix;
+  homeModules = config.flake.modules.homeManager;
 
   kittySingleInstance =
     pkgs:
@@ -25,13 +26,12 @@ in
       ...
     }:
     let
-      palette = facts.theme.kanagawa.palette;
+      palette = kanagawa.palette;
       hex = lib.removePrefix "#";
     in
     {
       programs.foot = {
         enable = true;
-        package = pkgs.foot;
         settings = {
           main = {
             font = "JetBrains Mono:style=Medium:size=11:fontfeatures=-liga:fontfeatures=-calt";
@@ -86,7 +86,7 @@ in
   flake.modules.homeManager.terminal-kitty =
     { pkgs, ... }:
     let
-      theme = facts.theme.kanagawa;
+      theme = kanagawa;
       palette = theme.palette;
       kitty = kittySingleInstance pkgs;
     in
@@ -167,11 +167,11 @@ in
     };
 
   flake.modules.homeManager.primary-terminal-foot =
-    { lib, pkgs, ... }:
+    { config, lib, ... }:
     {
-      imports = [ config.flake.modules.homeManager.terminal-foot ];
+      imports = [ homeModules.terminal-foot ];
 
-      facts.desktop.terminalCommand = lib.getExe pkgs.foot;
+      desktop.commands.terminal = [ (lib.getExe config.programs.foot.package) ];
 
       xdg.terminal-exec = {
         enable = true;
@@ -180,14 +180,11 @@ in
     };
 
   flake.modules.homeManager.primary-terminal-kitty =
-    { lib, pkgs, ... }:
-    let
-      kitty = kittySingleInstance pkgs;
-    in
+    { config, lib, ... }:
     {
-      imports = [ config.flake.modules.homeManager.terminal-kitty ];
+      imports = [ homeModules.terminal-kitty ];
 
-      facts.desktop.terminalCommand = lib.getExe kitty;
+      desktop.commands.terminal = [ (lib.getExe config.programs.kitty.package) ];
 
       xdg.terminal-exec = {
         enable = true;