From 9fbcd61b14761e6d957a02d5252e487258b026bc Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 17 Sep 2025 00:25:17 +0800 Subject: [PATCH] Improve emacs configuration --- home/david/modules/programs/doom/config/config.el | 4 ++++ home/david/modules/programs/doom/config/init.el | 4 ++-- home/david/modules/programs/doom/default.nix | 11 ++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/home/david/modules/programs/doom/config/config.el b/home/david/modules/programs/doom/config/config.el index 94ea667..b4fff06 100644 --- a/home/david/modules/programs/doom/config/config.el +++ b/home/david/modules/programs/doom/config/config.el @@ -79,3 +79,7 @@ NOTE: wayland only." (let* ((fpath (telega--tl-get dfile :local :path))) (shell-command (format "wl-copy < \"%s\"" fpath)) (message (format "File saved to clipboard: %s" fpath)))))))) + +(map! :map global-map + "C-c n" + #'helm-nixos-options) diff --git a/home/david/modules/programs/doom/config/init.el b/home/david/modules/programs/doom/config/init.el index 706c70f..10af537 100644 --- a/home/david/modules/programs/doom/config/init.el +++ b/home/david/modules/programs/doom/config/init.el @@ -23,8 +23,8 @@ ;;layout ; auie,ctsrnm is the superior home row :completion - ;;company ; the ultimate code completion backend - (corfu +orderless) ; complete with cap(f), cape and a flying feather! + (company +childframe) ; the ultimate code completion backend + ;;(corfu +orderless) ; complete with cap(f), cape and a flying feather! ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... ;;ivy ; a search engine for love and life diff --git a/home/david/modules/programs/doom/default.nix b/home/david/modules/programs/doom/default.nix index 8f326a8..2524c21 100644 --- a/home/david/modules/programs/doom/default.nix +++ b/home/david/modules/programs/doom/default.nix @@ -2,10 +2,18 @@ config, lib, pkgs, + inputs, ... }: let cfg = config.david.programs.doom; + + inherit (inputs) emacs-overlay nixpkgs; + inherit (pkgs) system; + pkgs' = import nixpkgs { + inherit system; + overlays = [ emacs-overlay.overlays.default ]; + }; in { options = { @@ -18,10 +26,11 @@ in services.emacs.enable = true; programs.doom-emacs = { enable = true; - emacs = pkgs.emacs-pgtk; + emacs = pkgs'.emacs-igc-pgtk; extraPackages = ep: with ep; [ melpaPackages.telega + melpaPackages.nixos-options ]; extraBinPackages = with pkgs; [ editor-runtime