From 6e2dc958bc8c5aac4871d2a618741fa4628ed126 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 2 May 2019 03:02:53 +0200
Subject: [PATCH] Continue moving overlays to dedicated directory

---
 default.nix                                   | 52 +++++++++----------
 nixops/modules/ftp/default.nix                |  4 --
 nixops/modules/mpd/default.nix                |  3 --
 overlays/default.nix                          |  1 +
 overlays/mypkgs.nix                           | 33 ++++++++++++
 .../mpd/mpd.nix => pkgs/mpd_0_21/default.nix  |  0
 .../pure-ftpd/default.nix                     |  0
 7 files changed, 60 insertions(+), 33 deletions(-)
 create mode 100644 overlays/mypkgs.nix
 rename nixops/modules/mpd/mpd.nix => pkgs/mpd_0_21/default.nix (100%)
 rename nixops/modules/ftp/pure-ftpd.nix => pkgs/pure-ftpd/default.nix (100%)

diff --git a/default.nix b/default.nix
index 5d9e138..9c548a0 100644
--- a/default.nix
+++ b/default.nix
@@ -1,33 +1,33 @@
 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
-  {
-    boinctui = callPackage ./pkgs/boinctui {};
-    cnagios = callPackage ./pkgs/cnagios {};
-    duply = callPackage ./pkgs/duply {};
-    flrn = callPackage ./pkgs/flrn { slang = callPackage ./pkgs/slang_1 {}; };
-    genius = callPackage ./pkgs/genius {};
-    mtop = callPackage ./pkgs/mtop {};
-    muttprint = callPackage ./pkgs/muttprint {};
-    mutt-ics = callPackage ./pkgs/mutt-ics {};
-    nagios-cli = callPackage ./pkgs/nagios-cli {};
-    #nagnu = callPackage ./pkgs/nagnu {};
-    note = callPackage ./pkgs/note {};
-    notmuch-python2 = callPackage ./pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; };
-    notmuch-python3 = callPackage ./pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; };
-    notmuch-vim = callPackage ./pkgs/notmuch/notmuch-vim {};
-    pg_activity = callPackage ./pkgs/pg_activity {};
-    pgloader = callPackage ./pkgs/pgloader {};
-    telegram-cli = callPackage ./pkgs/telegram-cli {};
-    telegram-history-dump = callPackage ./pkgs/telegram-history-dump {};
-    telegramircd = callPackage ./pkgs/telegramircd { telethon = callPackage ./pkgs/telethon_sync {}; };
-    terminal-velocity = callPackage ./pkgs/terminal-velocity {};
-    tiv = callPackage ./pkgs/tiv {};
-    unicode = callPackage ./pkgs/unicode {};
+  { # 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;
 
-    cardano = callPackage ./pkgs/crypto/cardano {};
-    iota-cli-app = callPackage ./pkgs/crypto/iota-cli-app {};
-    sia = callPackage ./pkgs/crypto/sia {};
+    inherit cardano;
+    inherit iota-cli-app;
+    inherit sia;
   } // { # overlays
     inherit weboob;
     inherit taskwarrior;
diff --git a/nixops/modules/ftp/default.nix b/nixops/modules/ftp/default.nix
index ff067f8..541e119 100644
--- a/nixops/modules/ftp/default.nix
+++ b/nixops/modules/ftp/default.nix
@@ -19,10 +19,6 @@
       extraDomains = { "ftp.immae.eu" = null; };
     };
 
-    nixpkgs.overlays = [ (self: super: {
-      pure-ftpd = self.callPackage ./pure-ftpd.nix {};
-    }) ];
-
     networking = {
       firewall = {
         allowedTCPPorts = [ 21 ];
diff --git a/nixops/modules/mpd/default.nix b/nixops/modules/mpd/default.nix
index 0904732..7c896ca 100644
--- a/nixops/modules/mpd/default.nix
+++ b/nixops/modules/mpd/default.nix
@@ -1,9 +1,6 @@
 { lib, pkgs, config, myconfig, mylibs, ... }:
 {
   config = {
-    nixpkgs.overlays = [ (self: super: rec {
-      mpd = (self.callPackage ./mpd.nix {}).mpd;
-    }) ];
     mySecrets.keys = [
       {
         dest = "mpd";
diff --git a/overlays/default.nix b/overlays/default.nix
index 2e2cdd3..ac7e401 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,5 +1,6 @@
 {
   mylibs = self: super: { mylibs = import ../libs.nix { nixpkgs = self; }; };
+  mypkgs = import ./mypkgs.nix;
 
   bitlbee = import ./bitlbee;
   dwm = import ./dwm;
diff --git a/overlays/mypkgs.nix b/overlays/mypkgs.nix
new file mode 100644
index 0000000..f0bdf95
--- /dev/null
+++ b/overlays/mypkgs.nix
@@ -0,0 +1,33 @@
+self: super: with self;
+{
+  boinctui = callPackage ../pkgs/boinctui {};
+  cnagios = callPackage ../pkgs/cnagios {};
+  duply = callPackage ../pkgs/duply {};
+  flrn = callPackage ../pkgs/flrn { slang = callPackage ../pkgs/slang_1 {}; };
+  genius = callPackage ../pkgs/genius {};
+  mtop = callPackage ../pkgs/mtop {};
+  muttprint = callPackage ../pkgs/muttprint {};
+  mutt-ics = callPackage ../pkgs/mutt-ics {};
+  nagios-cli = callPackage ../pkgs/nagios-cli {};
+  nagnu = callPackage ../pkgs/nagnu {};
+  note = callPackage ../pkgs/note {};
+  notmuch-python2 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; };
+  notmuch-python3 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; };
+  notmuch-vim = callPackage ../pkgs/notmuch/notmuch-vim {};
+  pg_activity = callPackage ../pkgs/pg_activity {};
+  pgloader = callPackage ../pkgs/pgloader {};
+  telegram-cli = callPackage ../pkgs/telegram-cli {};
+  telegram-history-dump = callPackage ../pkgs/telegram-history-dump {};
+  telegramircd = callPackage ../pkgs/telegramircd { telethon = callPackage ../pkgs/telethon_sync {}; };
+  terminal-velocity = callPackage ../pkgs/terminal-velocity {};
+  tiv = callPackage ../pkgs/tiv {};
+  unicodeDoc = callPackage ../pkgs/unicode {};
+
+  cardano = callPackage ../pkgs/crypto/cardano {};
+  iota-cli-app = callPackage ../pkgs/crypto/iota-cli-app {};
+  sia = callPackage ../pkgs/crypto/sia {};
+
+  pure-ftpd = callPackage ../pkgs/pure-ftpd {};
+  mpd = (callPackage ../pkgs/mpd_0_21 {}).mpd;
+  mpd-small = (callPackage ../pkgs/mpd_0_21 {}).mpd-small;
+}
diff --git a/nixops/modules/mpd/mpd.nix b/pkgs/mpd_0_21/default.nix
similarity index 100%
rename from nixops/modules/mpd/mpd.nix
rename to pkgs/mpd_0_21/default.nix
diff --git a/nixops/modules/ftp/pure-ftpd.nix b/pkgs/pure-ftpd/default.nix
similarity index 100%
rename from nixops/modules/ftp/pure-ftpd.nix
rename to pkgs/pure-ftpd/default.nix
-- 
2.41.0