From 5a0d5b01b1b28154344550173e5924e6b35a8e2b Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 30 Oct 2023 20:11:08 -0500
Subject: [PATCH] Fix helix search all highlights, use waybar without systemd,
 add borders to all sway windows

---
 modules/home-manager/helix.nix  |  2 +-
 modules/home-manager/sway.nix   | 11 +++++------
 modules/home-manager/waybar.nix |  3 ---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix
index 1ce666e..e9a4438 100644
--- a/modules/home-manager/helix.nix
+++ b/modules/home-manager/helix.nix
@@ -374,7 +374,7 @@
         "ui.cursorline.primary" = {bg = bg3;};
 
         "ui.highlight" = {
-          bg = primary;
+          bg = bg3;
           fg = bg;
           modifiers = ["bold"];
         };
diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index 9e5cba6..49f1e0b 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -128,8 +128,7 @@
 
       startup = [
         {
-          command = "systemctl --user restart waybar";
-          always = true;
+          command = "waybar";
         }
         {
           command = lib.concatStringsSep " " [
@@ -317,8 +316,8 @@
         };
         focusedInactive = {
           background = bg;
-          border = bg;
-          childBorder = bg;
+          border = bg3;
+          childBorder = bg3;
           indicator = bg;
           text = bg;
         };
@@ -331,8 +330,8 @@
         };
         unfocused = {
           background = bg;
-          border = bg;
-          childBorder = bg;
+          border = bg3;
+          childBorder = bg3;
           indicator = bg;
           text = text;
         };
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index b4d4974..ad2f947 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -346,8 +346,5 @@
         	/* background-color: #51a37a; */
         }
       '';
-    systemd = {
-      enable = true;
-    };
   };
 }