derped/nixos
1
0
Fork 0
Code Releases Activity

emacs: Adapt to package name changes/merges.

Browse source
This commit is contained in:
Kevin Baensch 2020-01-26 17:45:20 +01:00
parent c1613bdfab
commit fafa62f917
Signed by: derped
GPG key ID: C0F1D326C7626543
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
options/emacs-init-defaults.nix
View file

@ -46,30 +46,12 @@
''; '';
}; };
lsp-rust = {
config = ''
(setq lsp-rust-rls-server-command "${pkgs.rls}/bin/rls")
'';
};
ob-plantuml = {
config = ''
(setq org-plantuml-jar-path "${pkgs.plantuml}/lib/plantuml.jar")
'';
};
pandoc-mode = { pandoc-mode = {
config = '' config = ''
(setq pandoc-binary "${pkgs.pandoc}/bin/pandoc") (setq pandoc-binary "${pkgs.pandoc}/bin/pandoc")
''; '';
}; };
plantuml-mode = {
config = ''
(setq plantuml-jar-path "${pkgs.plantuml}/lib/plantuml.jar")
'';
};
ripgrep = { ripgrep = {
config = '' config = ''
(setq ripgrep-executable "${pkgs.ripgrep}/bin/rg") (setq ripgrep-executable "${pkgs.ripgrep}/bin/rg")

1
pkgs/pkgsets/emacs/flyspell.nix
View file

@ -5,6 +5,7 @@ with lib;
mkIf (elem "emacs::flyspell" config.machine.pkgs) { mkIf (elem "emacs::flyspell" config.machine.pkgs) {
programs.emacs.init.usePackage.flyspell = { programs.emacs.init.usePackage.flyspell = {
enable = true; enable = true;
package = epkgs: null;
diminish = [ "flyspell-mode" ]; diminish = [ "flyspell-mode" ];
command = [ "flyspell-mode" "flyspell-prog-mode" ]; command = [ "flyspell-mode" "flyspell-prog-mode" ];
hook = []; hook = [];

6
pkgs/pkgsets/emacs/org.nix
View file

@ -185,6 +185,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
programs.emacs.init.usePackage.ob = { programs.emacs.init.usePackage.ob = {
enable = true; enable = true;
package = epkgs: [ epkgs.ob-ipython epkgs.ob-rust epkgs.ob-diagrams ];
defer = true; defer = true;
init = '' init = ''
(add-hook 'org-babel-after-execute-hook 'org-display-inline-images 'append) (add-hook 'org-babel-after-execute-hook 'org-display-inline-images 'append)
@ -307,6 +308,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
programs.emacs.init.usePackage.org-src = { programs.emacs.init.usePackage.org-src = {
enable = true; enable = true;
package = epkgs: null;
defer = true; defer = true;
init = ''(put 'org-src-preserve-indentation 'safe-local-variable 'booleanp)''; init = ''(put 'org-src-preserve-indentation 'safe-local-variable 'booleanp)'';
config = '' config = ''
@ -359,10 +361,12 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
programs.emacs.init.usePackage.org-tempo = { programs.emacs.init.usePackage.org-tempo = {
enable = true; enable = true;
package = null;
}; };
programs.emacs.init.usePackage.ox = { programs.emacs.init.usePackage.ox = {
enable = true; enable = true;
package = null;
defer = true; defer = true;
command = []; command = [];
config = '' config = ''
@ -388,6 +392,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
programs.emacs.init.usePackage.ox-md = { programs.emacs.init.usePackage.ox-md = {
enable = true; enable = true;
package = null;
after = [ "ox" ]; after = [ "ox" ];
}; };
@ -398,6 +403,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
programs.emacs.init.usePackage.org-crypt = { programs.emacs.init.usePackage.org-crypt = {
enable = true; enable = true;
package = epkgs: null;
after = [ "org" ]; after = [ "org" ];
hook = [ "(org-mode . (lambda () (add-hook 'before-save-hook 'org-encrypt-entries nil t)))" ]; hook = [ "(org-mode . (lambda () (add-hook 'before-save-hook 'org-encrypt-entries nil t)))" ];
command = [ "org-decrypt-entry" "org-encrypt-entry" ]; command = [ "org-decrypt-entry" "org-encrypt-entry" ];