From 3dc146528414006c136de09e63bd555d7a3ec55b Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Tue, 4 Feb 2025 10:29:42 -0500
Subject: [PATCH] fixed

---
 src/system/VMs/default.nix                   |  8 ++++----
 src/user/modules/gui/wm/hyprland/default.nix |  2 +-
 src/user/modules/gui/wm/sway/default.nix     | 16 +++++++++-------
 src/user/modules/utils/default.nix           |  5 +++++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/system/VMs/default.nix b/src/system/VMs/default.nix
index 4a772b4..0c28f93 100644
--- a/src/system/VMs/default.nix
+++ b/src/system/VMs/default.nix
@@ -8,17 +8,17 @@
     connections."qemu:///system" = {
       domains = [
         {
-          definition = ./config/machines/Test_Bench1.xml;
+          definition = ./machines/Test_Bench1.xml;
         }
       ];
 
       pools = [
         {
-          definition = ./config/storage/pools/default.xml;
+          definition = ./storage/pools/default.xml;
           active = true;
           volumes = [
             {
-              definition = ./config/storage/volumes/rocky9.xml;
+              definition = ./storage/volumes/rocky9.xml;
             }
           ];
         }
@@ -26,7 +26,7 @@
 
       networks = [
         {
-          definition = ./config/networks/virbr0.xml;
+          definition = ./networks/virbr0.xml;
           active = true;
         }
       ];
diff --git a/src/user/modules/gui/wm/hyprland/default.nix b/src/user/modules/gui/wm/hyprland/default.nix
index e4e23cf..8d285a2 100644
--- a/src/user/modules/gui/wm/hyprland/default.nix
+++ b/src/user/modules/gui/wm/hyprland/default.nix
@@ -10,7 +10,7 @@ let
   };
 
 in
-{ options.modules.user.gui.wm.hyprland = { enable = mkEnableOption "Enable hyprland module"; };
+{ options.modules.user.gui.wm.hyprland = { enable = mkEnableOption "Enable Hyprland WM"; };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
       enable = true;
diff --git a/src/user/modules/gui/wm/sway/default.nix b/src/user/modules/gui/wm/sway/default.nix
index 8935834..54b19a6 100644
--- a/src/user/modules/gui/wm/sway/default.nix
+++ b/src/user/modules/gui/wm/sway/default.nix
@@ -10,8 +10,15 @@ let
     sha256 = "1ph5m9s57076jx6042iipqx2ifzadmd5z4lf5l49wgq4jb92mp16";
   };
 
+  barStatus = pkgs.writeShellScript "status.sh" ''
+    #!/usr/bin/env bash
+    while :; do 
+      echo "$(ip -4 addr show eno1 | awk '/inet / {print $2}' | cut -d'/' -f1) | $(free -h | awk '/^Mem/ {print $3}') | $(date +'%I:%M:%S %p') | $(date +'%m-%d-%Y')"; sleep 1; 
+    done
+  '';
+
 in
-{ options.modules.user.gui.wm.sway = { enable = mkEnableOption "user.gui.wm.sway"; };
+{ options.modules.user.gui.wm.sway = { enable = mkEnableOption "Enable Sway WM"; };
   config = mkIf cfg.enable {
     wayland.windowManager.sway = { 
       enable = true;
@@ -30,11 +37,6 @@ in
         };
 
         output = {
-          #HDMI-A-1 = {
-          #  resolution = "1920x1080";
-          #  position = "0,0";
-          #  bg = "${wallpaper} fill";
-          #};
           DP-2 = {
             resolution = "3440x1440@59.973Hz";
             position = "0,0";
@@ -59,7 +61,7 @@ in
         bars = [
           {
             position = "top";
-            statusCommand = ''while :; do echo "$(free -h | awk '/^Mem/ {print $3}') '|' $(date +'%I:%M:%S %p') '|' $(date +'%m-%d-%Y')"; sleep 1; done'';
+            statusCommand = "${barStatus}";
             fonts = {
               names = [ "Terminus" ];
               size = 12.0;
diff --git a/src/user/modules/utils/default.nix b/src/user/modules/utils/default.nix
index 5a3a0f5..e8d4b86 100644
--- a/src/user/modules/utils/default.nix
+++ b/src/user/modules/utils/default.nix
@@ -11,6 +11,11 @@ in
       wget curl fastfetch
       unzip fping calc fd pciutils
       rsync zip lshw wireshark
+      calcurse
     ];
+
+    programs.bash.shellAliases = {
+      calendar = "${pkgs.calcurse}/bin/calcurse";
+    };
   };
 }