From 93af4f7913a320e88620d0c2cccc5d9aa9d641d3 Mon Sep 17 00:00:00 2001
From: specCon18 <steven.carpenter@skdevstudios.com>
Date: Wed, 20 Dec 2023 23:11:28 -0500
Subject: [PATCH] updated waybar fixed some other minor gripes

---
 modules/home-manager/waybar.nix | 15 ++++++++-------
 users/speccon18/default.nix     | 28 ++++++++++++++++------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index 3882b8c..373babb 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -13,12 +13,13 @@
             position = "top";
             height = 40;
             spacing = 8; 
-            modules-left = [];
+            modules-left = [
+              "battery"
+            ];
             modules-center = [
               "temperature"
             ];
             modules-right = [
-              "battery"
               "backlight"
               "cpu"
               "memory"
@@ -66,7 +67,7 @@
                     critical = 15;
                 };
                 format = "{capacity}% {icon}";
-                format-charging = "{capacity}% ";
+                format-charging = "{capacity}% ";
                 format-plugged = "{capacity}% ";
                 format-alt = "{time} {icon}";
                 format-good = "";
@@ -80,7 +81,7 @@
                 ];
             };
             "battery#bat2" = {
-                bat = "BAT2";
+                bat = "BAT";
             };
             network = {
                 format-wifi = "{essid} ({signalStrength}%) ";
@@ -94,14 +95,14 @@
                 scroll-step = 1;
                 format = "{volume}% {icon} {format_source}";
                 format-bluetooth = "{volume}% {icon} {format_source}";
-                format-bluetooth-muted = " {icon} {format_source}";
+                format-bluetooth-muted = "{icon} {format_source}";
                 format-muted = " {format_source}";
                 format-source = "{volume}% ";
                 format-source-muted = "";
                 format-icons = {
                     headphone = "";
-                    hands-free = "";
-                    headset = "";
+                    hands-free = "";
+                    headset = "";
                     phone = "";
                     portable = "";
                     car = "";
diff --git a/users/speccon18/default.nix b/users/speccon18/default.nix
index 3a954eb..006a0b1 100644
--- a/users/speccon18/default.nix
+++ b/users/speccon18/default.nix
@@ -14,18 +14,22 @@
       "docker"
     ];
   };
-  services.xremap = {
-    withWlroots = true;
-    userName = "speccon18";
-    config = {
-      keymap = [
-        {
-          name = "Global";
-          remap = {
-            "CapsLock" = "Esc";
+services.xremap = {
+  withWlroots = true;
+  userName = "speccon18";
+  config = {
+    keymap = [
+      {
+        name = "Global";
+        remap = {
+          "CapsLock" = "Esc";
+          "Print" = {
+            launch = [ "zsh" "-c" "grim -o /home/speccon18/Pictures/$(date +'%s_grim.png') -g $(slurp) -t png" ];
           };
-        }
-      ];
-    };
+        };
+      }
+    ];
   };
+};
+
 }
\ No newline at end of file