Remove emacs.
This commit is contained in:
parent
6b694fd58a
commit
51f1c74dc2
GPG key ID:
C0F1D326C7626543
36 changed files with 1 additions and 2295 deletions
|
|
@ -1,52 +0,0 @@
|
|||
# Original Source:
|
||||
# https://gitlab.com/rycee/nur-expressions/raw/master/hm-modules/emacs-init-defaults.nix (49ff2d63e867c09e658c959c0d8a73d641061c30)
|
||||
# MIT License
|
||||
# Copyright (c) 2019 Robert Helgesson
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
{pkgs, ...}: {
|
||||
programs.emacs.init.usePackage = {
|
||||
deadgrep = {
|
||||
config = ''
|
||||
(setq deadgrep-executable "${pkgs.ripgrep}/bin/rg")
|
||||
'';
|
||||
};
|
||||
|
||||
ggtags = {
|
||||
config = ''
|
||||
(setq ggtags-executable-directory "${pkgs.global}/bin")
|
||||
'';
|
||||
};
|
||||
|
||||
idris-mode = {
|
||||
config = ''
|
||||
(setq idris-interpreter-path "${pkgs.idris}/bin/idris")
|
||||
'';
|
||||
};
|
||||
|
||||
pandoc-mode = {
|
||||
config = ''
|
||||
(setq pandoc-binary "${pkgs.pandoc}/bin/pandoc")
|
||||
'';
|
||||
};
|
||||
|
||||
ripgrep = {
|
||||
config = ''
|
||||
(setq ripgrep-executable "${pkgs.ripgrep}/bin/rg")
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,469 +0,0 @@
|
|||
# Original Source:
|
||||
# https://gitlab.com/rycee/nur-expressions/raw/master/hm-modules/emacs-init.nix (d27525db3358b9463fab1b4a7739cb77e27b768c)
|
||||
# MIT License
|
||||
# Copyright (c) 2019 Robert Helgesson
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.programs.emacs.init;
|
||||
|
||||
packageFunctionType = mkOptionType {
|
||||
name = "packageFunction";
|
||||
description = "function from epkgs to package";
|
||||
check = isFunction;
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
||||
usePackageType = types.submodule ({
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
enable = mkEnableOption "Emacs package ${name}";
|
||||
|
||||
package = mkOption {
|
||||
type =
|
||||
types.either
|
||||
(types.str // {description = "name of package";})
|
||||
packageFunctionType;
|
||||
default = name;
|
||||
description = ''
|
||||
The package to use for this module. Either the package name
|
||||
within the Emacs package set or a function taking the Emacs
|
||||
package set and returning a package.
|
||||
'';
|
||||
};
|
||||
|
||||
defer = mkOption {
|
||||
type = types.either types.bool types.ints.positive;
|
||||
default = false;
|
||||
description = ''
|
||||
The <option>:defer</option> setting.
|
||||
'';
|
||||
};
|
||||
|
||||
demand = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
The <option>:demand</option> setting.
|
||||
'';
|
||||
};
|
||||
|
||||
diminish = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
The entries to use for <option>:diminish</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
chords = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
example = {
|
||||
"jj" = "ace-jump-char-mode";
|
||||
"jk" = "ace-jump-word-mode";
|
||||
};
|
||||
description = ''
|
||||
The entries to use for <option>:chords</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
mode = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
The entries to use for <option>:mode</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
after = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
The entries to use for <option>:after</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
bind = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
example = {
|
||||
"M-<up>" = "drag-stuff-up";
|
||||
"M-<down>" = "drag-stuff-down";
|
||||
};
|
||||
description = ''
|
||||
The entries to use for <option>:bind</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
bindLocal = mkOption {
|
||||
type = types.attrsOf (types.attrsOf types.str);
|
||||
default = {};
|
||||
example = {helm-command-map = {"C-c h" = "helm-execute-persistent-action";};};
|
||||
description = ''
|
||||
The entries to use for local keymaps in <option>:bind</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
bindKeyMap = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
example = {"C-c p" = "projectile-command-map";};
|
||||
description = ''
|
||||
The entries to use for <option>:bind-keymap</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
command = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
The entries to use for <option>:commands</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Code to place in the <option>:config</option> section.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Additional lines to place in the use-package configuration.
|
||||
'';
|
||||
};
|
||||
|
||||
hook = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
The entries to use for <option>:hook</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
init = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
The entries to use for <option>:init</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
assembly = mkOption {
|
||||
type = types.lines;
|
||||
readOnly = true;
|
||||
internal = true;
|
||||
description = "The final use-package code.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf config.enable {
|
||||
assembly = let
|
||||
quoted = v: ''"${escape ["\""] v}"'';
|
||||
mkBindHelper = cmd: prefix: bs:
|
||||
optionals (bs != {}) (
|
||||
[":${cmd} (${prefix}"]
|
||||
++ mapAttrsToList (n: v: " (${quoted n} . ${v})") bs
|
||||
++ [")"]
|
||||
);
|
||||
|
||||
mkAfter = vs: optional (vs != []) ":after (${toString vs})";
|
||||
mkCommand = vs: optional (vs != []) ":commands (${toString vs})";
|
||||
mkDiminish = vs: optional (vs != []) ":diminish (${toString vs})";
|
||||
mkMode = map (v: ":mode ${v}");
|
||||
mkBind = mkBindHelper "bind" "";
|
||||
mkBindLocal = bs: let
|
||||
mkMap = n: mkBindHelper "bind" ":map ${n}";
|
||||
in
|
||||
flatten (mapAttrsToList mkMap bs);
|
||||
mkBindKeyMap = mkBindHelper "bind-keymap" "";
|
||||
mkChords = mkBindHelper "chords" "";
|
||||
mkHook = map (v: ":hook ${v}");
|
||||
mkDefer = v:
|
||||
if isBool v
|
||||
then optional v ":defer t"
|
||||
else [":defer ${toString v}"];
|
||||
mkDemand = v: optional v ":demand t";
|
||||
in
|
||||
concatStringsSep "\n " (
|
||||
["(use-package ${name}"]
|
||||
++ mkAfter config.after
|
||||
++ mkBind config.bind
|
||||
++ mkBindKeyMap config.bindKeyMap
|
||||
++ mkBindLocal config.bindLocal
|
||||
++ mkChords config.chords
|
||||
++ mkCommand config.command
|
||||
++ mkDefer config.defer
|
||||
++ mkDemand config.demand
|
||||
++ mkDiminish config.diminish
|
||||
++ mkHook config.hook
|
||||
++ mkMode config.mode
|
||||
++ optionals (config.init != "") [":init" config.init]
|
||||
++ optionals (config.config != "") [":config" config.config]
|
||||
++ optional (config.extraConfig != "") config.extraConfig
|
||||
)
|
||||
+ ")";
|
||||
};
|
||||
});
|
||||
|
||||
usePackageStr = name: pkgConfStr: ''
|
||||
(use-package ${name}
|
||||
${pkgConfStr})
|
||||
'';
|
||||
|
||||
mkRecommendedOption = type: extraDescription:
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description =
|
||||
''
|
||||
Whether to enable recommended ${type} settings.
|
||||
''
|
||||
+ optionalString (extraDescription != "") ''
|
||||
</para><para>
|
||||
${extraDescription}
|
||||
'';
|
||||
};
|
||||
|
||||
# Recommended GC settings.
|
||||
gcSettings = ''
|
||||
(defun hm/reduce-gc ()
|
||||
"Reduce the frequency of garbage collection."
|
||||
(setq gc-cons-threshold 402653184
|
||||
gc-cons-percentage 0.6))
|
||||
|
||||
(defun hm/restore-gc ()
|
||||
"Restore the frequency of garbage collection."
|
||||
(setq gc-cons-threshold 16777216
|
||||
gc-cons-percentage 0.1))
|
||||
|
||||
;; Make GC more rare during init and while minibuffer is active.
|
||||
(eval-and-compile #'hm/reduce-gc)
|
||||
(add-hook 'minibuffer-setup-hook #'hm/reduce-gc)
|
||||
|
||||
;; But make it more regular after startup and after closing minibuffer.
|
||||
(add-hook 'emacs-startup-hook #'hm/restore-gc)
|
||||
(add-hook 'minibuffer-exit-hook #'hm/restore-gc)
|
||||
|
||||
;; Avoid unnecessary regexp matching while loading .el files.
|
||||
(defvar hm/file-name-handler-alist file-name-handler-alist)
|
||||
(setq file-name-handler-alist nil)
|
||||
|
||||
(defun hm/restore-file-name-handler-alist ()
|
||||
"Restores the file-name-handler-alist variable."
|
||||
(setq file-name-handler-alist hm/file-name-handler-alist)
|
||||
(makunbound 'hm/file-name-handler-alist))
|
||||
|
||||
(add-hook 'emacs-startup-hook #'hm/restore-file-name-handler-alist)
|
||||
'';
|
||||
|
||||
# Whether the configuration makes use of `:diminish`.
|
||||
hasDiminish = any (p: p.diminish != []) (attrValues cfg.usePackage);
|
||||
|
||||
# Whether the configuration makes use of `:bind`.
|
||||
hasBind = any (p: p.bind != {}) (attrValues cfg.usePackage);
|
||||
|
||||
# Whether the configuration makes use of `:chords`.
|
||||
hasChords = any (p: p.chords != {}) (attrValues cfg.usePackage);
|
||||
|
||||
usePackageSetup =
|
||||
''
|
||||
(eval-when-compile
|
||||
(require 'package)
|
||||
|
||||
(setq package-archives nil
|
||||
package-enable-at-startup nil
|
||||
package--init-file-ensured t)
|
||||
|
||||
(require 'use-package)
|
||||
|
||||
;; To help fixing issues during startup.
|
||||
(setq use-package-verbose ${
|
||||
if cfg.usePackageVerbose
|
||||
then "t"
|
||||
else "nil"
|
||||
}))
|
||||
''
|
||||
+ optionalString hasDiminish ''
|
||||
;; For :diminish in (use-package).
|
||||
(require 'diminish)
|
||||
''
|
||||
+ optionalString hasBind ''
|
||||
;; For :bind in (use-package).
|
||||
(require 'bind-key)
|
||||
''
|
||||
+ optionalString hasChords ''
|
||||
;; For :chords in (use-package).
|
||||
(use-package use-package-chords
|
||||
:config (key-chord-mode 1))
|
||||
'';
|
||||
|
||||
initFile =
|
||||
''
|
||||
;;; hm-init.el --- Emacs configuration à la Home Manager.
|
||||
;;
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;
|
||||
;;; Commentary:
|
||||
;;
|
||||
;; A configuration generated from a Nix based configuration by
|
||||
;; Home Manager.
|
||||
;;
|
||||
;;; Code:
|
||||
|
||||
${optionalString cfg.startupTimer ''
|
||||
;; Remember when configuration started. See bottom for rest of this.
|
||||
;; Idea taken from http://writequit.org/org/settings.html.
|
||||
(defconst emacs-start-time (current-time))
|
||||
''}
|
||||
|
||||
${optionalString cfg.recommendedGcSettings gcSettings}
|
||||
|
||||
${cfg.prelude}
|
||||
|
||||
${usePackageSetup}
|
||||
''
|
||||
+ concatStringsSep "\n\n"
|
||||
(map (getAttr "assembly")
|
||||
(filter (getAttr "enable")
|
||||
(attrValues cfg.usePackage)))
|
||||
+ ''
|
||||
|
||||
${cfg.postlude}
|
||||
|
||||
${optionalString cfg.startupTimer ''
|
||||
;; Make a note of how long the configuration part of the start took.
|
||||
(let ((elapsed (float-time (time-subtract (current-time)
|
||||
emacs-start-time))))
|
||||
(message "Loading settings...done (%.3fs)" elapsed))
|
||||
''}
|
||||
|
||||
(provide 'hm-init)
|
||||
;; hm-init.el ends here
|
||||
'';
|
||||
in {
|
||||
imports = [./emacs-init-defaults.nix];
|
||||
|
||||
options.programs.emacs.init = {
|
||||
enable = mkEnableOption "Emacs configuration";
|
||||
|
||||
recommendedGcSettings = mkRecommendedOption "garbage collection" ''
|
||||
This will reduce garbage collection frequency during startup and
|
||||
while the minibuffer is active.
|
||||
'';
|
||||
|
||||
startupTimer = mkEnableOption "Emacs startup duration timer";
|
||||
|
||||
prelude = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Configuration lines to add in the beginning of
|
||||
<filename>init.el</filename>.
|
||||
'';
|
||||
};
|
||||
|
||||
postlude = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Configuration lines to add in the end of
|
||||
<filename>init.el</filename>.
|
||||
'';
|
||||
};
|
||||
|
||||
usePackageVerbose = mkEnableOption "verbose use-package mode";
|
||||
|
||||
usePackage = mkOption {
|
||||
type = types.attrsOf usePackageType;
|
||||
default = {};
|
||||
example = literalExample ''
|
||||
{
|
||||
dhall-mode = {
|
||||
mode = [ '''"\\.dhall\\'"''' ];
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Attribute set of use-package configurations.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
machine.pkgsets.emacs.pkgs = epkgs: let
|
||||
getPkg = v:
|
||||
if isFunction v
|
||||
then [(v epkgs)]
|
||||
else optional (isString v && hasAttr v epkgs) epkgs.${v};
|
||||
in
|
||||
[epkgs.use-package]
|
||||
++ optional hasBind epkgs.bind-key
|
||||
++ optional hasDiminish epkgs.diminish
|
||||
++ optional hasChords epkgs.use-package-chords
|
||||
++ (
|
||||
concatMap (v: getPkg v.package)
|
||||
(builtins.attrValues cfg.usePackage)
|
||||
);
|
||||
|
||||
# use lucid as toolkit; emacs will otherwise crash quite frequently when run in daemon mode
|
||||
# https://gitlab.gnome.org/GNOME/gtk/issues/221
|
||||
# Enabling again for now as gtk3 is needed for wayland support
|
||||
machine.pkgsets.emacs.pkgwrap = let
|
||||
inherit
|
||||
((pkgs.emacsPackagesFor
|
||||
(pkgs.emacs29.override {
|
||||
withGTK2 = false;
|
||||
withGTK3 = true;
|
||||
withPgtk = true;
|
||||
})))
|
||||
emacsWithPackages
|
||||
;
|
||||
in
|
||||
emacsWithPackages config.machine.pkgsets.emacs.pkgs;
|
||||
|
||||
environment.systemPackages = [
|
||||
((pkgs.emacsPackagesFor config.machine.pkgsets.emacs.pkgwrap).trivialBuild {
|
||||
pname = "hm-init";
|
||||
version = "0";
|
||||
src = pkgs.writeText "hm-init.el" initFile;
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
})
|
||||
];
|
||||
|
||||
# This has no effect, will have to add a wrapper to emacs (or just copy this to ~/.emacs.d/init.el)
|
||||
environment.etc."emacs.d/init.el".text = ''
|
||||
(require 'hm-init)
|
||||
(provide 'init)
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@ with lib; let
|
|||
type = with types; oneOf [package (listOf package)];
|
||||
default = fn.pkgFilter cfg.pkgsets."${pname}".pkgs;
|
||||
description = ''
|
||||
Package Wrapper for packages using a wrapper function (like python, emacs, haskell, ...)
|
||||
Package Wrapper for packages using a wrapper function (like python, haskell, ...)
|
||||
'';
|
||||
};
|
||||
pkgs = mkOption {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue