diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix
index 43842f4..2f0428f 100644
--- a/hosts/vali/hermit/programs.nix
+++ b/hosts/vali/hermit/programs.nix
@@ -49,7 +49,6 @@ in {
     nicotine-plus
     nil
     nitch
-    nixfmt
     nixpkgs-wayland.swww
     nmap
     notesnook
diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix
index 5e31886..eedc568 100644
--- a/modules/gui/steam.nix
+++ b/modules/gui/steam.nix
@@ -1,12 +1,10 @@
 {
   config,
   lib,
-  inputs,
-  pkgs,
   ...
 }:
 with lib; let
-  username = config.modules.other.system.username;
+  inherit (config.modules.other.system) username;
   cfg = config.modules.programs.steam;
 in {
   options.modules.programs.steam = {
diff --git a/modules/gui/waybar.nix b/modules/gui/waybar.nix
index d049270..a352b75 100644
--- a/modules/gui/waybar.nix
+++ b/modules/gui/waybar.nix
@@ -17,10 +17,9 @@ in {
         settings.mainBar = {
           gtk-layer-shell = true;
           layer = "top";
-          modules-left = ["custom/launcher" "tray" "hyprland/window"];
+          modules-left = ["tray" "hyprland/window"];
           modules-center = ["hyprland/workspaces"];
           modules-right = [
-            # "custom/dnd"
             "mpd"
             "cpu"
             "memory"
@@ -77,8 +76,8 @@ in {
             };
           };
           tray = {
-            icon-size = 18;
-            spacing = 8;
+            icon-size = 12;
+            spacing = 5;
           };
           # 󰃰
           clock = {
@@ -126,25 +125,6 @@ in {
             format = "{}";
             separate-outputs = true;
           };
-          cava = {
-            framerate = 60;
-            autosens = 0;
-            sensitivity = 7;
-            bars = 14;
-            lower_cutoff_freq = 50;
-            higher_cutoff_freq = 10000;
-            method = "pipewire";
-            source = "auto";
-            stereo = true;
-            reverse = false;
-            bar_delimiter = 0;
-            monstercat = false;
-            waves = false;
-            noise_reduction = 0.77;
-            input_delay = 0;
-            format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
-            actions = {on-click-right = "mode";};
-          };
           mpd = {
             format = "󰝚 {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})";
             format-disconnected = "󰝚 Disconnected";
@@ -205,10 +185,10 @@ in {
           }
 
           #window {
-              margin-top: 4px;
-              margin-bottom: 4px;
-              padding-left: 10px;
-              padding-right: 10px;
+              margin-top: 2px;
+              margin-bottom: 2px;
+              padding-left: 2px;
+              padding-right: 2px;
               background: @mantle;
               color: @teal;
               font-family: JetBrains Mono;
@@ -219,7 +199,7 @@ in {
           }
 
           #workspaces button {
-              border-radius: 3px;
+              border-radius: 0px;
               padding-top: 0px;
               padding-right: 0px;
               padding-bottom: 0px;
diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix
index 9d7b3d3..e119bf4 100644
--- a/modules/wms/wayland/hypr/land.nix
+++ b/modules/wms/wayland/hypr/land.nix
@@ -127,8 +127,8 @@ in {
           };
           general = {
             sensitivity = 1.0;
-            gaps_in = 4;
-            gaps_out = 10;
+            gaps_in = 0;
+            gaps_out = 0;
             border_size = 2;
           };
           #Decoration settings