2019-12-14 16:25:04 +01:00
|
|
|
# This file builds an Emacs pre-configured with the packages I need
|
|
|
|
# and my personal Emacs configuration.
|
2023-08-27 01:22:20 +02:00
|
|
|
{ depot, lib, pkgs, ... }:
|
2018-03-04 00:07:38 +01:00
|
|
|
|
2021-04-14 12:36:36 +02:00
|
|
|
pkgs.makeOverridable
|
2023-08-29 14:46:23 +02:00
|
|
|
({ emacs ? pkgs.emacs29 }:
|
2019-12-14 13:47:07 +01:00
|
|
|
let
|
2022-03-13 17:19:07 +01:00
|
|
|
emacsWithPackages = (pkgs.emacsPackagesFor emacs).emacsWithPackages;
|
2018-09-19 22:59:42 +02:00
|
|
|
|
2021-12-13 16:53:22 +01:00
|
|
|
# If switching telega versions, use this variable because it will
|
|
|
|
# keep the version check, binary path and so on in sync.
|
|
|
|
currentTelega = epkgs: epkgs.melpaPackages.telega;
|
|
|
|
|
2019-12-19 15:48:22 +01:00
|
|
|
# $PATH for binaries that need to be available to Emacs
|
2021-12-18 21:28:29 +01:00
|
|
|
emacsBinPath = lib.makeBinPath [
|
|
|
|
(currentTelega pkgs.emacsPackages)
|
|
|
|
pkgs.libwebp # for dwebp, required by telega
|
|
|
|
];
|
2019-12-19 15:48:22 +01:00
|
|
|
|
2019-12-16 12:59:07 +01:00
|
|
|
identity = x: x;
|
2020-02-07 13:41:43 +01:00
|
|
|
|
2023-09-12 16:43:20 +02:00
|
|
|
# tree-sitter grammars for various ts-modes
|
|
|
|
customTreesitGrammars = emacs.pkgs.treesit-grammars.with-grammars (g: with g; [
|
|
|
|
tree-sitter-bash
|
|
|
|
tree-sitter-c
|
|
|
|
tree-sitter-cmake
|
|
|
|
tree-sitter-cpp
|
2023-09-26 17:34:09 +02:00
|
|
|
tree-sitter-css
|
2023-09-12 17:56:57 +02:00
|
|
|
tree-sitter-dockerfile
|
2023-09-12 16:43:20 +02:00
|
|
|
tree-sitter-go
|
2023-09-26 17:34:09 +02:00
|
|
|
tree-sitter-gomod
|
|
|
|
tree-sitter-hcl
|
|
|
|
tree-sitter-html
|
2023-09-12 16:43:20 +02:00
|
|
|
tree-sitter-java
|
|
|
|
tree-sitter-json
|
|
|
|
tree-sitter-latex
|
2023-09-26 17:34:09 +02:00
|
|
|
tree-sitter-make
|
2023-09-12 16:43:20 +02:00
|
|
|
tree-sitter-nix
|
|
|
|
tree-sitter-python
|
|
|
|
tree-sitter-rust
|
2023-09-26 17:34:09 +02:00
|
|
|
tree-sitter-sql
|
2023-09-12 16:43:20 +02:00
|
|
|
tree-sitter-toml
|
|
|
|
tree-sitter-yaml
|
|
|
|
]);
|
|
|
|
|
2021-08-24 18:40:41 +02:00
|
|
|
tazjinsEmacs = pkgfun: (emacsWithPackages (epkgs: pkgfun (with epkgs; [
|
2020-02-05 12:58:57 +01:00
|
|
|
ace-link
|
2021-08-24 18:40:41 +02:00
|
|
|
ace-window
|
|
|
|
avy
|
|
|
|
bazel
|
2018-03-04 00:07:38 +01:00
|
|
|
browse-kill-ring
|
|
|
|
cargo
|
2019-12-14 13:47:07 +01:00
|
|
|
clojure-mode
|
2021-08-24 18:40:41 +02:00
|
|
|
company
|
refactor(tazjin/emacs): ivy,swiper,counsel -> vertico,consult
vertico and consult are more modern versions of interactive narrowing
helpers, as those implemented by ivy and its related packages.
The primary differences (and what I care about here) is that they are
more focused on integration with the core Emacs primitives, rather
than building an ecosystem around them.
For example:
* vertico enhances `completing-read' and friends, but does not attempt
to provide its own ecosystem of functions to *trigger* completions.
* vertico integrates with the default `completion-style' system,
meaning that I can continue to use things like prescient without
extra packages that integrate it with vertico
* consult does not rely on vertico or any other specific completion
framework (such as counsel/swiper do with ivy), and simply
implements its functions using completing-read
This reduces the overall amount of code in the dependency closure and
leads to a less special setup.
Functionality is basically equivalent, except for two things which
counsel came with that I will need to substitute:
* counsel-notmuch (actually this was a separate package, but I didn't
use it much anyways, so just ignoring it for now)
* counsel-linux-app (opening desktop shortcuts, this I will need to make)
As a side note, consult notes "This package is a part of GNU Emacs",
but it doesn't seem to be the case.
Change-Id: Ia046b763bf3d401b505e0f6393cfe1ccd6f41293
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9155
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
2023-08-27 00:12:29 +02:00
|
|
|
consult
|
2022-05-22 21:01:30 +02:00
|
|
|
deft
|
2019-12-14 13:47:07 +01:00
|
|
|
direnv
|
2018-07-14 16:18:21 +02:00
|
|
|
elixir-mode
|
2019-01-30 10:14:50 +01:00
|
|
|
elm-mode
|
2021-08-24 18:40:41 +02:00
|
|
|
erlang
|
|
|
|
exwm
|
2018-03-04 00:07:38 +01:00
|
|
|
go-mode
|
2021-08-24 18:40:41 +02:00
|
|
|
google-c-style
|
2018-03-04 00:07:38 +01:00
|
|
|
gruber-darker-theme
|
|
|
|
haskell-mode
|
|
|
|
ht
|
2018-06-19 15:21:34 +02:00
|
|
|
hydra
|
2018-03-04 00:07:38 +01:00
|
|
|
idle-highlight-mode
|
2023-09-02 18:35:07 +02:00
|
|
|
inspector
|
2018-06-08 00:13:27 +02:00
|
|
|
jq-mode
|
2018-05-01 16:06:28 +02:00
|
|
|
kotlin-mode
|
2023-08-02 11:51:34 +02:00
|
|
|
kubernetes
|
2018-03-04 00:07:38 +01:00
|
|
|
magit
|
2018-06-15 13:56:47 +02:00
|
|
|
markdown-toc
|
2018-03-04 00:07:38 +01:00
|
|
|
multiple-cursors
|
2018-04-23 15:33:05 +02:00
|
|
|
nginx-mode
|
2018-10-10 11:21:15 +02:00
|
|
|
nix-mode
|
2021-09-01 12:07:11 +02:00
|
|
|
notmuch
|
2018-03-04 00:07:38 +01:00
|
|
|
paredit
|
|
|
|
password-store
|
2021-08-24 18:40:41 +02:00
|
|
|
pinentry
|
2018-10-10 11:21:15 +02:00
|
|
|
prescient
|
2020-04-07 00:19:52 +02:00
|
|
|
protobuf-mode
|
2018-03-04 00:07:38 +01:00
|
|
|
rainbow-delimiters
|
2021-08-24 18:40:41 +02:00
|
|
|
rainbow-mode
|
2019-12-17 00:55:12 +01:00
|
|
|
request
|
2020-01-17 18:48:13 +01:00
|
|
|
restclient
|
2021-06-01 23:25:36 +02:00
|
|
|
rust-mode
|
2019-12-14 13:47:07 +01:00
|
|
|
sly
|
2022-11-18 15:01:41 +01:00
|
|
|
string-edit-at-point
|
2018-06-15 00:12:06 +02:00
|
|
|
telephone-line
|
2018-06-15 13:56:47 +02:00
|
|
|
terraform-mode
|
2021-08-24 18:40:41 +02:00
|
|
|
undo-tree
|
2018-03-04 00:07:38 +01:00
|
|
|
uuidgen
|
refactor(tazjin/emacs): ivy,swiper,counsel -> vertico,consult
vertico and consult are more modern versions of interactive narrowing
helpers, as those implemented by ivy and its related packages.
The primary differences (and what I care about here) is that they are
more focused on integration with the core Emacs primitives, rather
than building an ecosystem around them.
For example:
* vertico enhances `completing-read' and friends, but does not attempt
to provide its own ecosystem of functions to *trigger* completions.
* vertico integrates with the default `completion-style' system,
meaning that I can continue to use things like prescient without
extra packages that integrate it with vertico
* consult does not rely on vertico or any other specific completion
framework (such as counsel/swiper do with ivy), and simply
implements its functions using completing-read
This reduces the overall amount of code in the dependency closure and
leads to a less special setup.
Functionality is basically equivalent, except for two things which
counsel came with that I will need to substitute:
* counsel-notmuch (actually this was a separate package, but I didn't
use it much anyways, so just ignoring it for now)
* counsel-linux-app (opening desktop shortcuts, this I will need to make)
As a side note, consult notes "This package is a part of GNU Emacs",
but it doesn't seem to be the case.
Change-Id: Ia046b763bf3d401b505e0f6393cfe1ccd6f41293
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9155
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
2023-08-27 00:12:29 +02:00
|
|
|
vertico
|
2021-08-24 18:40:41 +02:00
|
|
|
vterm
|
2018-05-23 12:17:20 +02:00
|
|
|
web-mode
|
2018-06-06 23:32:55 +02:00
|
|
|
websocket
|
2019-12-14 13:47:07 +01:00
|
|
|
which-key
|
2021-08-24 18:40:41 +02:00
|
|
|
xelb
|
2020-03-29 23:30:47 +02:00
|
|
|
yasnippet
|
2022-05-22 21:01:30 +02:00
|
|
|
zetteldeft
|
2021-12-20 09:45:45 +01:00
|
|
|
zoxide
|
2020-02-24 17:40:43 +01:00
|
|
|
|
2021-12-13 16:53:22 +01:00
|
|
|
# Wonky stuff
|
|
|
|
(currentTelega epkgs)
|
2023-09-12 16:43:20 +02:00
|
|
|
customTreesitGrammars # TODO(tazjin): how is this *supposed* to work?!
|
2021-12-13 16:53:22 +01:00
|
|
|
|
2021-08-24 18:40:41 +02:00
|
|
|
# Custom depot packages (either ours, or overridden ones)
|
|
|
|
tvlPackages.dottime
|
|
|
|
tvlPackages.nix-util
|
2021-12-03 12:24:17 +01:00
|
|
|
tvlPackages.passively
|
2021-08-24 18:40:41 +02:00
|
|
|
tvlPackages.rcirc
|
|
|
|
tvlPackages.term-switcher
|
|
|
|
tvlPackages.tvl
|
2023-08-29 14:43:13 +02:00
|
|
|
|
|
|
|
# Dynamic/native modules
|
|
|
|
depot.users.tazjin.gio-list-apps
|
2021-08-24 18:40:41 +02:00
|
|
|
])));
|
2021-12-13 16:31:25 +01:00
|
|
|
|
|
|
|
# Tired of telega.el runtime breakages through tdlib
|
|
|
|
# incompatibility. Target to make that a build failure instead.
|
|
|
|
tdlibCheck =
|
|
|
|
let
|
|
|
|
tgEmacs = emacsWithPackages (epkgs: [ (currentTelega epkgs) ]);
|
|
|
|
verifyTdlibVersion = builtins.toFile "verify-tdlib-version.el" ''
|
|
|
|
(require 'telega)
|
|
|
|
(defvar tdlib-version "${pkgs.tdlib.version}")
|
|
|
|
(when (or (version< tdlib-version
|
|
|
|
telega-tdlib-min-version)
|
|
|
|
(and telega-tdlib-max-version
|
|
|
|
(version< telega-tdlib-max-version
|
2021-12-13 17:54:49 +01:00
|
|
|
tdlib-version)))
|
2021-12-13 16:31:25 +01:00
|
|
|
(message "Found TDLib version %s, but require %s to %s"
|
|
|
|
tdlib-version telega-tdlib-min-version telega-tdlib-max-version)
|
|
|
|
(kill-emacs 1))
|
|
|
|
'';
|
|
|
|
in
|
2022-09-26 19:33:05 +02:00
|
|
|
pkgs.runCommand "tdlibCheck" { } ''
|
2019-12-19 15:48:22 +01:00
|
|
|
export PATH="${emacsBinPath}:$PATH"
|
2021-12-13 16:31:25 +01:00
|
|
|
${tgEmacs}/bin/emacs --script ${verifyTdlibVersion} && touch $out
|
2022-01-30 17:06:58 +01:00
|
|
|
'';
|
|
|
|
in
|
|
|
|
lib.fix
|
2022-02-08 09:57:52 +01:00
|
|
|
(self: l: f: (pkgs.writeShellScriptBin "tazjins-emacs" ''
|
2021-12-13 16:31:25 +01:00
|
|
|
export PATH="${emacsBinPath}:$PATH"
|
2019-12-16 12:59:07 +01:00
|
|
|
exec ${tazjinsEmacs f}/bin/emacs \
|
2019-12-17 00:55:23 +01:00
|
|
|
--debug-init \
|
|
|
|
--no-site-file \
|
2019-12-17 01:36:34 +01:00
|
|
|
--no-site-lisp \
|
2019-12-17 00:55:23 +01:00
|
|
|
--no-init-file \
|
2019-12-17 01:36:34 +01:00
|
|
|
--directory ${./config} ${if l != null then "--directory ${l}" else ""} \
|
2023-09-12 16:43:20 +02:00
|
|
|
--eval "(add-to-list 'treesit-extra-load-path \"${customTreesitGrammars}/lib\")" \
|
2019-12-17 00:55:23 +01:00
|
|
|
--eval "(require 'init)" $@
|
2022-02-08 09:57:52 +01:00
|
|
|
'').overrideAttrs
|
|
|
|
(_: {
|
|
|
|
passthru = {
|
2023-08-29 14:43:13 +02:00
|
|
|
# Expose original Emacs used for my configuration.
|
|
|
|
inherit emacs;
|
|
|
|
|
|
|
|
# Expose the pure emacs with all packages.
|
|
|
|
emacsWithPackages = tazjinsEmacs f;
|
|
|
|
|
2022-02-08 09:57:52 +01:00
|
|
|
# Call overrideEmacs with a function (pkgs -> pkgs) to modify the
|
|
|
|
# packages that should be included in this Emacs distribution.
|
|
|
|
overrideEmacs = f': self l f';
|
2022-01-30 17:06:58 +01:00
|
|
|
|
2022-02-08 09:57:52 +01:00
|
|
|
# Call withLocalConfig with the path to a *folder* containing a
|
|
|
|
# `local.el` which provides local system configuration.
|
|
|
|
withLocalConfig = confDir: self confDir f;
|
2022-01-30 17:06:58 +01:00
|
|
|
|
2022-02-08 09:57:52 +01:00
|
|
|
# Expose telega/tdlib version check as a target that is built in
|
|
|
|
# CI.
|
|
|
|
#
|
|
|
|
# TODO(tazjin): uncomment when telega works again
|
|
|
|
inherit tdlibCheck;
|
|
|
|
meta.ci.targets = [ "tdlibCheck" ];
|
|
|
|
};
|
|
|
|
}))
|
2019-12-16 14:33:29 +01:00
|
|
|
null
|
|
|
|
identity
|
2021-04-14 00:28:20 +02:00
|
|
|
)
|
|
|
|
{ }
|