diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el
index fa728b8..19ac094 100644
--- a/hmModules/emacs/init.el
+++ b/hmModules/emacs/init.el
@@ -141,12 +141,6 @@
   (add-hook 'next-error-hook #'pulsar-pulse-line)
   )
 
-(use-package visual-replace
-  :defer t
-  :bind (("C-c r" . visual-replace)
-         :map isearch-mode-map
-         ("C-c r" . visual-replace-from-isearch)))
-
 (use-package clipetty
   :delight
   :hook (after-init . global-clipetty-mode))
@@ -462,10 +456,11 @@
 (use-package magit-delta
   :hook (magit-mode . magit-delta-mode))
 
-(use-package magit-todos
-  :after magit
-  :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
-  :config (magit-todos-mode 1))
+;; FIXME
+;; (use-package magit-todos
+;;   :after magit
+;;   :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
+;;   :config (magit-todos-mode 1))
 
 (use-package difftastic
   :demand t
diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl
index 6068cd6..43f7a4f 100644
--- a/hmModules/niri/config.kdl
+++ b/hmModules/niri/config.kdl
@@ -314,13 +314,6 @@ window-rule {
   open-focused true
 }
 
-window-rule {
-  match title=r#"^GPTel - Emacs$"#
-  opacity 0.95
-  open-floating true
-  open-focused true
-}
-
 
 
 
@@ -348,7 +341,7 @@ binds {
     Mod+B { spawn "firefox"; }
     Mod+RETURN { spawn "emacsclient" "-c" "--eval" "(ccr/start-eshell)"; }
     Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
-    Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . 150) (height . 60))'"; }
+    Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))"; }
     Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
     Mod+Alt+L { spawn "swaylock"; }
     Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 40168a5..13cbb3b 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -168,8 +168,6 @@
     algorithm = "zstd";
   };
 
-  hardware.rtl-sdr.enable = true;
-
   # TODO move away from here (how can the interface name be retrieved programmatically?)
   networking.interfaces.enp11s0.wakeOnLan = {
     enable = true;
diff --git a/packages/emacs/default.nix b/packages/emacs/default.nix
index 9bb0125..cfff445 100644
--- a/packages/emacs/default.nix
+++ b/packages/emacs/default.nix
@@ -11,7 +11,12 @@ let
       inputs.emacs-overlay.overlays.emacs
     ]
   );
-  all-grammars = pkgs'.tree-sitter.withPlugins builtins.attrValues;
+  pkgs-with-tree-sitter-kdl =
+    (builtins.getFlake "github:aciceri/nixpkgs/23a675ee8313427610cf129dd2b52a69bf6a2a26")
+    .legacyPackages.${pkgs.stdenv.system};
+  # TODO remove when merged: https://github.com/NixOS/nixpkgs/pull/371287/files
+  # all-grammars = pkgs'.tree-sitter.withPlugins builtins.attrValues;
+  all-grammars = pkgs-with-tree-sitter-kdl.tree-sitter.withPlugins builtins.attrValues;
   treesitGrammars = pkgs'.runCommand "treesit-grammars" { } ''
     mkdir $out
     for f in ${all-grammars}/*
diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix
index af76056..33122dd 100644
--- a/packages/emacs/packages.nix
+++ b/packages/emacs/packages.nix
@@ -184,7 +184,6 @@ let
           telega
           aggressive-indent
           mixed-pitch
-          visual-replace
           # org-re-reveal # FIXME very not nice hash mismatch when building
         ]
       )