diff --git a/patches/nixos-nixpkgs-268027.patch b/patches/nixos-nixpkgs-268027.patch
index c4e11e5..68b055f 100644
--- a/patches/nixos-nixpkgs-268027.patch
+++ b/patches/nixos-nixpkgs-268027.patch
@@ -12,12 +12,10 @@ diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.n
 index 1a6f9c784cf675..6d51b51b215d43 100644
 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
 +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
-@@ -57,7 +57,8 @@
+@@ -57,3 +57,3 @@
  # Raise an error if two packages are installed with the same name
- # TODO: For cross we probably need a different PYTHONPATH, or not
  # add the runtime deps until after buildPhase.
 -, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
-+# FIXME: disabled for Python 2 because broken
 +, catchConflicts ? false
 
  # Additional arguments to pass to the makeWrapper function, which wraps
diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 1e87fcd..6fa9654 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -556,8 +556,6 @@ same directory as the org-buffer and insert a link to this file."
   (save-buffer)
 )
 
-;; TODO make function to edit title or date post post creation
-
 (map! :leader
       :prefix ("N")
 
@@ -707,9 +705,6 @@ same directory as the org-buffer and insert a link to this file."
 (defun org-current-buffer-has-todos ()
   "Return non-nil if current buffer has any todo entry.
 
-TODO entries marked as done are ignored, meaning the this
-function returns nil if current buffer contains only completed
-tasks."
   (org-element-map                          ; (2)
        (org-element-parse-buffer 'headline) ; (1)
        'headline
diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index 2015433..9f1289d 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -63,7 +63,7 @@ in
       requests
       pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
       pysocks
-      #pymupdf TODO pymupdf fails to build
+      pymupdf
       markdown
     ]))
   ];
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index db8bd31..faab45b 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -677,8 +677,6 @@ exit
   (save-buffer)
 )
 
-;; TODO make function to edit title or date post post creation
-
 (map! :leader
       :prefix ("N")
 
@@ -838,9 +836,6 @@ exit
 (defun org-current-buffer-has-todos ()
   "Return non-nil if current buffer has any todo entry.
 
-TODO entries marked as done are ignored, meaning the this
-function returns nil if current buffer contains only completed
-tasks."
   (org-element-map                          ; (2)
        (org-element-parse-buffer 'headline) ; (1)
        'headline
@@ -2047,7 +2042,7 @@ in
       requests
       pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
       pysocks
-      #pymupdf TODO pymupdf fails to build
+      pymupdf
       markdown
     ]))
   ];
diff --git a/user/app/ranger/commands_full.py b/user/app/ranger/commands_full.py
index 5defa67..4650e75 100644
--- a/user/app/ranger/commands_full.py
+++ b/user/app/ranger/commands_full.py
@@ -1335,7 +1335,7 @@ class cunmap(uncmap):
 
     Remove the given "console" mappings
 
-    DEPRECATED in favor of uncmap.
+    Deprecated in favor of uncmap.
     """
 
     def execute(self):
@@ -1356,7 +1356,7 @@ class punmap(unpmap):
 
     Remove the given "pager" mappings
 
-    DEPRECATED in favor of unpmap.
+    Deprecated in favor of unpmap.
     """
 
     def execute(self):
@@ -1377,7 +1377,7 @@ class tunmap(untmap):
 
     Remove the given "taskview" mappings
 
-    DEPRECATED in favor of untmap.
+    Deprecated in favor of untmap.
     """
 
     def execute(self):
diff --git a/user/app/ranger/scope.sh b/user/app/ranger/scope.sh
index 5435967..d58637e 100755
--- a/user/app/ranger/scope.sh
+++ b/user/app/ranger/scope.sh
@@ -266,7 +266,7 @@ handle_image() {
     esac
 
     # openscad_image() {
-    #     TMPPNG="$(mktemp -t XXXXXX.png)"
+    #     TMPPNG="$(mktemp -t xxxxxx.png)"
     #     openscad --colorscheme="${OPENSCAD_COLORSCHEME}" \
     #         --imgsize="${OPENSCAD_IMGSIZE/x/,}" \
     #         -o "${TMPPNG}" "${1}"