From eb89e60c023c8626348407c706bd1a7f6e6ce28f Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Tue, 7 May 2024 18:06:01 +0200
Subject: [PATCH] Use a template for the wrappers

---
 wrappers/default.nix  | 18 ++++++++++++++----
 wrappers/marktext.nix | 21 +++++----------------
 wrappers/obsidian.nix | 21 +++++----------------
 wrappers/spotify.nix  | 21 +++++----------------
 4 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/wrappers/default.nix b/wrappers/default.nix
index dbf5708..3754fe1 100644
--- a/wrappers/default.nix
+++ b/wrappers/default.nix
@@ -3,10 +3,20 @@
     pkgs,
     lib,
     ...
-}: {
+}: let
+    assembleWrapper = wrapperName: wrapperConfig:
+        (inputs.wrapper-manager.lib {
+            inherit pkgs;
+            modules = [{wrappers.${wrapperName} = wrapperConfig;}];
+        })
+        .config
+        .wrappers
+        .${wrapperName}
+        .wrapped;
+in {
     _module.args.myWrappers = {
-        spotify = import ./spotify.nix {inherit inputs pkgs lib;};
-        obsidian = import ./obsidian.nix {inherit inputs pkgs lib;};
-        marktext = import ./marktext.nix {inherit inputs pkgs lib;};
+        spotify = import ./spotify.nix {inherit assembleWrapper pkgs lib;};
+        obsidian = import ./obsidian.nix {inherit assembleWrapper pkgs lib;};
+        marktext = import ./marktext.nix {inherit assembleWrapper pkgs lib;};
     };
 }
diff --git a/wrappers/marktext.nix b/wrappers/marktext.nix
index 81e0dfc..94a4bcc 100644
--- a/wrappers/marktext.nix
+++ b/wrappers/marktext.nix
@@ -1,21 +1,10 @@
 {
-    inputs,
+    assembleWrapper,
     pkgs,
     lib,
     ...
 }: {disableGPU ? false}:
-(inputs.wrapper-manager.lib {
-    inherit pkgs;
-    modules = [
-        {
-            wrappers.marktext = {
-                basePackage = pkgs.marktext;
-                flags = [(lib.mkIf disableGPU "--disable-gpu")];
-            };
-        }
-    ];
-})
-.config
-.wrappers
-.marktext
-.wrapped
+assembleWrapper "marktext" {
+    basePackage = pkgs.marktext;
+    flags = [(lib.mkIf disableGPU "--disable-gpu")];
+}
diff --git a/wrappers/obsidian.nix b/wrappers/obsidian.nix
index 94b8d3f..e91c129 100644
--- a/wrappers/obsidian.nix
+++ b/wrappers/obsidian.nix
@@ -1,21 +1,10 @@
 {
-    inputs,
+    assembleWrapper,
     pkgs,
     lib,
     ...
 }: {disableGPU ? false}:
-(inputs.wrapper-manager.lib {
-    inherit pkgs;
-    modules = [
-        {
-            wrappers.obsidian = {
-                basePackage = pkgs.obsidian;
-                flags = [(lib.mkIf disableGPU "--disable-gpu")];
-            };
-        }
-    ];
-})
-.config
-.wrappers
-.obsidian
-.wrapped
+assembleWrapper "obsidian" {
+    basePackage = pkgs.obsidian;
+    flags = [(lib.mkIf disableGPU "--disable-gpu")];
+}
diff --git a/wrappers/spotify.nix b/wrappers/spotify.nix
index 4ef9c0e..38ca3f7 100644
--- a/wrappers/spotify.nix
+++ b/wrappers/spotify.nix
@@ -1,21 +1,10 @@
 {
-    inputs,
+    assembleWrapper,
     pkgs,
     lib,
     ...
 }: {disableGPU ? false}:
-(inputs.wrapper-manager.lib {
-    inherit pkgs;
-    modules = [
-        {
-            wrappers.spotify = {
-                basePackage = pkgs.spotify;
-                flags = [(lib.mkIf disableGPU "--disable-gpu")];
-            };
-        }
-    ];
-})
-.config
-.wrappers
-.spotify
-.wrapped
+assembleWrapper "spotify" {
+    basePackage = pkgs.spotify;
+    flags = [(lib.mkIf disableGPU "--disable-gpu")];
+}