diff --git a/configurations/nos/modules/default.nix b/configurations/nos/modules/default.nix
index 613d5215..d00944b2 100644
--- a/configurations/nos/modules/default.nix
+++ b/configurations/nos/modules/default.nix
@@ -9,7 +9,7 @@
     ./qbittorrent
     ./snapraid
 
-    # FIXME: I need to actually do this properly before unleashing it on my library
+    # TODO: I need to actually do this properly before unleashing it on my library
     # ./subtitles
   ];
 }
diff --git a/modules/esphome-plus/default.nix b/modules/esphome-plus/default.nix
index 774d34c8..bfe42487 100644
--- a/modules/esphome-plus/default.nix
+++ b/modules/esphome-plus/default.nix
@@ -52,7 +52,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # FIXME: https://github.com/NixOS/nixpkgs/issues/339557
+    # https://github.com/NixOS/nixpkgs/issues/339557
     systemd.services.esphome = {
       environment.PLATFORMIO_CORE_DIR = mkForce "${stateDir}/.platformio";
 
diff --git a/modules/kmscon/default.nix b/modules/kmscon/default.nix
index c4322866..9a1fedc3 100644
--- a/modules/kmscon/default.nix
+++ b/modules/kmscon/default.nix
@@ -29,7 +29,7 @@ in {
       useXkbConfig = true;
       hwRender = false;
 
-      # FIXME: https://github.com/Aetf/kmscon/issues/18 Icons not rendering properly
+      # TODO: https://github.com/Aetf/kmscon/issues/18 find workaround with more spaces?
       extraOptions = concatStringsSep " " [
         "--font-size ${toString cfg.fontSize}"
         "--font-dpi ${toString cfg.fontDpi}"