From dd5653a00aaf8249f8951689f0c689cf64d017a5 Mon Sep 17 00:00:00 2001
From: Norbert Melzer <timmelzer@gmail.com>
Date: Sun, 10 Sep 2023 00:33:48 +0200
Subject: [PATCH] chore: use proper icon files

---
 packages/installer/awesome.nix               | 55 +++-----------------
 packages/installer/icons/globe.svg           |  4 ++
 packages/installer/icons/manual.svg          |  4 ++
 packages/installer/{ => icons}/nix-flake.svg |  0
 packages/installer/icons/parted.svg          |  5 ++
 packages/installer/icons/power-off.svg       |  4 ++
 packages/installer/icons/reboot.svg          |  4 ++
 packages/installer/icons/terminal.svg        |  4 ++
 8 files changed, 33 insertions(+), 47 deletions(-)
 create mode 100644 packages/installer/icons/globe.svg
 create mode 100644 packages/installer/icons/manual.svg
 rename packages/installer/{ => icons}/nix-flake.svg (100%)
 create mode 100644 packages/installer/icons/parted.svg
 create mode 100644 packages/installer/icons/power-off.svg
 create mode 100644 packages/installer/icons/reboot.svg
 create mode 100644 packages/installer/icons/terminal.svg

diff --git a/packages/installer/awesome.nix b/packages/installer/awesome.nix
index fcbc724b..80bb6cb6 100644
--- a/packages/installer/awesome.nix
+++ b/packages/installer/awesome.nix
@@ -7,57 +7,18 @@
   rc_lua = pkgs.runCommandNoCC "awesomerc.lua" {} ''
     substitute ${./awesomerc.lua} $out \
       --subst-var-by FILE_PATH_WALLPAPER ${./nix-glow-black.png} \
-      --subst-var-by TERMINAL_ICON_SVG   ${terminalIcon} \
-      --subst-var-by GLOBE_ICON_SVG      ${globeIcon} \
-      --subst-var-by PARTED_ICON_SVG     ${partedIcon} \
-      --subst-var-by NIX_FLAKE_SVG       ${./nix-flake.svg}
-  '';
-
-  fillColor = "#d3d3d3";
-
-  terminalIcon = pkgs.writeText "terminal.svg" ''
-    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-      <path fill="${fillColor}" d="M20 4H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16c1.1 0 2-.9 2-2V6a2 2 0 0 0-2-2zm0 14H4V8h16v10zm-2-1h-6v-2h6v2zM7.5 17l-1.41-1.41L8.67 13l-2.59-2.59L7.5 9l4 4l-4 4z"/>
-    </svg>
-  '';
-
-  globeIcon = pkgs.writeText "globe.svg" ''
-    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-      <path fill="${fillColor}" d="M16.36 14c.08-.66.14-1.32.14-2c0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2m-5.15 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95a8.03 8.03 0 0 1-4.33 3.56M14.34 14H9.66c-.1-.66-.16-1.32-.16-2c0-.68.06-1.35.16-2h4.68c.09.65.16 1.32.16 2c0 .68-.07 1.34-.16 2M12 19.96c-.83-1.2-1.5-2.53-1.91-3.96h3.82c-.41 1.43-1.08 2.76-1.91 3.96M8 8H5.08A7.923 7.923 0 0 1 9.4 4.44C8.8 5.55 8.35 6.75 8 8m-2.92 8H8c.35 1.25.8 2.45 1.4 3.56A8.008 8.008 0 0 1 5.08 16m-.82-2C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2c0 .68.06 1.34.14 2M12 4.03c.83 1.2 1.5 2.54 1.91 3.97h-3.82c.41-1.43 1.08-2.77 1.91-3.97M18.92 8h-2.95a15.65 15.65 0 0 0-1.38-3.56c1.84.63 3.37 1.9 4.33 3.56M12 2C6.47 2 2 6.5 2 12a10 10 0 0 0 10 10a10 10 0 0 0 10-10A10 10 0 0 0 12 2Z"/>
-    </svg>
-  '';
-
-  partedIcon = pkgs.writeText "parted.svg" ''
-    <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-      <path fill="${fillColor}" d="M13 30a11 11 0 0 1 0-22a1 1 0 0 1 1 1v9h9a1 1 0 0 1 1 1a11 11 0 0 1-11 11Zm-1-19.94A9 9 0 1 0 21.94 20H14a2 2 0 0 1-2-2Z"/>
-      <path fill="${fillColor}" d="M28 14h-9a2 2 0 0 1-2-2V3a1 1 0 0 1 1-1a11 11 0 0 1 11 11a1 1 0 0 1-1 1Zm-9-2h7.94A9 9 0 0 0 19 4.06Z"/>]] ..
-    </svg>
-  '';
-
-  powerOffIcon = pkgs.writeText "poweroff.svg" ''
-    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-      <path fill="#ff0000" d="m16.56 5.44l-1.45 1.45A5.969 5.969 0 0 1 18 12a6 6 0 0 1-6 6a6 6 0 0 1-6-6c0-2.17 1.16-4.06 2.88-5.12L7.44 5.44A7.961 7.961 0 0 0 4 12a8 8 0 0 0 8 8a8 8 0 0 0 8-8c0-2.72-1.36-5.12-3.44-6.56M13 3h-2v10h2"/>
-    </svg>
-  '';
-
-  rebootIcon = pkgs.writeText "reboot.svg" ''
-    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-      <path fill="#ff0000" d="M12 4c2.1 0 4.1.8 5.6 2.3c3.1 3.1 3.1 8.2 0 11.3c-1.8 1.9-4.3 2.6-6.7 2.3l.5-2c1.7.2 3.5-.4 4.8-1.7c2.3-2.3 2.3-6.1 0-8.5C15.1 6.6 13.5 6 12 6v4.6l-5-5l5-5V4M6.3 17.6C3.7 15 3.3 11 5.1 7.9l1.5 1.5c-1.1 2.2-.7 5 1.2 6.8c.5.5 1.1.9 1.8 1.2l-.6 2c-1-.4-1.9-1-2.7-1.8Z"/>
-    </svg>
-  '';
-
-  manualIcon = pkgs.writeText "manual.svg" ''
-    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-      <path fill="${fillColor}" d="M17.5 14.33c.79 0 1.63.08 2.5.24v1.5c-.62-.16-1.46-.24-2.5-.24c-1.9 0-3.39.33-4.5.99v-1.69c1.17-.53 2.67-.8 4.5-.8M13 12.46c1.29-.53 2.79-.79 4.5-.79c.79 0 1.63.07 2.5.23v1.5c-.62-.16-1.46-.24-2.5-.24c-1.9 0-3.39.34-4.5.99m4.5-3.65c-1.9 0-3.39.32-4.5 1V9.84c1.23-.56 2.73-.84 4.5-.84c.79 0 1.63.08 2.5.23v1.55c-.74-.19-1.59-.28-2.5-.28m3.5 8V7c-1.04-.33-2.21-.5-3.5-.5c-2.05 0-3.88.5-5.5 1.5v11.5c1.62-1 3.45-1.5 5.5-1.5c1.19 0 2.36.16 3.5.5m-3.5-14c2.35 0 4.19.5 5.5 1.5v14.56c0 .12-.05.24-.16.35c-.11.09-.23.17-.34.17c-.11 0-.19-.02-.25-.05c-1.28-.69-2.87-1.03-4.75-1.03c-2.05 0-3.88.5-5.5 1.5c-1.34-1-3.17-1.5-5.5-1.5c-1.66 0-3.25.36-4.75 1.07c-.03.01-.07.01-.12.03c-.04.01-.08.02-.13.02c-.11 0-.23-.04-.34-.12a.475.475 0 0 1-.16-.35V6c1.34-1 3.18-1.5 5.5-1.5c2.33 0 4.16.5 5.5 1.5c1.34-1 3.17-1.5 5.5-1.5Z"/>
-    </svg>
+      --subst-var-by TERMINAL_ICON_SVG   ${./icons/terminal.svg} \
+      --subst-var-by GLOBE_ICON_SVG      ${./icons/globe.svg} \
+      --subst-var-by PARTED_ICON_SVG     ${./icons/parted.svg} \
+      --subst-var-by NIX_FLAKE_SVG       ${./icons/nix-flake.svg}
   '';
 
   menu_entries = pkgs.writeText "menu_entries.lua" ''
     return {
-      { "NixOS Manual", "nixos-help",                 "${manualIcon}" },
-      { "GParted",      "${lib.getExe pkgs.gparted}", "${partedIcon}" },
-      { "Reboot",       "reboot",                     "${rebootIcon}" },
-      { "Power Off",    "poweroff",                   "${powerOffIcon}" },
+      { "NixOS Manual", "nixos-help",                 "${./icons/manual.svg}" },
+      { "GParted",      "${lib.getExe pkgs.gparted}", "${./icons/parted.svg}" },
+      { "Reboot",       "reboot",                     "${./icons/reboot.svg}" },
+      { "Power Off",    "poweroff",                   "${./icons/power-off.svg}" },
     }
   '';
 
diff --git a/packages/installer/icons/globe.svg b/packages/installer/icons/globe.svg
new file mode 100644
index 00000000..ae19fa94
--- /dev/null
+++ b/packages/installer/icons/globe.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#d3d3d3" d="M16.36 14c.08-.66.14-1.32.14-2c0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2m-5.15 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95a8.03 8.03 0 0 1-4.33 3.56M14.34 14H9.66c-.1-.66-.16-1.32-.16-2c0-.68.06-1.35.16-2h4.68c.09.65.16 1.32.16 2c0 .68-.07 1.34-.16 2M12 19.96c-.83-1.2-1.5-2.53-1.91-3.96h3.82c-.41 1.43-1.08 2.76-1.91 3.96M8 8H5.08A7.923 7.923 0 0 1 9.4 4.44C8.8 5.55 8.35 6.75 8 8m-2.92 8H8c.35 1.25.8 2.45 1.4 3.56A8.008 8.008 0 0 1 5.08 16m-.82-2C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2c0 .68.06 1.34.14 2M12 4.03c.83 1.2 1.5 2.54 1.91 3.97h-3.82c.41-1.43 1.08-2.77 1.91-3.97M18.92 8h-2.95a15.65 15.65 0 0 0-1.38-3.56c1.84.63 3.37 1.9 4.33 3.56M12 2C6.47 2 2 6.5 2 12a10 10 0 0 0 10 10a10 10 0 0 0 10-10A10 10 0 0 0 12 2Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/installer/icons/manual.svg b/packages/installer/icons/manual.svg
new file mode 100644
index 00000000..7622fa82
--- /dev/null
+++ b/packages/installer/icons/manual.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#d3d3d3" d="M17.5 14.33c.79 0 1.63.08 2.5.24v1.5c-.62-.16-1.46-.24-2.5-.24c-1.9 0-3.39.33-4.5.99v-1.69c1.17-.53 2.67-.8 4.5-.8M13 12.46c1.29-.53 2.79-.79 4.5-.79c.79 0 1.63.07 2.5.23v1.5c-.62-.16-1.46-.24-2.5-.24c-1.9 0-3.39.34-4.5.99m4.5-3.65c-1.9 0-3.39.32-4.5 1V9.84c1.23-.56 2.73-.84 4.5-.84c.79 0 1.63.08 2.5.23v1.55c-.74-.19-1.59-.28-2.5-.28m3.5 8V7c-1.04-.33-2.21-.5-3.5-.5c-2.05 0-3.88.5-5.5 1.5v11.5c1.62-1 3.45-1.5 5.5-1.5c1.19 0 2.36.16 3.5.5m-3.5-14c2.35 0 4.19.5 5.5 1.5v14.56c0 .12-.05.24-.16.35c-.11.09-.23.17-.34.17c-.11 0-.19-.02-.25-.05c-1.28-.69-2.87-1.03-4.75-1.03c-2.05 0-3.88.5-5.5 1.5c-1.34-1-3.17-1.5-5.5-1.5c-1.66 0-3.25.36-4.75 1.07c-.03.01-.07.01-.12.03c-.04.01-.08.02-.13.02c-.11 0-.23-.04-.34-.12a.475.475 0 0 1-.16-.35V6c1.34-1 3.18-1.5 5.5-1.5c2.33 0 4.16.5 5.5 1.5c1.34-1 3.17-1.5 5.5-1.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/installer/nix-flake.svg b/packages/installer/icons/nix-flake.svg
similarity index 100%
rename from packages/installer/nix-flake.svg
rename to packages/installer/icons/nix-flake.svg
diff --git a/packages/installer/icons/parted.svg b/packages/installer/icons/parted.svg
new file mode 100644
index 00000000..d8158539
--- /dev/null
+++ b/packages/installer/icons/parted.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+    <path fill="#d3d3d3" d="M13 30a11 11 0 0 1 0-22a1 1 0 0 1 1 1v9h9a1 1 0 0 1 1 1a11 11 0 0 1-11 11Zm-1-19.94A9 9 0 1 0 21.94 20H14a2 2 0 0 1-2-2Z"/>
+    <path fill="#d3d3d3" d="M28 14h-9a2 2 0 0 1-2-2V3a1 1 0 0 1 1-1a11 11 0 0 1 11 11a1 1 0 0 1-1 1Zm-9-2h7.94A9 9 0 0 0 19 4.06Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/installer/icons/power-off.svg b/packages/installer/icons/power-off.svg
new file mode 100644
index 00000000..cecd29c1
--- /dev/null
+++ b/packages/installer/icons/power-off.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#ff0000" d="m16.56 5.44l-1.45 1.45A5.969 5.969 0 0 1 18 12a6 6 0 0 1-6 6a6 6 0 0 1-6-6c0-2.17 1.16-4.06 2.88-5.12L7.44 5.44A7.961 7.961 0 0 0 4 12a8 8 0 0 0 8 8a8 8 0 0 0 8-8c0-2.72-1.36-5.12-3.44-6.56M13 3h-2v10h2"/>
+</svg>
\ No newline at end of file
diff --git a/packages/installer/icons/reboot.svg b/packages/installer/icons/reboot.svg
new file mode 100644
index 00000000..e2784f0f
--- /dev/null
+++ b/packages/installer/icons/reboot.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#ff0000" d="M12 4c2.1 0 4.1.8 5.6 2.3c3.1 3.1 3.1 8.2 0 11.3c-1.8 1.9-4.3 2.6-6.7 2.3l.5-2c1.7.2 3.5-.4 4.8-1.7c2.3-2.3 2.3-6.1 0-8.5C15.1 6.6 13.5 6 12 6v4.6l-5-5l5-5V4M6.3 17.6C3.7 15 3.3 11 5.1 7.9l1.5 1.5c-1.1 2.2-.7 5 1.2 6.8c.5.5 1.1.9 1.8 1.2l-.6 2c-1-.4-1.9-1-2.7-1.8Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/installer/icons/terminal.svg b/packages/installer/icons/terminal.svg
new file mode 100644
index 00000000..78d56a79
--- /dev/null
+++ b/packages/installer/icons/terminal.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#d3d3d3" d="M20 4H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16c1.1 0 2-.9 2-2V6a2 2 0 0 0-2-2zm0 14H4V8h16v10zm-2-1h-6v-2h6v2zM7.5 17l-1.41-1.41L8.67 13l-2.59-2.59L7.5 9l4 4l-4 4z"/>
+</svg>
\ No newline at end of file
-- 
2.51.2