From 446e5ab59bc16752e8b1b652a421649dd7c14886 Mon Sep 17 00:00:00 2001
From: k <markers711@gmail.com>
Date: Tue, 19 Nov 2024 22:02:21 -0500
Subject: [PATCH] Fixes

---
 hosts/home/sway.nix   |  2 +-
 hosts/home/tile.nix   |  6 ++++--
 hosts/home/waybar.nix | 41 ++++++++++++++++++++++++-----------------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/hosts/home/sway.nix b/hosts/home/sway.nix
index 2661bee..993dd0f 100644
--- a/hosts/home/sway.nix
+++ b/hosts/home/sway.nix
@@ -11,7 +11,7 @@
       window.border = 1;
       window.titlebar = false;
       terminal = "${pkgs.alacritty}/bin/alacritty";
-      menu = "${pkgs.wofi}/bin/wofi -show drun -modi drun";
+      menu = "${pkgs.wofi}/bin/wofi --show drun";
       bars = [];
       gaps = {
         inner = 10;
diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix
index 1e09005..2de4e34 100644
--- a/hosts/home/tile.nix
+++ b/hosts/home/tile.nix
@@ -1,12 +1,14 @@
 { config, pkgs, inputs, ... }:
 
 {
-  programs = {
+  services = {
     mako = { enable = true; };
+  };
+  programs = {
     alacritty = { enable = true; };
     swaylock = {enable = true;};
     wofi = { enable = true; };
     zathura = { enable = true; };
     mpv = { enable = true; };
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix
index 48b846b..990c55f 100644
--- a/hosts/home/waybar.nix
+++ b/hosts/home/waybar.nix
@@ -7,6 +7,9 @@
         layer = "bottom";
         position = "bottom";
         output = [ "eDP-1" ];
+        margin-left = 45;
+        margin-right = 45;
+        spacing = 15;
 
         modules-left = [ "sway/workspaces" "sway/mode" ];
         modules-center = [ "clock" ];
@@ -26,16 +29,16 @@
 
         "pulseaudio" = {
           format = "{volume}% {icon}";
-          format-bluetooth = "{volume}% {icon}";
-          format-muted = "";
+          format-bluetooth = "{volume}% {icon} ";
+          format-muted = " ";
           format-icons = {
-            headphone = "";
-            hands-free = "";
-            headset = "";
-            phone = "";
-            portable = "";
-            car = "";
-            default = [ "" "" ];
+            headphone = " ";
+            hands-free = " ";
+            headset = " ";
+            phone = " ";
+            portable = " ";
+            car = " ";
+            default = [ " " " " ];
           };
           scroll-step = 1;
           on-click = "pavucontrol";
@@ -51,22 +54,26 @@
 
         network = {
           format = "{ifname}";
-          format-wifi = "{essid} ({signalStrength}%) ";
-          format-ethernet = "{ipaddr}/{cidr} 󰊗";
-          format-disconnected = "󰤮";
-          tooltip-format = "{ifname} via {gwaddr} 󰊗";
-          tooltip-format-wifi = "{essid} ({signalStrength}%) ";
-          tooltip-format-ethernet = "{ifname} ";
+          format-wifi = "{essid} ({signalStrength}%)  ";
+          format-ethernet = "{ipaddr}/{cidr} 󰊗 ";
+          format-disconnected = "󰤮 ";
+          tooltip-format = "{ifname} via {gwaddr} 󰊗 ";
+          tooltip-format-wifi = "{essid} ({signalStrength}%)  ";
+          tooltip-format-ethernet = "{ifname}  ";
           tooltip-format-disconnected = "Disconnected";
           max-length = 50;
         };
 
         battery = {
           format = "{capacity}% {icon}";
-          "format-icons" = [ "" "" "" "" "" ];
+          "format-icons" = [ " " " " " " " " " " ];
         };
 
-        clock = { "format-alt" = "{:%a, %d. %b  %H:%M}"; };
+        clock = {
+          format = "{:%I:%M %p}";
+          "format-alt" = "{:%a, %d. %b  %H:%M}";
+          tooltip = false;
+        };
       };
     };
   };