From e3930332a40eb69c0fdff6d5519b45360bcde321 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Thu, 21 Oct 2021 23:35:54 +0200 Subject: [PATCH] tiding up Signed-off-by: Stefan Ellmauthaler --- emacs.nix | 22 ------------------- programs/emacs/emacs.nix | 47 ---------------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 emacs.nix delete mode 100644 programs/emacs/emacs.nix diff --git a/emacs.nix b/emacs.nix deleted file mode 100644 index 3d86733..0000000 --- a/emacs.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs ? import {} }: - -let - ellmauEmacs = (import {}).emacs; - emacsWithPackages = (pkgs.emacsPackagesGen ellmauEmacs).emacsWithPackages; -in - emacsWithPackages ( epkgs: (with epkgs.melpaStablePackages; [ - beacon - ]) ++ (with epkgs.melpaPackages; [ - magit - nix-mode - ewal-spacemacs-themes - org-roam - rustic - company - projectile - lsp-mode - dap-mode - ]) ++ (with epkgs.elpaPackages; [ - auctex - ]) ++ [ - ]) \ No newline at end of file diff --git a/programs/emacs/emacs.nix b/programs/emacs/emacs.nix deleted file mode 100644 index 76aa5e9..0000000 --- a/programs/emacs/emacs.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, pkgs, ...}: -{ - environment.systemPackages = [ - (emacsWithPackagesFromUsePackage { - # Your Emacs config file. Org mode babel files are also - # supported. - # NB: Config files cannot contain unicode characters, since - # they're being parsed in nix, which lacks unicode - # support. - # config = ./emacs.org; - config = ./default.el; - - # Package is optional, defaults to pkgs.emacs - #package = pkgs.emacs; - - # By default emacsWithPackagesFromUsePackage will only pull in - # packages with `:ensure`, `:ensure t` or `:ensure `. - # Setting `alwaysEnsure` to `true` emulates `use-package-always-ensure` - # and pulls in all use-package references not explicitly disabled via - # `:ensure nil` or `:disabled`. - # Note that this is NOT recommended unless you've actually set - # `use-package-always-ensure` to `t` in your config. - #alwaysEnsure = true; - - # For Org mode babel files, by default only code blocks with - # `:tangle yes` are considered. Setting `alwaysTangle` to `true` - # will include all code blocks missing the `:tangle` argument, - # defaulting it to `yes`. - # Note that this is NOT recommended unless you have something like - # `#+PROPERTY: header-args:emacs-lisp :tangle yes` in your config, - # which defaults `:tangle` to `yes`. - alwaysTangle = true; - - # Optionally provide extra packages not in the configuration file. - extraEmacsPackages = epkgs: [ - epkgs.cask - ]; - - # Optionally override derivations. - override = epkgs: epkgs // { - weechat = epkgs.melpaPackages.weechat.overrideAttrs(old: { - patches = [ ./weechat-el.patch ]; - }); - }; - }) - ]; -} \ No newline at end of file