diff options
| -rw-r--r-- | nix/.config/nixpkgs/config.nix | 13 | ||||
| -rw-r--r-- | nix/.config/nixpkgs/emacs.nix | 166 |
2 files changed, 0 insertions, 179 deletions
diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix index 11d704a..2a93c4b 100644 --- a/nix/.config/nixpkgs/config.nix +++ b/nix/.config/nixpkgs/config.nix @@ -1,16 +1,3 @@ { pkgs }: { - packageOverrides = super: let - self = super.pkgs; - pkgsUnstable = if super.pkgs.stdenv.isLinux - then import <nixos-unstable> {} - else super.pkgs; - - in with self; rec { - myEmacs = super.callPackage ./emacs.nix { - emacs = if stdenv.isDarwin then emacs25Macport else emacs; - }; - nodejs = pkgsUnstable.nodejs-8_x; - }; - allowUnfree = true; } diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix deleted file mode 100644 index 62a8171..0000000 --- a/nix/.config/nixpkgs/emacs.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ - pkgs ? import <nixpkgs> {}, - emacs ? pkgs.emacs, - stdenv, -}: - -let - myEmacs = emacs; - emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages; - - elpaBuild = import <nixpkgs/pkgs/build-support/emacs/elpa.nix> { - inherit (pkgs) fetchurl lib stdenv texinfo; - emacs = myEmacs; - }; - - hook-helpers = pkgs.callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { - pname = "hook-helpers"; - version = "1.1"; - src = fetchurl { - url = "http://elpa.gnu.org/packages/hook-helpers-1.1.tar"; - sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5"; - }; - packageRequires = []; - meta = { - homepage = https://savannah.nongnu.org/projects/hook-helpers-el/; - license = lib.licenses.free; - }; - }) { - inherit elpaBuild; - inherit (pkgs) fetchurl lib; - }; - - dired-du = pkgs.callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { - pname = "dired-du"; - version = "0.5"; - src = fetchurl { - url = "http://elpa.gnu.org/packages/dired-du-0.5.tar"; - sha256 = "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl"; - }; - packageRequires = []; - meta = { - homepage = https://github.com/calancha/dired-du; - license = lib.licenses.free; - }; - }) { - inherit elpaBuild; - inherit (pkgs) fetchurl lib; - }; -in - emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - diminish - bind-key - use-package - smartparens - ]) ++ (with epkgs.melpaPackages; [ - ace-link - ace-window - add-node-modules-path - ag - auto-compile - avy - bbdb - beginend - cider - clj-refactor - clojure-mode - cmd-to-echo - command-log-mode - company - company-go - company-restclient - company-tern - company-web - counsel - counsel-projectile - crux - cyphejor - dired-narrow - dired-subtree - discover-my-major - dockerfile-mode - dtrt-indent - dumb-jump - easy-hugo - editorconfig - elisp-slime-nav - emmet-mode - ensime - exec-path-from-shell - expand-region - eyebrowse - flow-minor-mode - flycheck - flycheck-flow - flycheck-pos-tip - flycheck-vale - fontawesome - geiser - ggtags - ghq - git-gutter-fringe - git-messenger - git-timemachine - go-eldoc - go-mode - go-projectile - goto-chg - haskell-mode - highlight-stages - helpful - imenu-anywhere - indium - jinja2-mode - js2-mode - js2-refactor - json-mode - ledger-mode - lua-mode - magit - markdown-mode - move-text - multiple-cursors - nginx-mode - nix-mode - nix-sandbox - outorg - outshine - navi-mode - org-journal - page-break-lines - paredit - password-store - projectile - projectile-ripgrep - quickrun - redshank - relative-buffers - restclient - ripgrep - rjsx-mode - scala-mode - scss-mode - shrink-whitespace - slime - smart-tabs-mode - smex - suggest - swiper - tern - toml-mode - undo-tree - visual-regexp - volatile-highlights - web-mode - white-theme - wgrep-ag - which-key - yaml-mode - ]) ++ (with epkgs.elpaPackages; [ - rainbow-mode - ]) ++ [ - # defined above - hook-helpers - dired-du - # From main packages set - ]) |