Refactor configuration and overlays

4 files changed, 120 insertions, 35 deletions

diff --git a/overlays/default.nix b/overlays/default.nix
index ac7e401..dcb122e 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,6 @@
 {
-  mylibs = self: super: { mylibs = import ../libs.nix { nixpkgs = self; }; };
-  mypkgs = import ./mypkgs.nix;
+  mylibs = self: super: { mylibs = import ../libs.nix { pkgs = self; }; };
+  mypkgs = self: super: import ../pkgs { pkgs = self; };
 
   bitlbee = import ./bitlbee;
   dwm = import ./dwm;
@@ -25,3 +25,4 @@
   ympd = import ./ympd;
 }
 // import ./python-packages
+// import ./environments
diff --git a/overlays/environments/default.nix b/overlays/environments/default.nix
new file mode 100644
index 0000000..630b0bd
--- /dev/null
+++ b/overlays/environments/default.nix
@@ -0,0 +1,3 @@
+{
+  immae-eu = import ./immae-eu.nix;
+}
diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix
new file mode 100644
index 0000000..303ab0f
--- /dev/null
+++ b/overlays/environments/immae-eu.nix
@@ -0,0 +1,114 @@
+self: super: with self;
+let
+  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
+  # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
+  paths = [
+    # archives
+    lzo unzip bzip2 p7zip xz
+    # unrar is unfree
+
+    # backups
+    duply
+
+    # calendar/contacts
+    abook khard khal cadaver vdirsyncer pal
+
+    # computing
+    boinctui
+
+    # cryptocurrencies
+    cardano sia monero
+    xmr-stak
+    solc
+    iota-cli-app
+
+    # debugging
+    rr valgrind netcat-gnu strace
+
+    # documentations
+    unicodeDoc
+
+    # e-mails
+    muttprint mutt-ics
+    notmuch-python2 notmuch-python3 notmuch-vim
+    neomutt mairix notmuch
+    bogofilter fetchmail
+
+    # git
+    vcsh gitRepo gitAndTools.stgit tig
+
+    # graphical tools
+    nextcloud-client firefox
+    dwm dmenu st
+
+    # images
+    feh imagemagick tiv graphicsmagick
+
+    # internet browsing
+    w3m lynx links elinks browsh weboob urlview googler urlwatch
+
+    # less
+    python3Packages.pygments lesspipe highlight sourceHighlight
+
+    # monitoring
+    cnagios mtop pg_activity nagios-cli mtr
+    iftop htop iotop iperf
+    goaccess
+    # nagnu
+
+    # messaging/forums/news
+    flrn slrn
+    telegram-cli telegram-history-dump telegramircd
+    weechat profanity
+    newsboat irssi
+
+    # nix
+    mylibs.yarn2nixPackage.yarn2nix
+    nixops nix-prefetch-scripts nix-generate-from-cpan
+    nix-zsh-completions bundix nodePackages.bower2nix
+    # (nixos {}).nixos-generate-config
+    # (nixos {}).nixos-install
+    # (nixos {}).nixos-enter
+    # (nixos {}).manual.manpages
+
+    # note taking
+    note terminal-velocity jrnl
+
+    # office
+    sc-im ranger
+    genius bc
+    ledger
+    tmux
+    rtorrent
+    ldapvi
+
+    # password management
+    pass apg pwgen
+
+    # pdf
+    pdftk poppler_utils
+
+    # programming
+    pelican emacs26-nox ctags
+
+    # security
+    keybase
+
+    # todolist/time management
+    taskwarrior vit timewarrior
+
+    # video/music
+    youtube-dl ncmpc ncmpcpp ffmpeg
+
+    # other tools
+    pgloader s3cmd lftp jq cpulimit libxslt
+  ];
+in
+{
+  myEnvironments.immae-eu = buildEnv {
+    name = "immae-eu-packages";
+    inherit paths;
+    pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"];
+    extraOutputsToInstall = [ "bin" "man" "doc" "info" ];
+  };
+}
diff --git a/overlays/mypkgs.nix b/overlays/mypkgs.nix
deleted file mode 100644
index f0bdf95..0000000
--- a/overlays/mypkgs.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-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;
-}