From 67a0ee869d389f916b832902c5f140596d56f657 Mon Sep 17 00:00:00 2001
From: Johannes Hendrik Gerard van der Weide <hertog@fsfe.org>
Date: Wed, 21 Feb 2024 15:35:40 +0100
Subject: [PATCH] Fixed Sway not loading properly and hyfetch

---
 hertog/home.nix          |  1 +
 programs/sway/sway.nix   | 30 +++++++++++++++---------------
 programs/sway/waybar.nix | 16 ++++++++--------
 programs/sway/wofi.nix   | 10 +++++-----
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/hertog/home.nix b/hertog/home.nix
index 53251e4..53a4bb2 100644
--- a/hertog/home.nix
+++ b/hertog/home.nix
@@ -10,6 +10,7 @@
     ../programs/dconf.nix
     ../programs/zsh.nix
     ../programs/git.nix
+    ../programs/hyfetch.nix
 #   ../programs/firefox.nix
     ../programs/obs.nix
   ];
diff --git a/programs/sway/sway.nix b/programs/sway/sway.nix
index 9c4af25..5239bd8 100644
--- a/programs/sway/sway.nix
+++ b/programs/sway/sway.nix
@@ -25,27 +25,27 @@ in
         "XF86AudioLowerVolume" = "exec pamixer -d 5";
       };
       colors = {
-        background = "${config.colorScheme.palette.base00}";
+        background = "#${config.colorScheme.palette.base00}";
         focused = {
-          indicator = "${config.colorScheme.palette.base06}";
-          background = "${config.colorScheme.palette.base06}";
-          border = "${config.colorScheme.palette.base06}";
+          indicator = "#${config.colorScheme.palette.base06}";
+          background = "#${config.colorScheme.palette.base06}";
+          border = "#${config.colorScheme.palette.base06}";
           childBorder = "${config.colorScheme.palette.base06}";
-          text = "${config.colorScheme.palette.base09}";
+          text = "#${config.colorScheme.palette.base09}";
         };
         focusedInactive = {
-          indicator = "${config.colorScheme.palette.base05}";
-          background = "${config.colorScheme.palette.base05}";
-          border = "${config.colorScheme.palette.base05}";
-          childBorder = "${config.colorScheme.palette.base05}";
-          text = "${config.colorScheme.palette.base09}";
+          indicator = "#${config.colorScheme.palette.base05}";
+          background = "#${config.colorScheme.palette.base05}";
+          border = "#${config.colorScheme.palette.base05}";
+          childBorder = "#${config.colorScheme.palette.base05}";
+          text = "#${config.colorScheme.palette.base09}";
         };
         unfocused = {
-          indicator = "${config.colorScheme.palette.base04}";
-          background = "${config.colorScheme.palette.base04}";
-          border = "${config.colorScheme.palette.base04}";
-          childBorder = "${config.colorScheme.palette.base04}";
-          text = "${config.colorScheme.palette.base09}";
+          indicator = "#${config.colorScheme.palette.base04}";
+          background = "#${config.colorScheme.palette.base04}";
+          border = "#${config.colorScheme.palette.base04}";
+          childBorder = "#${config.colorScheme.palette.base04}";
+          text = "#${config.colorScheme.palette.base09}";
         };
       };
       bars = [
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index 3d36b62..79f55f8 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -62,21 +62,21 @@
         font-family: monospace;
       }
       window#waybar {
-        background: ${config.colorScheme.palette.base00};
-        color: ${config.colorScheme.palette.base09};
+        background: #${config.colorScheme.palette.base00};
+        color: #${config.colorScheme.palette.base09};
       }
       #workspaces button {
         padding: 0 5px;
-        background-color: ${config.colorScheme.palette.base04};
-        color: ${config.colorScheme.palette.base09};
+        background-color: #${config.colorScheme.palette.base04};
+        color: #${config.colorScheme.palette.base09};
       }
       #workspaces button:hover {
-        background: ${config.colorScheme.palette.base05};
-        color: ${config.colorScheme.palette.base09};
+        background: #${config.colorScheme.palette.base05};
+        color: #${config.colorScheme.palette.base09};
       }
       #workspaces button.focused {
-        background: ${config.colorScheme.palette.base06};
-        color: ${config.colorScheme.palette.base09};
+        background: #${config.colorScheme.palette.base06};
+        color: #${config.colorScheme.palette.base09};
       }
     '';
   };
diff --git a/programs/sway/wofi.nix b/programs/sway/wofi.nix
index 57fbe14..f637b03 100644
--- a/programs/sway/wofi.nix
+++ b/programs/sway/wofi.nix
@@ -16,20 +16,20 @@
       }
 
       window {
-        background-color: ${config.colorScheme.palette.base00};
+        background-color: #${config.colorScheme.palette.base00};
       }
 
       #input {
         margin: 5px;
         border: none;
-        color: ${config.colorScheme.palette.base09};
-        background-color: ${config.colorScheme.palette.base06};
+        color: #${config.colorScheme.palette.base09};
+        background-color: #${config.colorScheme.palette.base06};
       }
 
       #text {
         margin: 5px;
         border: none;
-        color: ${config.colorScheme.palette.base09};
+        color: #${config.colorScheme.palette.base09};
       }
 
       #entry {
@@ -41,7 +41,7 @@
       }
 
       #entry:selected {
-          background-color: ${config.colorScheme.palette.base06};
+          background-color: #${config.colorScheme.palette.base06};
           border-radius: 5px;
           border: none;
       }