From f33c52558e5a78e6f58c83e9c6a75d43828c27a2 Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Thu, 22 Oct 2020 21:07:09 -0600 Subject: overlays: move user overlays to dotfiles Signed-off-by: Kenny Ballou --- overlays/00-lang.nix | 19 ---- overlays/10-emacs.nix | 29 ------- overlays/10-git.nix | 16 ---- overlays/20-aws.nix | 12 --- overlays/20-beam.nix | 11 --- overlays/20-clang.nix | 12 --- overlays/20-cpp.nix | 19 ---- overlays/20-elm.nix | 12 --- overlays/20-go.nix | 17 ---- overlays/20-js.nix | 14 --- overlays/20-jvm.nix | 31 ------- overlays/20-ml.nix | 10 --- overlays/20-php.nix | 12 --- overlays/20-python.nix | 18 ---- overlays/20-r.nix | 10 --- overlays/20-rust.nix | 15 ---- overlays/20-scheme.nix | 12 --- overlays/20-tex.nix | 11 --- overlays/30-data-analysis.nix | 16 ---- overlays/40-pidgin.nix | 18 ---- overlays/40-telepathy.nix | 18 ---- overlays/emacs/builder.nix | 33 ------- overlays/emacs/packages.nix | 195 ------------------------------------------ 23 files changed, 560 deletions(-) delete mode 100644 overlays/00-lang.nix delete mode 100644 overlays/10-emacs.nix delete mode 100644 overlays/10-git.nix delete mode 100644 overlays/20-aws.nix delete mode 100644 overlays/20-beam.nix delete mode 100644 overlays/20-clang.nix delete mode 100644 overlays/20-cpp.nix delete mode 100644 overlays/20-elm.nix delete mode 100644 overlays/20-go.nix delete mode 100644 overlays/20-js.nix delete mode 100644 overlays/20-jvm.nix delete mode 100644 overlays/20-ml.nix delete mode 100644 overlays/20-php.nix delete mode 100644 overlays/20-python.nix delete mode 100644 overlays/20-r.nix delete mode 100644 overlays/20-rust.nix delete mode 100644 overlays/20-scheme.nix delete mode 100644 overlays/20-tex.nix delete mode 100644 overlays/30-data-analysis.nix delete mode 100644 overlays/40-pidgin.nix delete mode 100644 overlays/40-telepathy.nix delete mode 100644 overlays/emacs/builder.nix delete mode 100644 overlays/emacs/packages.nix diff --git a/overlays/00-lang.nix b/overlays/00-lang.nix deleted file mode 100644 index 2a2cb28..0000000 --- a/overlays/00-lang.nix +++ /dev/null @@ -1,19 +0,0 @@ -self: super: -{ - langOverlay = self.buildEnv { - name = "langOverlay"; - ignoreCollisions = true; - paths = [ - self.autoconf - self.autogen - self.automake - self.doxygen - self.global - self.gnum4 - self.gnumake - self.lcov - self.libtool - self.pkgconfig - ]; - }; -} diff --git a/overlays/10-emacs.nix b/overlays/10-emacs.nix deleted file mode 100644 index 626cd12..0000000 --- a/overlays/10-emacs.nix +++ /dev/null @@ -1,29 +0,0 @@ -self: super: -let - - emacs = (super.pkgs.emacs.override { - # enable lucid - withGTK3 = false; - withGTK2 = false; - # enable imagemagick - imagemagick = self.pkgs.imagemagick; - }); - emacsWithPkgs = (self.emacsPackagesGen emacs).emacsWithPackages - (import ./emacs/packages.nix { epkgs = self.emacsPackages; }); - - in { - - emacsOverlay = super.buildEnv { - name = "emacsTools"; - ignoreCollisions = true; - paths = [ - emacsWithPkgs - self.mu - self.multimarkdown - self.poppler - self.imagemagick - self.librsvg - self.haskellPackages.pandoc - ]; - }; - } diff --git a/overlays/10-git.nix b/overlays/10-git.nix deleted file mode 100644 index f45e10d..0000000 --- a/overlays/10-git.nix +++ /dev/null @@ -1,16 +0,0 @@ -self: super: -{ - gitOverlay = super.buildEnv { - name = "gitOverlay"; - ignoreCollisions = true; - paths = [ - self.gitFull - self.gitAndTools.delta - self.gitAndTools.git-crypt - self.gitAndTools.gitFastExport - self.gitAndTools.pass-git-helper - self.gitAndTools.tig - self.gitstats - ]; - }; -} diff --git a/overlays/20-aws.nix b/overlays/20-aws.nix deleted file mode 100644 index aedc98a..0000000 --- a/overlays/20-aws.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: -{ - aws-overlay = super.buildEnv { - name = "aws-overlay"; - ignoreCollisions = true; - paths = [ - self.awscli - self.python37Packages.boto3 - self.python37Packages.botocore - ]; - }; -} diff --git a/overlays/20-beam.nix b/overlays/20-beam.nix deleted file mode 100644 index ae4958c..0000000 --- a/overlays/20-beam.nix +++ /dev/null @@ -1,11 +0,0 @@ -self: super: -{ - beam-overlay = super.buildEnv { - name = "beam-overlay"; - ignoreCollisions = true; - paths = [ - self.elixir - self.erlang - ]; - }; -} diff --git a/overlays/20-clang.nix b/overlays/20-clang.nix deleted file mode 100644 index 599c231..0000000 --- a/overlays/20-clang.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: -{ - clang-overlay = super.buildEnv { - name = "clang-overlang"; - ignoreCollisions = true; - paths = [ - self.clang - self.clang-tools - self.llvm - ]; - }; -} diff --git a/overlays/20-cpp.nix b/overlays/20-cpp.nix deleted file mode 100644 index c09dde0..0000000 --- a/overlays/20-cpp.nix +++ /dev/null @@ -1,19 +0,0 @@ -self: super: -{ - cppOverlay = super.buildEnv { - name = "cppOverlay"; - ignoreCollisions = true; - paths = [ - self.boost - self.cmake - self.cppcheck - self.cscope - self.gcc - self.gdb - self.libcxx - self.libcxxabi - self.stdman - self.valgrind - ]; - }; -} diff --git a/overlays/20-elm.nix b/overlays/20-elm.nix deleted file mode 100644 index 15b927a..0000000 --- a/overlays/20-elm.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: -{ - elmOverlay = self.buildEnv { - name = "elmOverlay"; - ignoreCollisions = true; - paths = [ - self.elmPackages.elm - self.elmPackages.elm-format - self.elmPackages.elm-test - ]; - }; -} diff --git a/overlays/20-go.nix b/overlays/20-go.nix deleted file mode 100644 index eccbe37..0000000 --- a/overlays/20-go.nix +++ /dev/null @@ -1,17 +0,0 @@ -self: super: -{ - goOverlay = super.buildEnv { - name = "goOverlay"; - ignoreCollisions = true; - paths = [ - self.delve - self.glide - self.go_1_12 - self.gocode - self.godef - self.golint - self.go2nix - self.gotools - ]; - }; -} diff --git a/overlays/20-js.nix b/overlays/20-js.nix deleted file mode 100644 index 660cbd3..0000000 --- a/overlays/20-js.nix +++ /dev/null @@ -1,14 +0,0 @@ -self: super: -{ - jsOverlay = super.buildEnv { - name = "jsOverlay"; - ignoreCollisions = true; - paths = [ - self.nodePackages.csslint - self.nodePackages.eslint - self.nodePackages.js-beautify - self.nodejs - self.yarn - ]; - }; -} diff --git a/overlays/20-jvm.nix b/overlays/20-jvm.nix deleted file mode 100644 index c8c7636..0000000 --- a/overlays/20-jvm.nix +++ /dev/null @@ -1,31 +0,0 @@ -self: super: -let - jdk = self.pkgs.jdk11; - maven = (super.pkgs.maven.override { - jdk = jdk; - }); - leiningen = (super.pkgs.leiningen.override { - jdk = jdk; - }); -in { - jvmOverlay = super.buildEnv { - name = "jvmOverlay"; - ignoreCollisions = true; - paths = [ - self.ammonite - self.ant - self.aspectj - #self.clj-kondo - self.clojure - self.clojure-lsp - self.gradle - jdk - self.jmeter - leiningen - maven - self.sbt - self.scala - self.scalafmt - ]; - }; -} diff --git a/overlays/20-ml.nix b/overlays/20-ml.nix deleted file mode 100644 index 9cdab74..0000000 --- a/overlays/20-ml.nix +++ /dev/null @@ -1,10 +0,0 @@ -self: super: -{ - ml-overlay = super.buildEnv { - name = "ml-overlay"; - ignoreCollisions = true; - paths = [ - self.ocaml - ]; - }; -} diff --git a/overlays/20-php.nix b/overlays/20-php.nix deleted file mode 100644 index d83cd4c..0000000 --- a/overlays/20-php.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: -{ - phpOverlay = super.buildEnv { - name = "phpOverlay"; - ignoreCollisions = true; - paths = [ - self.php - self.phpPackages.apcu - self.phpPackages.composer - ]; - }; -} diff --git a/overlays/20-python.nix b/overlays/20-python.nix deleted file mode 100644 index 5423ca6..0000000 --- a/overlays/20-python.nix +++ /dev/null @@ -1,18 +0,0 @@ -self: super: -{ - pythonOverlay = super.buildEnv { - name = "pythonOverlay"; - ignoreCollisions = true; - paths = [ - self.python3 - self.python37Packages.gprof2dot - self.python37Packages.setuptools - self.python37Packages.flake8 - self.python37Packages.pyflakes - self.python37Packages.python-language-server - self.python37Packages.yamllint - self.python3Packages.pip - self.python3Packages.virtualenv - ]; - }; -} diff --git a/overlays/20-r.nix b/overlays/20-r.nix deleted file mode 100644 index b3b216c..0000000 --- a/overlays/20-r.nix +++ /dev/null @@ -1,10 +0,0 @@ -self: super: -{ - r-overlay = super.buildEnv { - name = "r-overlay"; - ignoreCollisions = true; - paths = [ - self.R - ]; - }; -} diff --git a/overlays/20-rust.nix b/overlays/20-rust.nix deleted file mode 100644 index 98f25e5..0000000 --- a/overlays/20-rust.nix +++ /dev/null @@ -1,15 +0,0 @@ -self: super: -{ - rustOverlay = super.buildEnv { - name = "rustOverlay"; - ignoreCollisions = true; - paths = [ - self.cargo - self.cargo-tree - self.cargo-update - self.rls - self.rustc - self.rustracer - ]; - }; -} diff --git a/overlays/20-scheme.nix b/overlays/20-scheme.nix deleted file mode 100644 index 0667548..0000000 --- a/overlays/20-scheme.nix +++ /dev/null @@ -1,12 +0,0 @@ -self: super: -{ - scheme-overlay = super.buildEnv { - name = "scheme-overlay"; - ignoreCollisions = true; - paths = [ - self.guile - self.guile-lint - self.racket - ]; - }; -} diff --git a/overlays/20-tex.nix b/overlays/20-tex.nix deleted file mode 100644 index 4b73144..0000000 --- a/overlays/20-tex.nix +++ /dev/null @@ -1,11 +0,0 @@ -self: super: -{ - tex-overlay = super.buildEnv { - name = "tex-overlay"; - ignoreCollisions = true; - paths = [ - self.pygmentex - self.texlive.combined.scheme-full - ]; - }; -} diff --git a/overlays/30-data-analysis.nix b/overlays/30-data-analysis.nix deleted file mode 100644 index b8d64b0..0000000 --- a/overlays/30-data-analysis.nix +++ /dev/null @@ -1,16 +0,0 @@ -self: super: -{ - data-analysis-overlay = super.buildEnv { - name = "data-analysis"; - ignoreCollisions = true; - paths = [ - self.python3 - self.python37Packages.ipdb - self.python37Packages.ipython - self.python37Packages.matplotlib - self.python37Packages.numpy - self.python37Packages.pandas - self.python37Packages.scipy - ]; - }; -} diff --git a/overlays/40-pidgin.nix b/overlays/40-pidgin.nix deleted file mode 100644 index 713a690..0000000 --- a/overlays/40-pidgin.nix +++ /dev/null @@ -1,18 +0,0 @@ -self: super: -{ - pidgin-overlay = super.buildEnv { - name = "pidgin-overlay"; - ignoreCollisions = true; - paths = [ - self.pidgin - self.pidgin-carbons - self.pidgin-latex - self.pidgin-xmpp-receipts - self.purple-hangouts - self.purple-matrix - self.purple-plugin-pack - self.skype4pidgin - self.toxprpl - ]; - }; -} diff --git a/overlays/40-telepathy.nix b/overlays/40-telepathy.nix deleted file mode 100644 index 7625d86..0000000 --- a/overlays/40-telepathy.nix +++ /dev/null @@ -1,18 +0,0 @@ -self: super: -{ - telepathy-overlay = super.buildEnv { - name = "telepathy-overlay"; - ignoreCollisions = true; - paths = [ - self.profanity - self.slack - self.telepathy-mission-control - self.telepathy-gabble - self.telepathy-idle - self.telepathy-haze - self.telepathy-logger - self.telepathy-farstream - self.zoom-us - ]; - }; -} diff --git a/overlays/emacs/builder.nix b/overlays/emacs/builder.nix deleted file mode 100644 index 8c3349c..0000000 --- a/overlays/emacs/builder.nix +++ /dev/null @@ -1,33 +0,0 @@ -# https://github.com/jwiegley/nix-config/blob/4d296ad/overlays/emacs/builder.nix -{ stdenv -, emacs -, name -, src -, buildInputs ? [] -, patches ? [] -, preBuild ? "" -}: - -stdenv.mkDerivation { - inherit name src patches; - unpackCmd = '' - test -f "${src}" && mkdir el && cp -p ${src} el/${name} - ''; - buildInputs = [ emacs ] ++ buildInputs; - buildPhase = '' - ${preBuild} - ARGS=$(find ${stdenv.lib.concatStrings - (builtins.map (arg: arg + "/share/emacs/site-lisp ") buildInputs)} \ - -type -d -exec -L {} \;) - ${emacs}/bin/emacs -Q -nw -L . ${ARGS} --batch -f batch-byte-compile *.el - ''; - installPhase = '' - mkdir -p ${out}/share/emacs/site-lisp - install *.el* ${out/share/emacs/site-lisp - ''; - meta = { - description = "Emacs projects from the Internet that just compile `.el` files"; - homepage = http://www.emacswiki.org; - platforms = stdenv.lib.platforms.all; - }; -} \ No newline at end of file diff --git a/overlays/emacs/packages.nix b/overlays/emacs/packages.nix deleted file mode 100644 index 0727915..0000000 --- a/overlays/emacs/packages.nix +++ /dev/null @@ -1,195 +0,0 @@ -pkgs: epkgs: with epkgs; -[ - add-node-modules-path - ag - alchemist - anaconda-mode - anti-zenburn-theme - anzu - auctex - autodisass-java-bytecode - avy - bind-key - bnf-mode - browse-kill-ring - buffer-move - bundler - cider - cljsbuild-mode - clojure-mode - coffee-mode - company - counsel - counsel-projectile - counsel-tramp - coverlay - css-eldoc - csv - dap-mode - define-word - delight - diff-hl - diminish - disable-mouse - docker - docker-compose-mode - docker-tramp - dockerfile-mode - doom-themes - editorconfig - edts - ein - elein - elfeed - elfeed-org - elixir-mode - elm-mode - erlang - ess - exec-path-from-shell - expand-region - f - flycheck - flycheck-clojure - flycheck-color-mode-line - flycheck-credo - flycheck-elixir - flycheck-elm - flycheck-haskell - flycheck-ledger - flycheck-ocaml - flycheck-rust - fold-dwim - forge - fullframe - geben - geben-helm-projectile - geiser - git-auto-commit-mode - git-commit - git-timemachine - gitconfig-mode - gitignore-mode - go-autocomplete - go-eldoc - go-mode - go-stacktracer - #goto-gem - gnuplot - graphviz-dot-mode - guix - gxref - haml-mode - haskell-mode - helm - helm-bbdb - helm-bibtex - helm-descbinds - helm-flycheck - helm-flyspell - helm-gtags - helm-lsp - helm-mu - helm-projectile - helm-rg - helm-sql-connect - helm-tramp - helm-wordnet - helm-xref - highlight-escape-sequences - hindent - htmlize - hydra - ibuffer-vc - import-js - inf-ruby - ivy - jedi - js-comint - js2-mode - json-mode - ledger-mode - less-css-mode - list-unicode-display - lsp-haskell - lsp-mode - lsp-java - lsp-ui - magit - markdown-mode - mmm-mode - mpdel - multiple-cursors - multiple-cursors - mwim - nix-buffer - nix-mode - nix-update - ob-elixir - ob-go - ob-ipython - ob-mongo - olivetti - org-babel-eval-in-repl - org-cliplink - org-pomodoro - org-ref - ox-gfm - page-break-lines - pcmpl-args - pcmpl-git - pcmpl-pip - pcomplete-extension - pdf-tools - peep-dired - php-mode - pinentry - pip-requirements - polymode - projectile - python - racer - rainbow-delimiters - rainbow-mode - realgud - realgud-jdb - regex-tool - robe - rspec-mode - ruby-compilation - ruby-hash-syntax - rust-mode - sass-mode - scss-mode - session - skewer-less - skewer-mode - smartparens - smex - smooth-scrolling - solarized-theme - spacemacs-theme - spaceline - swiper - swiper-helm - switch-window - tagedit - toml-mode - typescript-mode - undo-tree - unfill - unicode-fonts - unicode-whitespace - uptimes - use-package - virtualenvwrapper - wgrep-ag - which-key - whitespace-cleanup-mode - whole-line-or-region - with-editor - xref-js2 - yari - yasnippet - zenburn-theme -] -- cgit v1.2.1