From 296123651c33ffc775eb2a5c641f60962b90849a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 1 Mar 2024 03:18:37 +0000
Subject: [PATCH] sway: fold `sway-config.nix` into `default.nix`

---
 hosts/common/programs/sway/default.nix     | 14 +++++++++++---
 hosts/common/programs/sway/sway-config.nix | 16 ----------------
 2 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 hosts/common/programs/sway/sway-config.nix

diff --git a/hosts/common/programs/sway/default.nix b/hosts/common/programs/sway/default.nix
index 72fdbd1d..d5fd6c4f 100644
--- a/hosts/common/programs/sway/default.nix
+++ b/hosts/common/programs/sway/default.nix
@@ -153,9 +153,17 @@ in
       default=wlr;gtk
     '';
 
-    fs.".config/sway/config".symlink.target = pkgs.callPackage ./sway-config.nix {
-      inherit config;
-      swayCfg = cfg.config;
+    fs.".config/sway/config".symlink.target = pkgs.substituteAll {
+      src = ./sway-config;
+      inherit (cfg.config)
+        background
+        extra_lines
+        screenshot_cmd
+        font
+        mod
+        workspace_layout
+      ;
+      xwayland = if config.sane.programs.xwayland.enabled then "enable" else "disable";
     };
 
     services.sway-session = {
diff --git a/hosts/common/programs/sway/sway-config.nix b/hosts/common/programs/sway/sway-config.nix
deleted file mode 100644
index 2e947947..00000000
--- a/hosts/common/programs/sway/sway-config.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config
-, substituteAll
-, swayCfg
-}:
-substituteAll {
-  src = ./sway-config;
-  inherit (swayCfg)
-    background
-    extra_lines
-    screenshot_cmd
-    font
-    mod
-    workspace_layout
-  ;
-  xwayland = if config.sane.programs.xwayland.enabled then "enable" else "disable";
-}