sort paragraphs in emacs.nix, nixfmt, add indent preserve to separedit

This commit is contained in:
willemml 2023-01-22 10:45:09 -08:00
parent f051150ac5
commit bc6254b8c3
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD

661
emacs.nix
View file

@ -110,43 +110,51 @@ in {
'';
usePackage = {
dracula-theme = {
calibredb = {
enable = true;
extraPackages = [ pkgs.sqlite ];
config = ''
(load-theme 'dracula t)
; -*-emacs-lisp-*-
(setq calibredb-root-dir "~/Documents/calibre-library")
(setq calibredb-db-dir (expand-file-name "metadata.db" calibredb-root-dir))
(setq calibredb-library-alist '(("~/Documents/calibre-library")))
(setq sql-sqlite-program "${pkgs.sqlite}/bin/sqlite3")
'';
};
yasnippet = {
cdlatex = {
enable = true;
config = ''
(setq yas-snippet-dirs '("~/Documents/org/snippets"))
(yas-global-mode 1)
after = [ "latex" ];
init = ''
(add-hook 'LaTeX-mode-hook #'turn-on-cdlatex)
'';
};
yasnippet-snippets = {
citeproc.enable = true;
company = {
enable = true;
config = ''
(yas-reload-all)
defines = [ "comapny-text-icons-margin" ];
init = ''
;; Align company-mode tooltips to the right hand side
(setq company-tooltip-align-annotations t)
;; Display number of completions before and after current suggestions
;; in company-mode
(setq company-tooltip-offset-display 'lines)
;; Display text icon of type in company popup
(setq company-format-margin-function #'company-text-icons-margin)
'';
hook =
[ "(sh-mode . company-mode)" "(emacs-lisp-mode . company-mode)" ];
};
ivy = {
company-math = {
enable = true;
command = [ "ivy-mode" ];
extraConfig = ''
:custom
(ivy-use-virtual-buffers t)
(enable-recursive-minibuffers t)
after = [ "company" ];
init = ''
; -*-emacs-lisp-*-
(add-to-list 'company-backends 'company-math-symbols-unicode)
'';
bind = { "C-c C-r" = "ivy-resume"; };
hook = [ "(after-init . ivy-mode)" ];
};
swiper = {
enable = true;
bind = { "C-s" = "swiper"; };
};
counsel = {
@ -171,31 +179,21 @@ in {
};
};
company = {
edit-indirect.enable = true;
editorconfig = {
enable = true;
defines = [ "comapny-text-icons-margin" ];
init = ''
;; Align company-mode tooltips to the right hand side
(setq company-tooltip-align-annotations t)
;; Display number of completions before and after current suggestions
;; in company-mode
(setq company-tooltip-offset-display 'lines)
;; Display text icon of type in company popup
(setq company-format-margin-function #'company-text-icons-margin)
config = ''
(editorconfig-mode 1)
'';
hook =
[ "(sh-mode . company-mode)" "(emacs-lisp-mode . company-mode)" ];
};
rust-mode = {
flycheck = {
enable = true;
bindLocal.rust-mode-map = {
"C-c C-y" = "lsp-format-buffer";
"C-c C-c" = "rust-run-clippy";
"C-c C-r" = "rust-run";
"C-c C-t" = "rust-test";
"C-c C-o" = "rust-compile";
};
hook = [ "(after-init . global-flycheck-mode)" ];
config = ''
(setq flycheck-disabled-checkers '(emacs-lisp-checkdoc))
'';
};
format-all = {
@ -208,21 +206,88 @@ in {
extraPackages = [ pkgs.black pkgs.shellcheck pkgs.clang-tools ];
};
tree-sitter = {
gnuplot = {
enable = true;
init = ''
(setq tree-sitter-major-mode-language-alist '((arduino-mode . c)))
(require 'gnuplot)
(autoload 'gnuplot-mode "gnuplot" "Gnuplot major mode" t)
(autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot-mode" t)
(setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode)) auto-mode-alist))
(require 'gnuplot-context)
'';
hook = [
"(rust-mode . tree-sitter-hl-mode)"
"(python-mode . tree-sitter-hl-mode)"
"(c-mode . tree-sitter-hl-mode)"
"(shell-mode . tree-sitter-hl-mode)"
"(javascript-mode . tree-sitter-hl-mode)"
];
extraPackages = [ pkgs.gnuplot ];
};
tree-sitter-langs.enable = true;
graphviz-dot-mode = {
enable = true;
bindLocal.graphviz-dot-mode-map = {
"C-c C-y" = "graphviz-dot-indent-graph";
};
extraPackages = [ pkgs.graphviz ];
};
htmlize.enable = true;
ivy = {
enable = true;
command = [ "ivy-mode" ];
extraConfig = ''
:custom
(ivy-use-virtual-buffers t)
(enable-recursive-minibuffers t)
'';
bind = { "C-c C-r" = "ivy-resume"; };
hook = [ "(after-init . ivy-mode)" ];
};
ivy-bibtex = {
enable = true;
init = ''
; -*-emacs-lisp-*-
;; ivy-bibtex requires ivy's `ivy--regex-ignore-order` regex builder, which
;; ignores the order of regexp tokens when searching for matching candidates.
(setq ivy-re-builders-alist
'((ivy-bibtex . ivy--regex-ignore-order)
(t . ivy--regex-plus)))
(setq ivy-bibtex-bibliography '("~/Documents/org/zotero.bib"))
(setq reftex-default-bibliography '("~/Documents/org/zotero.bib"))
(setq bibtex-completion-pdf-field "file")
'';
};
latex = {
enable = true;
package = epkgs: epkgs.auctex;
hook = [''
(LaTeX-mode
. (lambda ()
(turn-on-reftex)))
''];
init = ''
(setq TeX-PDF-mode t
TeX-auto-save t
TeX-parse-self t)
'';
};
lsp-ivy = {
enable = true;
command = [ "lsp-ivy-workspace-symbol" ];
};
lsp-java = {
enable = true;
init = ''
; -*-emacs-lisp-*-
(setq lsp-java-format-settings-url
"https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml")
(setq lsp-java-format-settings-profile
"GoogleStyle")
(setq lsp-java-jdt-download-url
"https://download.eclipse.org/jdtls/milestones/1.16.0/jdt-language-server-1.16.0-202209291445.tar.gz")
'';
hook = [ "(java-mode . lsp)" ];
};
lsp-mode = {
enable = true;
@ -266,51 +331,102 @@ in {
extraPackages = [ pkgs.nodePackages.bash-language-server ];
};
lsp-ui = {
enable = true;
command = [ "lsp-ui-mode" ];
};
lsp-ivy = {
enable = true;
command = [ "lsp-ivy-workspace-symbol" ];
};
lsp-treemacs = {
enable = true;
command = [ "lsp-treemacs-errors-lisp" ];
};
lsp-java = {
lsp-ui = {
enable = true;
command = [ "lsp-ui-mode" ];
};
meow = {
enable = false;
init = ''
; -*-emacs-lisp-*-
(setq lsp-java-format-settings-url
"https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml")
(setq lsp-java-format-settings-profile
"GoogleStyle")
(setq lsp-java-jdt-download-url
"https://download.eclipse.org/jdtls/milestones/1.16.0/jdt-language-server-1.16.0-202209291445.tar.gz")
'';
hook = [ "(java-mode . lsp)" ];
};
flycheck = {
enable = true;
hook = [ "(after-init . global-flycheck-mode)" ];
config = ''
(setq flycheck-disabled-checkers '(emacs-lisp-checkdoc))
'';
};
arduino-mode = {
enable = true;
config = ''
(require 'flycheck-arduino)
(add-hook 'arduino-mode-hook #'flycheck-arduino-setup)
'';
init = ''
(setq arduino-executable "/Applications/Arduino.app/Contents/MacOS/Arduino")
(defun meow-setup ()
(setq meow-cheatsheet-layout meow-cheatsheet-layout-colemak)
(meow-motion-overwrite-define-key
;; Use e to move up, n to move down.
;; Since special modes usually use n to move down, we only overwrite e here.
'("e" . meow-prev)
'("<escape>" . ignore))
(meow-leader-define-key
'("?" . meow-cheatsheet)
;; To execute the originally e in MOTION state, use SPC e.
'("e" . "H-e")
'("1" . meow-digit-argument)
'("2" . meow-digit-argument)
'("3" . meow-digit-argument)
'("4" . meow-digit-argument)
'("5" . meow-digit-argument)
'("6" . meow-digit-argument)
'("7" . meow-digit-argument)
'("8" . meow-digit-argument)
'("9" . meow-digit-argument)
'("0" . meow-digit-argument))
(meow-normal-define-key
'("0" . meow-expand-0)
'("1" . meow-expand-1)
'("2" . meow-expand-2)
'("3" . meow-expand-3)
'("4" . meow-expand-4)
'("5" . meow-expand-5)
'("6" . meow-expand-6)
'("7" . meow-expand-7)
'("8" . meow-expand-8)
'("9" . meow-expand-9)
'("-" . negative-argument)
'(";" . meow-reverse)
'("," . meow-inner-of-thing)
'("." . meow-bounds-of-thing)
'("[" . meow-beginning-of-thing)
'("]" . meow-end-of-thing)
'("/" . meow-visit)
'("a" . meow-append)
'("A" . meow-open-below)
'("b" . meow-back-word)
'("B" . meow-back-symbol)
'("c" . meow-change)
'("d" . meow-delete)
'("e" . meow-prev)
'("E" . meow-prev-expand)
'("f" . meow-find)
'("g" . meow-cancel-selection)
'("G" . meow-grab)
'("h" . meow-left)
'("H" . meow-left-expand)
'("i" . meow-right)
'("I" . meow-right-expand)
'("j" . meow-join)
'("k" . meow-kill)
'("l" . meow-line)
'("L" . meow-goto-line)
'("m" . meow-mark-word)
'("M" . meow-mark-symbol)
'("n" . meow-next)
'("N" . meow-next-expand)
'("o" . meow-block)
'("O" . meow-to-block)
'("p" . meow-yank)
'("q" . meow-quit)
'("r" . meow-replace)
'("s" . meow-insert)
'("S" . meow-open-above)
'("t" . meow-till)
'("u" . meow-undo)
'("U" . meow-undo-in-selection)
'("v" . meow-search)
'("w" . meow-next-word)
'("W" . meow-next-symbol)
'("x" . meow-delete)
'("X" . meow-backward-delete)
'("y" . meow-save)
'("z" . meow-pop-selection)
'("'" . repeat)
'("<escape>" . ignore)))
(meow-setup)
'';
};
@ -327,7 +443,59 @@ in {
extraPackages = [ pkgs.nixfmt ];
};
edit-indirect.enable = true;
ob-calc = {
enable = true;
after = [ "org" ];
};
ob-dot = {
enable = true;
after = [ "org" ];
};
ob-emacs-lisp = {
enable = true;
after = [ "org" ];
};
ob-gnuplot = {
enable = true;
after = [ "org" ];
};
ob-matlab = {
enable = true;
after = [ "org" ];
init = ''
; -*-emacs-lisp-*-
(setq org-babel-octave-shell-command "${pkgs.octave}/bin/octave -q")
(setq org-babel-matlab-shell-command "~/Applications/MATLAB_R2022b.app/bin/matlab -nosplash")
'';
extraPackages = [ pkgs.octave pkgs.texinfo4 ];
};
ob-python = {
enable = true;
extraPackages = [
(pkgs.python310.withPackages (p: with p; [ matplotlib latexify-py ]))
];
after = [ "org" ];
config = ''
; -*-emacs-lisp-*-
(setq org-babel-python-command "${pkgs.python310}/bin/python3.10")
(setq-default python-indent-guess-indent-offset-verbose nil)
(defun my/org-babel-execute:python-session (body params)
(let ((session-name (cdr (assq :session params))))
(when (not (eq session-name "none"))
(org-babel-python-initiate-session session-name))))
(advice-add #'org-babel-execute:python :before #'my/org-babel-execute:python-session)
'';
};
ob-shell = {
enable = true;
after = [ "org" ];
};
org = {
enable = true;
@ -441,125 +609,8 @@ in {
extraPackages = [ pkgs.texlive.combined.scheme-full ];
};
htmlize.enable = true;
gnuplot = {
enable = true;
init = ''
(require 'gnuplot)
(autoload 'gnuplot-mode "gnuplot" "Gnuplot major mode" t)
(autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot-mode" t)
(setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode)) auto-mode-alist))
(require 'gnuplot-context)
'';
extraPackages = [ pkgs.gnuplot ];
};
org-contrib.enable = true;
plantuml-mode = {
enable = true;
init = ''
(setq plantuml-executable-path "${pkgs.plantuml}/bin/plantuml")
(setq plantuml-default-exec-mode 'executable)
'';
extraPackages = [ pkgs.plantuml ];
};
graphviz-dot-mode = {
enable = true;
bindLocal.graphviz-dot-mode-map = {
"C-c C-y" = "graphviz-dot-indent-graph";
};
extraPackages = [ pkgs.graphviz ];
};
ob-dot = {
enable = true;
after = [ "org" ];
};
ob-shell = {
enable = true;
after = [ "org" ];
};
ob-calc = {
enable = true;
after = [ "org" ];
};
ob-emacs-lisp = {
enable = true;
after = [ "org" ];
};
ob-gnuplot = {
enable = true;
after = [ "org" ];
};
ob-matlab = {
enable = true;
after = [ "org" ];
init = ''
; -*-emacs-lisp-*-
(setq org-babel-octave-shell-command "${pkgs.octave}/bin/octave -q")
(setq org-babel-matlab-shell-command "~/Applications/MATLAB_R2022b.app/bin/matlab -nosplash")
'';
extraPackages = [ pkgs.octave pkgs.texinfo4 ];
};
ob-python = {
enable = true;
extraPackages = [
(pkgs.python310.withPackages (p: with p; [ matplotlib latexify-py ]))
];
after = [ "org" ];
config = ''
; -*-emacs-lisp-*-
(setq org-babel-python-command "${pkgs.python310}/bin/python3.10")
(setq-default python-indent-guess-indent-offset-verbose nil)
(defun my/org-babel-execute:python-session (body params)
(let ((session-name (cdr (assq :session params))))
(when (not (eq session-name "none"))
(org-babel-python-initiate-session session-name))))
(advice-add #'org-babel-execute:python :before #'my/org-babel-execute:python-session)
'';
};
latex = {
enable = true;
package = epkgs: epkgs.auctex;
hook = [''
(LaTeX-mode
. (lambda ()
(turn-on-reftex)))
''];
init = ''
(setq TeX-PDF-mode t
TeX-auto-save t
TeX-parse-self t)
'';
};
company-math = {
enable = true;
after = [ "company" ];
init = ''
; -*-emacs-lisp-*-
(add-to-list 'company-backends 'company-math-symbols-unicode)
'';
};
cdlatex = {
enable = true;
after = [ "latex" ];
init = ''
(add-hook 'LaTeX-mode-hook #'turn-on-cdlatex)
'';
};
org-download = {
enable = true;
init = ''
@ -570,25 +621,6 @@ in {
extraPackages = [ pkgs.pngpaste ];
};
#
# Start bibtex cite/ref section
#
ivy-bibtex = {
enable = true;
init = ''
; -*-emacs-lisp-*-
;; ivy-bibtex requires ivy's `ivy--regex-ignore-order` regex builder, which
;; ignores the order of regexp tokens when searching for matching candidates.
(setq ivy-re-builders-alist
'((ivy-bibtex . ivy--regex-ignore-order)
(t . ivy--regex-plus)))
(setq ivy-bibtex-bibliography '("~/Documents/org/zotero.bib"))
(setq reftex-default-bibliography '("~/Documents/org/zotero.bib"))
(setq bibtex-completion-pdf-field "file")
'';
};
org-ref = {
enable = true;
init = ''
@ -604,8 +636,6 @@ in {
bindLocal.org-mode-map = { "C-c ]" = "org-ref-insert-link"; };
};
citeproc.enable = true;
pdf-tools = {
enable = true;
init = ''
@ -617,122 +647,91 @@ in {
};
#
# End bibtex cite/ref section
plantuml-mode = {
enable = true;
init = ''
(setq plantuml-executable-path "${pkgs.plantuml}/bin/plantuml")
(setq plantuml-default-exec-mode 'executable)
'';
extraPackages = [ pkgs.plantuml ];
};
#
calibredb = {
rust-mode = {
enable = true;
extraPackages = [ pkgs.sqlite ];
config = ''
; -*-emacs-lisp-*-
(setq calibredb-root-dir "~/Documents/calibre-library")
(setq calibredb-db-dir (expand-file-name "metadata.db" calibredb-root-dir))
(setq calibredb-library-alist '(("~/Documents/calibre-library")))
(setq sql-sqlite-program "${pkgs.sqlite}/bin/sqlite3")
'';
bindLocal.rust-mode-map = {
"C-c C-y" = "lsp-format-buffer";
"C-c C-c" = "rust-run-clippy";
"C-c C-r" = "rust-run";
"C-c C-t" = "rust-test";
"C-c C-o" = "rust-compile";
};
};
separedit = {
enable = true;
bind = { "C-c '" = "separedit"; };
hook = [ "(separedit-buffer-creation . normal-mode)" ];
};
editorconfig = {
enable = true;
config = ''
(editorconfig-mode 1)
'';
};
meow = {
enable = false;
init = ''
; -*-emacs-lisp-*-
(defun meow-setup ()
(setq meow-cheatsheet-layout meow-cheatsheet-layout-colemak)
(meow-motion-overwrite-define-key
;; Use e to move up, n to move down.
;; Since special modes usually use n to move down, we only overwrite e here.
'("e" . meow-prev)
'("<escape>" . ignore))
(meow-leader-define-key
'("?" . meow-cheatsheet)
;; To execute the originally e in MOTION state, use SPC e.
'("e" . "H-e")
'("1" . meow-digit-argument)
'("2" . meow-digit-argument)
'("3" . meow-digit-argument)
'("4" . meow-digit-argument)
'("5" . meow-digit-argument)
'("6" . meow-digit-argument)
'("7" . meow-digit-argument)
'("8" . meow-digit-argument)
'("9" . meow-digit-argument)
'("0" . meow-digit-argument))
(meow-normal-define-key
'("0" . meow-expand-0)
'("1" . meow-expand-1)
'("2" . meow-expand-2)
'("3" . meow-expand-3)
'("4" . meow-expand-4)
'("5" . meow-expand-5)
'("6" . meow-expand-6)
'("7" . meow-expand-7)
'("8" . meow-expand-8)
'("9" . meow-expand-9)
'("-" . negative-argument)
'(";" . meow-reverse)
'("," . meow-inner-of-thing)
'("." . meow-bounds-of-thing)
'("[" . meow-beginning-of-thing)
'("]" . meow-end-of-thing)
'("/" . meow-visit)
'("a" . meow-append)
'("A" . meow-open-below)
'("b" . meow-back-word)
'("B" . meow-back-symbol)
'("c" . meow-change)
'("d" . meow-delete)
'("e" . meow-prev)
'("E" . meow-prev-expand)
'("f" . meow-find)
'("g" . meow-cancel-selection)
'("G" . meow-grab)
'("h" . meow-left)
'("H" . meow-left-expand)
'("i" . meow-right)
'("I" . meow-right-expand)
'("j" . meow-join)
'("k" . meow-kill)
'("l" . meow-line)
'("L" . meow-goto-line)
'("m" . meow-mark-word)
'("M" . meow-mark-symbol)
'("n" . meow-next)
'("N" . meow-next-expand)
'("o" . meow-block)
'("O" . meow-to-block)
'("p" . meow-yank)
'("q" . meow-quit)
'("r" . meow-replace)
'("s" . meow-insert)
'("S" . meow-open-above)
'("t" . meow-till)
'("u" . meow-undo)
'("U" . meow-undo-in-selection)
'("v" . meow-search)
'("w" . meow-next-word)
'("W" . meow-next-symbol)
'("x" . meow-delete)
'("X" . meow-backward-delete)
'("y" . meow-save)
'("z" . meow-pop-selection)
'("'" . repeat)
'("<escape>" . ignore)))
(meow-setup)
(setq separedit-preserve-string-indentation t)
'';
};
swiper = {
enable = true;
bind = { "C-s" = "swiper"; };
};
tree-sitter = {
enable = true;
init = ''
(setq tree-sitter-major-mode-language-alist '((arduino-mode . c)))
'';
hook = [
"(rust-mode . tree-sitter-hl-mode)"
"(python-mode . tree-sitter-hl-mode)"
"(c-mode . tree-sitter-hl-mode)"
"(shell-mode . tree-sitter-hl-mode)"
"(javascript-mode . tree-sitter-hl-mode)"
];
};
tree-sitter-langs.enable = true;
yasnippet = {
enable = true;
config = ''
(setq yas-snippet-dirs '("~/Documents/org/snippets"))
(yas-global-mode 1)
'';
};
yasnippet-snippets = {
enable = true;
config = ''
(yas-reload-all)
'';
};
arduino-mode = {
enable = true;
config = ''
(require 'flycheck-arduino)
(add-hook 'arduino-mode-hook #'flycheck-arduino-setup)
'';
init = ''
(setq arduino-executable "/Applications/Arduino.app/Contents/MacOS/Arduino")
'';
};
dracula-theme = {
enable = true;
config = ''
(load-theme 'dracula t)
'';
};
};
};
}