Refactor configuration and overlays

1 files changed, 10 insertions, 112 deletions

diff --git a/default.nix b/default.nix
index 9c548a0..e092c33 100644
--- a/default.nix
+++ b/default.nix
@@ -1,112 +1,10 @@
-with import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); };
-  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
-  # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
-  { # files in overlays/mypkgs.nix
-    inherit boinctui;
-    inherit cnagios;
-    inherit duply;
-    inherit flrn;
-    inherit genius;
-    inherit mtop;
-    inherit muttprint;
-    inherit mutt-ics;
-    inherit nagios-cli;
-    #inherit nagnu;
-    inherit note;
-    inherit notmuch-python2;
-    inherit notmuch-python3;
-    inherit notmuch-vim;
-    inherit pg_activity;
-    inherit pgloader;
-    inherit telegram-cli;
-    inherit telegram-history-dump;
-    inherit telegramircd;
-    inherit terminal-velocity;
-    inherit tiv;
-    inherit unicodeDoc;
-
-    inherit cardano;
-    inherit iota-cli-app;
-    inherit sia;
-  } // { # overlays
-    inherit weboob;
-    inherit taskwarrior;
-    inherit slrn;
-    inherit sc-im;
-    inherit lesspipe;
-    inherit neomutt;
-    inherit weechat;
-    inherit goaccess;
-    inherit profanity;
-    inherit nixops;
-    inherit dwm;
-    inherit vit;
-    inherit pass;
-    inherit elinks;
-    inherit pelican;
-    inherit ldapvi;
-    inherit (mylibs.yarn2nixPackage) yarn2nix;
-  } // {
-    inherit nix-prefetch-scripts;
-    inherit nix-generate-from-cpan;
-    inherit timewarrior;
-    inherit pal;
-    inherit pdftk;
-    inherit googler;
-    inherit jrnl;
-    inherit apg pwgen;
-    inherit newsboat;
-    inherit vcsh;
-    inherit xmr-stak;
-    inherit urlwatch;
-    inherit ranger;
-    inherit irssi;
-    inherit abook khard khal;
-    inherit graphicsmagick;
-    inherit youtube-dl;
-    inherit ncmpc ncmpcpp;
-    inherit cadaver;
-    inherit mairix notmuch;
-    inherit ctags;
-    inherit s3cmd;
-    inherit solc; # solidity
-    inherit rtorrent;
-    inherit strace;
-    inherit vdirsyncer;
-    inherit w3m lynx links;
-    inherit gitRepo;
-    inherit valgrind;
-    inherit iotop iperf;
-    inherit keybase;
-    inherit bogofilter;
-    inherit mtr;
-    inherit urlview;
-    inherit rr;
-    inherit nix-zsh-completions;
-    inherit browsh;
-    inherit monero;
-    inherit nextcloud-client;
-    inherit feh imagemagick;
-    inherit lftp;
-    stgit = gitAndTools.stgit;
-    inherit bundix;
-    bower2nix = nodePackages.bower2nix;
-    inherit firefox;
-    inherit jq;
-    inherit lzo unzip bzip2 p7zip xz;
-    # unrar is unfree
-    inherit tig;
-    inherit emacs26-nox;
-    inherit highlight sourceHighlight;
-    pygmentize = python3Packages.pygments;
-    inherit iftop htop;
-    inherit fetchmail;
-    inherit bc;
-    inherit cpulimit;
-    inherit dmenu st;
-    inherit poppler_utils;
-    inherit tmux;
-    inherit netcat-gnu;
-    inherit ledger;
-    inherit ffmpeg libxslt;
-  }
+{ pkgs ? import <nixpkgs> {} }:
+let
+  pkgs_ = pkgs;
+  mypkgs = import ./pkgs { pkgs = pkgs_; };
+in
+{
+  lib = import ./libs.nix { pkgs = pkgs_; };
+  overlays = import ./overlays;
+  pkgs = mypkgs;
+} // mypkgs