From a290812085d1b3571c5f20287171b8e23ff62523 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Thu, 23 May 2024 12:02:15 +0200
Subject: [PATCH] Reduce wrapper file count

---
 wrappers/hyprlock.nix                     | 26 +++++++++++++++++++++++
 wrappers/hyprlock/default.nix             | 11 ----------
 wrappers/hyprlock/hyprlock.conf           |  9 --------
 wrappers/hyprpaper.nix                    | 20 +++++++++++++++++
 wrappers/hyprpaper/default.nix            | 11 ----------
 wrappers/hyprpaper/hyprpaper.conf         |  3 ---
 wrappers/{kitty/default.nix => kitty.nix} | 11 +++++++++-
 wrappers/kitty/kitty.conf                 |  6 ------
 8 files changed, 56 insertions(+), 41 deletions(-)
 create mode 100644 wrappers/hyprlock.nix
 delete mode 100644 wrappers/hyprlock/default.nix
 delete mode 100644 wrappers/hyprlock/hyprlock.conf
 create mode 100644 wrappers/hyprpaper.nix
 delete mode 100644 wrappers/hyprpaper/default.nix
 delete mode 100644 wrappers/hyprpaper/hyprpaper.conf
 rename wrappers/{kitty/default.nix => kitty.nix} (63%)
 delete mode 100644 wrappers/kitty/kitty.conf

diff --git a/wrappers/hyprlock.nix b/wrappers/hyprlock.nix
new file mode 100644
index 0000000..d2c06b8
--- /dev/null
+++ b/wrappers/hyprlock.nix
@@ -0,0 +1,26 @@
+{ assembleWrapper, moduleArgs, ... }:
+let
+  inherit (moduleArgs) pkgs;
+in
+assembleWrapper {
+  basePackage = pkgs.hyprlock;
+
+  flags =
+    let
+      hyprlock-config = pkgs.writeText "hyprlock-config" ''
+        background {
+          monitor =
+          path = screenshot
+          blur_size = 4
+          blur_passes = 1
+        }
+        input-field {
+          monitor =
+        }
+      '';
+    in
+    [
+      "--config"
+      hyprlock-config
+    ];
+}
diff --git a/wrappers/hyprlock/default.nix b/wrappers/hyprlock/default.nix
deleted file mode 100644
index db9645a..0000000
--- a/wrappers/hyprlock/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ assembleWrapper, moduleArgs, ... }:
-let
-  inherit (moduleArgs) pkgs;
-in
-assembleWrapper {
-  basePackage = pkgs.hyprlock;
-  flags = [
-    "--config"
-    ./hyprlock.conf
-  ];
-}
diff --git a/wrappers/hyprlock/hyprlock.conf b/wrappers/hyprlock/hyprlock.conf
deleted file mode 100644
index 4819188..0000000
--- a/wrappers/hyprlock/hyprlock.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-background {
-  monitor =
-  path = screenshot
-  blur_size = 4
-  blur_passes = 1
-}
-input-field {
-  monitor =
-}
\ No newline at end of file
diff --git a/wrappers/hyprpaper.nix b/wrappers/hyprpaper.nix
new file mode 100644
index 0000000..ccd2dff
--- /dev/null
+++ b/wrappers/hyprpaper.nix
@@ -0,0 +1,20 @@
+{ assembleWrapper, moduleArgs, ... }:
+let
+  inherit (moduleArgs) pkgs;
+in
+assembleWrapper {
+  basePackage = pkgs.hyprpaper;
+
+  flags =
+    let
+      hyprpaper-config = pkgs.writeText "hyprpaper-config" ''
+        preload = ~/Pictures/.wallpaper
+        wallpaper = , ~/Pictures/.wallpaper
+        splash = false
+      '';
+    in
+    [
+      "--config"
+      hyprpaper-config
+    ];
+}
diff --git a/wrappers/hyprpaper/default.nix b/wrappers/hyprpaper/default.nix
deleted file mode 100644
index 5634ea0..0000000
--- a/wrappers/hyprpaper/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ assembleWrapper, moduleArgs, ... }:
-let
-  inherit (moduleArgs) pkgs;
-in
-assembleWrapper {
-  basePackage = pkgs.hyprpaper;
-  flags = [
-    "--config"
-    ./hyprpaper.conf
-  ];
-}
diff --git a/wrappers/hyprpaper/hyprpaper.conf b/wrappers/hyprpaper/hyprpaper.conf
deleted file mode 100644
index 20d7e77..0000000
--- a/wrappers/hyprpaper/hyprpaper.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-preload = ~/Pictures/.wallpaper
-wallpaper = , ~/Pictures/.wallpaper
-splash = false
\ No newline at end of file
diff --git a/wrappers/kitty/default.nix b/wrappers/kitty.nix
similarity index 63%
rename from wrappers/kitty/default.nix
rename to wrappers/kitty.nix
index d616bde..453ce21 100644
--- a/wrappers/kitty/default.nix
+++ b/wrappers/kitty.nix
@@ -10,6 +10,15 @@ assembleWrapper {
 
   programs.kitty.prependFlags =
     let
+      kitty-config = pkgs.writeText "kitty-config" ''
+        font_family JetBrainsMono Nerd Font
+        background_opacity 0.85
+        cursor_shape beam
+        confirm_os_window_close 0
+        enable_audio_bell no
+        update_check_interval 0
+      '';
+
       theme-file =
         {
           dark = "default.conf";
@@ -20,7 +29,7 @@ assembleWrapper {
     in
     [
       "--config"
-      ./kitty.conf
+      kitty-config
       "--override"
       kitty-theme
     ];
diff --git a/wrappers/kitty/kitty.conf b/wrappers/kitty/kitty.conf
deleted file mode 100644
index 7adedd9..0000000
--- a/wrappers/kitty/kitty.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-font_family JetBrainsMono Nerd Font
-background_opacity 0.85
-cursor_shape beam
-confirm_os_window_close 0
-enable_audio_bell no
-update_check_interval 0
\ No newline at end of file