diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix
index fbfd8921..46360a93 100644
--- a/modules/nixos/cspark-desktop-niri/home.nix
+++ b/modules/nixos/cspark-desktop-niri/home.nix
@@ -51,11 +51,11 @@ in
     };
 
     # Start sway after login if on TTY1 (Default Linux TTY upon boot/login)
-    programs.bash.profileExtra = ''
-                     if [[ $(tty) == "/dev/tty1" ]]; then
-                                       niri --session
-				                               exit
-                     fi
-                     '';
+    #programs.bash.profileExtra = ''
+    #                 if [[ $(tty) == "/dev/tty1" ]]; then
+    #                                   niri-session
+		#		                               exit
+    #                 fi
+    #                 '';
   };
 }
diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix
index 93252f7f..765ed44a 100644
--- a/modules/nixos/cspark-desktop-niri/module.nix
+++ b/modules/nixos/cspark-desktop-niri/module.nix
@@ -40,6 +40,17 @@ in
       kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc
       lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents
     ];
+    # The minimal login manager I'm using for niri
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session";
+          user = "greeter";
+        };
+      };
+    };
+    
     # XDG Portal Integration (For file chooser/screensharing etc)
     xdg.portal.enable = true;
     xdg.portal.wlr.enable = true;
diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config
index 8b2de63a..1d1f9470 100644
--- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config
+++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/config
@@ -3,10 +3,10 @@
     "position": "top",
     "modules-left": [],
     "modules-center": ["clock"],
-    "modules-right": ["network", "battery", "pulseaudio"],
+    "modules-right": ["network", "pulseaudio", "battery"],
     "clock": {
-        "format": "{:%H:%M}",
-        "format-alt": "{:%a %b %d}",
+        "format": "󱑒 {:%H:%M}",
+        "format-alt": "󱑒 {:%a %b %d}",
         "tooltip": false
     },
     "battery": {
@@ -16,24 +16,24 @@
             "critical": 15
         },
         "bat":"BAT1",
-        "format": "{icon} {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-discharging": " {capacity}%",
+        "format": "{icon}   {capacity}%",
+        "format-charging": "   {capacity}%",
+        "format-plugged": "   {capacity}%",
+        "format-discharging": "   {capacity}%",
         "format-alt": "{icon} {time}",
         "format-icons": ["", "", "", "", ""]
     },
     "network": {
         "format": "{ifname}",
         "format-wifi": " {essid}",
-        "format-ethernet": " {ifname}",
-        "format-disconnected": "",
+        "format-ethernet": "  {ifname}",
+        "format-disconnected": "  No Internet",
         "tooltip-format-wifi": "{signalStrength}%",
         "max-length": 20
     },
     "pulseaudio": {
-        "format": "{icon} {volume}%",
-        "format-bluetooth": "{icon} {volume}%",
+        "format": "{icon}  {volume}%",
+        "format-bluetooth": "{icon}  {volume}%",
         "format-muted": "",
         "format-icons": {
             "headphone": "",
diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css
index c751d172..6eaa0bbd 100644
--- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css
+++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css
@@ -1,6 +1,9 @@
+@define-color background-color rgb (40, 40, 40); 
+@define-color foreground-color rgb (235, 219, 178);
+
 * {
-  font-size: 12px;
-  font-family: "Terminus (TTF)";
+  font-size: 13px;
+  font-family: "Hack Nerd Font";
 }
 
 window#waybar {
@@ -9,42 +12,40 @@ window#waybar {
 
 #battery {
   margin: 3px 0px 3px 0px;
-  background: #1d1f21;
+  background: @background-color;
+  color: @foreground-color;
   padding: 5px;
-  color: #c5c8c6;
 }
 
 #clock {
   margin: 3px 0px 3px 3px;
   padding: 5px;
-  color: #FFF;
-  background: #1d1f21;
-  border-top-left-radius: 10px;
-  border-bottom-left-radius: 10px;
-  color: #c5c8c6;
+  background: #fbf1c7;
+  background: @background-color;
+  color: @foreground-color;
+  border-radius: 10px;
 }
 
 #custom-keyboard {
-  background: #1d1f21;
-  color: #c5c8c6;
+  background: @background-color;
+  color: @foreground-color;
   padding: 5px 5px 5px 7px;
   margin: 3px 0px 3px 3px;
-  border-top-left-radius: 10px;
-  border-bottom-left-radius: 10px;
+  border-radius: 10px;
 }
 
 #pulseaudio {
   margin: 3px 3px 3px 0px;
   padding: 5px 7px 5px 5px;
-  background: #1d1f21;
-  border-top-right-radius: 10px;
-  border-bottom-right-radius: 10px;
-  color: #c5c8c6;
+  background: @background-color;
+  color: @foreground-color;
+  border-radius: 10px;
 }
 
 #network {
-  background: #1d1f21;
-  color: #c5c8c6;
-  margin: 3px 0px 3px 0px;
-  padding: 5px;
+  margin: 3px 3px 3px 0px;
+  padding: 5px 7px 5px 5px;
+  background: @background-color;
+  color: @foreground-color;
+  border-radius: 10px;
 }