aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.nix52
-rw-r--r--nixops/modules/ftp/default.nix4
-rw-r--r--nixops/modules/mpd/default.nix3
-rw-r--r--overlays/default.nix1
-rw-r--r--overlays/mypkgs.nix33
-rw-r--r--pkgs/mpd_0_21/default.nix (renamed from nixops/modules/mpd/mpd.nix)0
-rw-r--r--pkgs/pure-ftpd/default.nix (renamed from nixops/modules/ftp/pure-ftpd.nix)0
7 files changed, 60 insertions, 33 deletions
diff --git a/default.nix b/default.nix
index 5d9e138..9c548a0 100644
--- a/default.nix
+++ b/default.nix
@@ -1,33 +1,33 @@
1with import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); }; 1with import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); };
2 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh 2 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
3 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks 3 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
4 { 4 { # files in overlays/mypkgs.nix
5 boinctui = callPackage ./pkgs/boinctui {}; 5 inherit boinctui;
6 cnagios = callPackage ./pkgs/cnagios {}; 6 inherit cnagios;
7 duply = callPackage ./pkgs/duply {}; 7 inherit duply;
8 flrn = callPackage ./pkgs/flrn { slang = callPackage ./pkgs/slang_1 {}; }; 8 inherit flrn;
9 genius = callPackage ./pkgs/genius {}; 9 inherit genius;
10 mtop = callPackage ./pkgs/mtop {}; 10 inherit mtop;
11 muttprint = callPackage ./pkgs/muttprint {}; 11 inherit muttprint;
12 mutt-ics = callPackage ./pkgs/mutt-ics {}; 12 inherit mutt-ics;
13 nagios-cli = callPackage ./pkgs/nagios-cli {}; 13 inherit nagios-cli;
14 #nagnu = callPackage ./pkgs/nagnu {}; 14 #inherit nagnu;
15 note = callPackage ./pkgs/note {}; 15 inherit note;
16 notmuch-python2 = callPackage ./pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; }; 16 inherit notmuch-python2;
17 notmuch-python3 = callPackage ./pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; }; 17 inherit notmuch-python3;
18 notmuch-vim = callPackage ./pkgs/notmuch/notmuch-vim {}; 18 inherit notmuch-vim;
19 pg_activity = callPackage ./pkgs/pg_activity {}; 19 inherit pg_activity;
20 pgloader = callPackage ./pkgs/pgloader {}; 20 inherit pgloader;
21 telegram-cli = callPackage ./pkgs/telegram-cli {}; 21 inherit telegram-cli;
22 telegram-history-dump = callPackage ./pkgs/telegram-history-dump {}; 22 inherit telegram-history-dump;
23 telegramircd = callPackage ./pkgs/telegramircd { telethon = callPackage ./pkgs/telethon_sync {}; }; 23 inherit telegramircd;
24 terminal-velocity = callPackage ./pkgs/terminal-velocity {}; 24 inherit terminal-velocity;
25 tiv = callPackage ./pkgs/tiv {}; 25 inherit tiv;
26 unicode = callPackage ./pkgs/unicode {}; 26 inherit unicodeDoc;
27 27
28 cardano = callPackage ./pkgs/crypto/cardano {}; 28 inherit cardano;
29 iota-cli-app = callPackage ./pkgs/crypto/iota-cli-app {}; 29 inherit iota-cli-app;
30 sia = callPackage ./pkgs/crypto/sia {}; 30 inherit sia;
31 } // { # overlays 31 } // { # overlays
32 inherit weboob; 32 inherit weboob;
33 inherit taskwarrior; 33 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 @@
19 extraDomains = { "ftp.immae.eu" = null; }; 19 extraDomains = { "ftp.immae.eu" = null; };
20 }; 20 };
21 21
22 nixpkgs.overlays = [ (self: super: {
23 pure-ftpd = self.callPackage ./pure-ftpd.nix {};
24 }) ];
25
26 networking = { 22 networking = {
27 firewall = { 23 firewall = {
28 allowedTCPPorts = [ 21 ]; 24 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 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2{ 2{
3 config = { 3 config = {
4 nixpkgs.overlays = [ (self: super: rec {
5 mpd = (self.callPackage ./mpd.nix {}).mpd;
6 }) ];
7 mySecrets.keys = [ 4 mySecrets.keys = [
8 { 5 {
9 dest = "mpd"; 6 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 @@
1{ 1{
2 mylibs = self: super: { mylibs = import ../libs.nix { nixpkgs = self; }; }; 2 mylibs = self: super: { mylibs = import ../libs.nix { nixpkgs = self; }; };
3 mypkgs = import ./mypkgs.nix;
3 4
4 bitlbee = import ./bitlbee; 5 bitlbee = import ./bitlbee;
5 dwm = import ./dwm; 6 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 @@
1self: super: with self;
2{
3 boinctui = callPackage ../pkgs/boinctui {};
4 cnagios = callPackage ../pkgs/cnagios {};
5 duply = callPackage ../pkgs/duply {};
6 flrn = callPackage ../pkgs/flrn { slang = callPackage ../pkgs/slang_1 {}; };
7 genius = callPackage ../pkgs/genius {};
8 mtop = callPackage ../pkgs/mtop {};
9 muttprint = callPackage ../pkgs/muttprint {};
10 mutt-ics = callPackage ../pkgs/mutt-ics {};
11 nagios-cli = callPackage ../pkgs/nagios-cli {};
12 nagnu = callPackage ../pkgs/nagnu {};
13 note = callPackage ../pkgs/note {};
14 notmuch-python2 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; };
15 notmuch-python3 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; };
16 notmuch-vim = callPackage ../pkgs/notmuch/notmuch-vim {};
17 pg_activity = callPackage ../pkgs/pg_activity {};
18 pgloader = callPackage ../pkgs/pgloader {};
19 telegram-cli = callPackage ../pkgs/telegram-cli {};
20 telegram-history-dump = callPackage ../pkgs/telegram-history-dump {};
21 telegramircd = callPackage ../pkgs/telegramircd { telethon = callPackage ../pkgs/telethon_sync {}; };
22 terminal-velocity = callPackage ../pkgs/terminal-velocity {};
23 tiv = callPackage ../pkgs/tiv {};
24 unicodeDoc = callPackage ../pkgs/unicode {};
25
26 cardano = callPackage ../pkgs/crypto/cardano {};
27 iota-cli-app = callPackage ../pkgs/crypto/iota-cli-app {};
28 sia = callPackage ../pkgs/crypto/sia {};
29
30 pure-ftpd = callPackage ../pkgs/pure-ftpd {};
31 mpd = (callPackage ../pkgs/mpd_0_21 {}).mpd;
32 mpd-small = (callPackage ../pkgs/mpd_0_21 {}).mpd-small;
33}
diff --git a/nixops/modules/mpd/mpd.nix b/pkgs/mpd_0_21/default.nix
index f19a76f..f19a76f 100644
--- a/nixops/modules/mpd/mpd.nix
+++ b/pkgs/mpd_0_21/default.nix
diff --git a/nixops/modules/ftp/pure-ftpd.nix b/pkgs/pure-ftpd/default.nix
index 37ce695..37ce695 100644
--- a/nixops/modules/ftp/pure-ftpd.nix
+++ b/pkgs/pure-ftpd/default.nix