diff --git a/doom.d/config.el b/doom.d/config.el index feb2006..f717a03 100644 --- a/doom.d/config.el +++ b/doom.d/config.el @@ -91,5 +91,21 @@ doom-variable-pitch-font (font-spec :family "Fira Code") doom-big-font-increment 1) -(dotimes (workspace-number 10) - (define-key vterm-mode-map (kbd (format "M-%d" workspace-number)) nil)) +(after! vterm + (dotimes (workspace-number 10) + (define-key vterm-mode-map (kbd (format "M-%d" workspace-number)) nil))) + +(after! polymode (progn + (define-hostmode poly-nix-hostmode :mode 'nix-mode) + + (define-innermode poly-sh-innermode + :mode 'sh-mode + :head-matcher "^.*=.*''.*$" + :tail-matcher "^.*''.*;.*$" + :head-mode 'host + :tail-mode 'host) + + (define-polymode poly-nix-mode + :hostmode 'poly-nix-hostmode + :innermodes '(poly-sh-innermode)) +)) diff --git a/doom.d/packages.el b/doom.d/packages.el index 836db11..38a2a23 100644 --- a/doom.d/packages.el +++ b/doom.d/packages.el @@ -52,3 +52,4 @@ (package! dirvish) (package! git-auto-commit-mode) +(package! polymode) diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index cb44bde..46ae36e 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -63,7 +63,7 @@ in { doomPackageDir = pkgs.linkFarm "my-doom-packages" [ { name = "config.el"; - path = ../../doom.d/config.el; + path = pkgs.emptyFile; } { name = "init.el";