diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 051d829f..de2447ae 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -289,9 +289,14 @@
         ];
       };
 
+
+      airline = {
+        enable = true;
+
+      };
       # Airline / Powerline alternative
       lualine = {
-        enable = true;
+        enable = false;
         settings = {
           componentSeparators = {
             right = "«";
@@ -312,6 +317,10 @@
             action = "find_files";
             options.desc = "Search files by name";
           };
+          "<leader>d" = {
+            action = "todo-comments";
+            options.desc = "TODO Comments";
+          };
           "<leader>s" = {
             action = "live_grep";
             options.desc = "Search by live grep";
diff --git a/home-manager/hosts/framework16/desktops/plasma6/default.nix b/home-manager/hosts/framework16/desktops/plasma6/default.nix
index 100ec1ba..592da261 100644
--- a/home-manager/hosts/framework16/desktops/plasma6/default.nix
+++ b/home-manager/hosts/framework16/desktops/plasma6/default.nix
@@ -1,7 +1,7 @@
 { ... }: {
   programs.plasma = {
     configFile = {
-      # TODO May need to fix this for the new laptop
+      # TODO: May need to fix this for the new laptop
       "kcminputrc"."Libinput/2362/628/PIXA3854:00 093A:0274 Touchpad" = { 
         "NaturalScroll" = true;
         "TapDragLock" = true;
diff --git a/nixos/common/containers/derp.nix b/nixos/common/containers/derp.nix
index b4cc519c..478b0be5 100644
--- a/nixos/common/containers/derp.nix
+++ b/nixos/common/containers/derp.nix
@@ -2,7 +2,7 @@
     services.cron = {
       enable = true;
       systemCronJobs = [
-        # TODO Change the server when moving between hosts
+        # NOTE: Change the server when moving between hosts
           ''0 0 * * * root mkdir -p  /Storage/Data/Docker/sysctl.io/letsencrypt/; rsync -avr --delete root@warsaw-ovh-01:/Storage/Data/Docker/sysctl.io/letsencrypt/ /Storage/Data/Docker/sysctl.io/letsencrypt/''
           # ''0 0 * * * root mkdir -p  /Storage/Data/Docker/sysctl.io/letsencrypt/; rsync -avr --delete root@framework-server:/Storage/Data/Docker/sysctl.io/letsencrypt/ /Storage/Data/Docker/sysctl.io/letsencrypt/''
       ];
diff --git a/nixos/common/services/tailscale.nix b/nixos/common/services/tailscale.nix
index 81cc6c08..f90b6de3 100644
--- a/nixos/common/services/tailscale.nix
+++ b/nixos/common/services/tailscale.nix
@@ -22,8 +22,7 @@
   # Because of the split DNS, hosts forget which IP 
   # (external or internal) is promtail/loki.  
   # Setting them manually here helps.
-
-  # NOTE:  Update these when I move the server to warsaw-ovh-01
+  # NOTE: Update these when I move the server to warsaw-ovh-01
   networking.extraHosts = ''
     100.64.0.5 influx.sysctl.io
     100.64.0.5 loki.sysctl.io
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 17c0d852..b65a0254 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -14,7 +14,7 @@
   ];
 
   services.ollama.acceleration = "cuda";
-  ####  TEMPORARY TODO ####
+  # TODO:  Fix this
   environment.variables = {
     MOZ_ENABLE_WAYLAND = 1;
     NIXOS_OZONE_WL = "1";