diff --git a/Droidnix/README.org b/Droidnix/README.org index 54df2bf51..49049a74b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -516,70 +516,6 @@ This sets up the zsh in the terminal ** =generated/modules/traveldroid/apps/emacs/emacs.nix= This installs emacs #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html -{ pkgs, flakeRoot,... }: -{ -programs.emacs = { -enable = true; -# install with tree sitter enabled -package = (pkgs.emacs-pgtk.override { withTreeSitter = true; }); -extraPackages = epkgs: [ - # also install all tree sitter grammars - epkgs.manualPackages.treesit-grammars.with-all-grammars - epkgs.nerd-icons # nerd fonts support - epkgs.doom-modeline # model line - epkgs.diminish # hides modes from modeline - epkgs.eldoc # doc support - epkgs.pulsar # pulses the cursor when jumping about - epkgs.which-key # help porcelain - epkgs.expreg # expand region - epkgs.vundo # undo tree - epkgs.puni # structured editing - epkgs.avy # jumping utility - epkgs.consult # emacs right click - epkgs.vertico # minibuffer completion - epkgs.marginalia # annotations for completions - epkgs.crux # utilities - epkgs.magit # git porcelain - epkgs.nerd-icons-corfu # nerd icons for completion - epkgs.corfu # completion - epkgs.cape # completion extensions - epkgs.orderless # search paradigm - epkgs.yasnippet # snippets support - epkgs.yasnippet-snippets # commonly used snippets - epkgs.rg # ripgrep - epkgs.exec-path-from-shell # load env and path - epkgs.eat # better shell - epkgs.rust-mode # rust mode (when rust-ts doesn't cut it) - epkgs.rustic # more rust things - epkgs.nix-mode # nix lang - epkgs.hcl-mode # hashicorp file mode - epkgs.shell-pop # quick shell popup - epkgs.envrc # support for loading .envrc - epkgs.nixpkgs-fmt # format nix files - epkgs.f # string + file utilities - epkgs.gptel # llm chat (mainly claude) - epkgs.catppuccin-theme # catppuccin theme - epkgs.eldoc-box # docs in a box - epkgs.sideline # mainly for flymake errors on the side - epkgs.sideline-flymake # mainly for flymake errors on the side - epkgs.sideline-eglot # mainly for flymake errors on the side -]; -}; -home.sessionVariables = { -EDITOR = "emacs"; -XDG_SCREENSHOTS_DIR = "~/screenshots"; -}; -home.file = { -emacs-init = { - source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; - target = ".emacs.d/early-init.el"; -}; -emacs = { - source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el"; - target = ".emacs.d/init.el"; -}; -}; -} #+END_SRC diff --git a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix index 02aa2831c..8b1378917 100644 --- a/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix +++ b/Droidnix/generated/modules/traveldroid/apps/emacs/emacs.nix @@ -1,64 +1 @@ -{ pkgs, flakeRoot,... }: -{ -programs.emacs = { -enable = true; -# install with tree sitter enabled -package = (pkgs.emacs-pgtk.override { withTreeSitter = true; }); -extraPackages = epkgs: [ - # also install all tree sitter grammars - epkgs.manualPackages.treesit-grammars.with-all-grammars - epkgs.nerd-icons # nerd fonts support - epkgs.doom-modeline # model line - epkgs.diminish # hides modes from modeline - epkgs.eldoc # doc support - epkgs.pulsar # pulses the cursor when jumping about - epkgs.which-key # help porcelain - epkgs.expreg # expand region - epkgs.vundo # undo tree - epkgs.puni # structured editing - epkgs.avy # jumping utility - epkgs.consult # emacs right click - epkgs.vertico # minibuffer completion - epkgs.marginalia # annotations for completions - epkgs.crux # utilities - epkgs.magit # git porcelain - epkgs.nerd-icons-corfu # nerd icons for completion - epkgs.corfu # completion - epkgs.cape # completion extensions - epkgs.orderless # search paradigm - epkgs.yasnippet # snippets support - epkgs.yasnippet-snippets # commonly used snippets - epkgs.rg # ripgrep - epkgs.exec-path-from-shell # load env and path - epkgs.eat # better shell - epkgs.rust-mode # rust mode (when rust-ts doesn't cut it) - epkgs.rustic # more rust things - epkgs.nix-mode # nix lang - epkgs.hcl-mode # hashicorp file mode - epkgs.shell-pop # quick shell popup - epkgs.envrc # support for loading .envrc - epkgs.nixpkgs-fmt # format nix files - epkgs.f # string + file utilities - epkgs.gptel # llm chat (mainly claude) - epkgs.catppuccin-theme # catppuccin theme - epkgs.eldoc-box # docs in a box - epkgs.sideline # mainly for flymake errors on the side - epkgs.sideline-flymake # mainly for flymake errors on the side - epkgs.sideline-eglot # mainly for flymake errors on the side -]; -}; -home.sessionVariables = { -EDITOR = "emacs"; -XDG_SCREENSHOTS_DIR = "~/screenshots"; -}; -home.file = { -emacs-init = { - source = "${flakeRoot}/assets/traveldroid/conf/emacs/early-init.el"; - target = ".emacs.d/early-init.el"; -}; -emacs = { - source = "${flakeRoot}/assets/traveldroid/conf/emacs/init.el"; - target = ".emacs.d/init.el"; -}; -}; -} +