diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index de2447ae..e93322d5 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -107,8 +107,10 @@
         enable = true;
         settings = {
           options = {
-            hover.enabled = true;
-            separatorStyle = "slant";
+            separatorStyle = "padded_slope";
+            color_icons = false;
+            always_show_bufferline = false;
+            show_buffer_close_icons = false;
              offsets = [{
               filetype = "NvimTree";
               text = "File Explorer";
@@ -289,14 +291,9 @@
         ];
       };
 
-
-      airline = {
-        enable = true;
-
-      };
       # Airline / Powerline alternative
       lualine = {
-        enable = false;
+        enable = true;
         settings = {
           componentSeparators = {
             right = "«";
diff --git a/home-manager/common/software/gui/ghostty.nix b/home-manager/common/software/gui/ghostty.nix
index 39dc94b9..34810af4 100644
--- a/home-manager/common/software/gui/ghostty.nix
+++ b/home-manager/common/software/gui/ghostty.nix
@@ -1,13 +1,13 @@
 { theme, ... }: {
 
-  # TODO Re-enable this when 25.05 is out or when this is compabile with 24.11 
+  # FIX: Re-enable this when 25.05 is out or when this is compabile with 24.11 
   # imports = [ ../../../../stylix/themes/${theme}/home-manager/ghostty.nix ];
 
   # Otherwise it sets the term to "xterm-ghostty" and it fails to connect to ssh
   programs.bash.sessionVariables = { TERM = "xterm-256color"; };
   programs.fish.shellInit        = ''set TERM "xterm-256color" '';
 
-  # TODO Re-enable this when 25.05 is out or when this is compabile with 24.11 
+  # FIX: Re-enable this when 25.05 is out or when this is compabile with 24.11 
 #  programs.ghostty = {
 #    enable = true; 
 #    enableBashIntegration = true;