From bcdcabc5c40b017fd16b2d51db2aab8ca0e3253b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 17 Jan 2025 09:48:36 +0100 Subject: [PATCH 1/5] Re-enable `magit-todos` --- hmModules/emacs/init.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 19ac094..0056fdb 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -456,11 +456,10 @@ (use-package magit-delta :hook (magit-mode . magit-delta-mode)) -;; FIXME -;; (use-package magit-todos -;; :after magit -;; :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?") -;; :config (magit-todos-mode 1)) +(use-package magit-todos + :after magit + :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?") + :config (magit-todos-mode 1)) (use-package difftastic :demand t From 62bd8fb89998a46a2b65ab9d97254d5122764bc5 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 17 Jan 2025 09:48:48 +0100 Subject: [PATCH 2/5] `tree-sitter-grammars-kdl` has been merged --- packages/emacs/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/emacs/default.nix b/packages/emacs/default.nix index cfff445..9bb0125 100644 --- a/packages/emacs/default.nix +++ b/packages/emacs/default.nix @@ -11,12 +11,7 @@ let inputs.emacs-overlay.overlays.emacs ] ); - 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; + all-grammars = pkgs'.tree-sitter.withPlugins builtins.attrValues; treesitGrammars = pkgs'.runCommand "treesit-grammars" { } '' mkdir $out for f in ${all-grammars}/* From f6fd747fb30145196fe257356e9e19987a517ed2 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 21 Jan 2025 20:00:37 +0100 Subject: [PATCH 3/5] Add `visual-replace` --- hmModules/emacs/init.el | 6 ++++++ packages/emacs/packages.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 0056fdb..fa728b8 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -141,6 +141,12 @@ (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)) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 33122dd..af76056 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -184,6 +184,7 @@ let telega aggressive-indent mixed-pitch + visual-replace # org-re-reveal # FIXME very not nice hash mismatch when building ] ) From ee15e3823ecfa5d42a240af959d513b595538f74 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 21 Jan 2025 20:01:14 +0100 Subject: [PATCH 4/5] Enable `rtl-sdr` on `picard` --- hosts/picard/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 13cbb3b..40168a5 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -168,6 +168,8 @@ 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; From 6128c1a1e3b82921c97ebb0821aaad1dc73c844e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 21 Jan 2025 20:01:27 +0100 Subject: [PATCH 5/5] `gptel` floating windows in `niri` --- hmModules/niri/config.kdl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index 43f7a4f..6068cd6 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -314,6 +314,13 @@ window-rule { open-focused true } +window-rule { + match title=r#"^GPTel - Emacs$"# + opacity 0.95 + open-floating true + open-focused true +} + @@ -341,7 +348,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*\"))"; } + Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . 150) (height . 60))'"; } 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"; }