From 05dd85210e465caa44ef7254f2781b2d12ba2882 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 16 Oct 2022 23:49:18 +0200 Subject: Reformat files with alejandra --- user/settings/emacs.nix | 247 ++++++++++++++++++++++++------------------------ 1 file changed, 126 insertions(+), 121 deletions(-) (limited to 'user/settings/emacs.nix') diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 32fb24af..f8eb5c19 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -1,6 +1,9 @@ -{ config, pkgs, lib, ... }: - -let +{ + config, + pkgs, + lib, + ... +}: let inherit (pkgs) stdenv; editorScript = pkgs.writeScriptBin "edit" '' @@ -29,15 +32,14 @@ let Keywords=Text;Editor; ''; }; -in -{ +in { imports = [ ../modules/eshell.nix ]; programs.emacs = { enable = true; - package = lib.mkDefault (pkgs.emacsNativeComp.override { withGTK3 = true; }); + package = lib.mkDefault (pkgs.emacsNativeComp.override {withGTK3 = true;}); eshell = { aliases = { pk = "eshell-up-pk $1"; @@ -66,120 +68,123 @@ in cdg = "cd (projectile-project-root)"; }; }; - extraPackages = epkgs: (with epkgs; [ - ace-link - all-the-icons - almost-mono-themes - add-node-modules-path - ag - all-the-icons - amx - auto-async-byte-compile - avy - bash-completion - caddyfile-mode - cider - clojure-mode - company - company-web - company-tabnine - consult - consult-eglot - counsel - counsel-projectile - crux - docker-compose-mode - dockerfile-mode - dired-git-info - editorconfig - eglot - eldoc-box - emmet-mode - esh-autosuggest - esh-buf-stack - esh-help - eshell-fringe-status - eshell-toggle - eshell-up - evil - evil-anzu - evil-collection - evil-commentary - evil-embrace - evil-ledger - evil-matchit - evil-mu4e - evil-numbers - evil-org - evil-quickscope - evil-space - evil-surround - eyebrowse - feature-mode - format-all - flycheck - flyspell-correct - general - git-gutter-fringe - git-messenger - git-modes - git-timemachine - gitlab-ci-mode - gitlab-ci-mode-flycheck - go-mode - goto-chg - haskell-mode - helpful - ivy-hydra - janet-mode - jinja2-mode - js2-mode - json-mode - k8s-mode - kubel - kubel-evil - ledger-mode - magit - markdown-mode - modus-themes - doom-modeline - nginx-mode - nix-mode - nix-update - org-journal - paredit - php-mode - posframe - projectile - projectile-ripgrep - quickrun - racket-mode - rainbow-mode - rainbow-delimiters - restclient - ripgrep - rjsx-mode - rustic - scss-mode - spacemacs-theme - swiper - tide - toml-mode - tree-sitter - tree-sitter-langs - tree-sitter-indent - typescript-mode - undo-tree - use-package - web-mode - wgrep-ag - ws-butler - which-key - yaml-mode - yasnippet - ] ++ lib.optionals (!stdenv.isDarwin) [ - pkgs.mu - ]); + extraPackages = epkgs: (with epkgs; + [ + ace-link + all-the-icons + almost-mono-themes + add-node-modules-path + ag + all-the-icons + amx + apheleia + auto-async-byte-compile + avy + bash-completion + caddyfile-mode + cider + clojure-mode + company + company-web + company-tabnine + consult + consult-eglot + counsel + counsel-projectile + crux + docker-compose-mode + dockerfile-mode + dired-git-info + editorconfig + eglot + eldoc-box + emmet-mode + esh-autosuggest + esh-buf-stack + esh-help + eshell-fringe-status + eshell-toggle + eshell-up + evil + evil-anzu + evil-collection + evil-commentary + evil-embrace + evil-ledger + evil-matchit + evil-mu4e + evil-numbers + evil-org + evil-quickscope + evil-space + evil-surround + eyebrowse + feature-mode + format-all + flycheck + flyspell-correct + general + git-gutter-fringe + git-messenger + git-modes + git-timemachine + gitlab-ci-mode + gitlab-ci-mode-flycheck + go-mode + goto-chg + haskell-mode + helpful + ivy-hydra + janet-mode + jinja2-mode + js2-mode + json-mode + k8s-mode + kubel + kubel-evil + ledger-mode + magit + markdown-mode + modus-themes + doom-modeline + nginx-mode + nix-mode + nix-update + org-journal + paredit + php-mode + posframe + projectile + projectile-ripgrep + quickrun + racket-mode + rainbow-mode + rainbow-delimiters + restclient + ripgrep + rjsx-mode + rustic + scss-mode + spacemacs-theme + swiper + tide + toml-mode + tree-sitter + tree-sitter-langs + tree-sitter-indent + typescript-mode + undo-tree + use-package + web-mode + wgrep-ag + ws-butler + which-key + yaml-mode + yasnippet + ] + ++ lib.optionals (!stdenv.isDarwin) [ + pkgs.mu + ]); }; home.packages = [ editorScript @@ -191,7 +196,7 @@ in source = ../emacs/early-init.el; onChange = '' ${config.programs.emacs.finalPackage}/bin/emacs -Q -batch -f batch-byte-compile .config/emacs/early-init.el - ''; + ''; }; xdg.configFile."emacs/init.el" = { source = ../emacs/init.el; -- cgit 1.4.1