From eaa9613a5654f1001f946fe73248ffcb46c28fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 25 Jan 2020 19:56:20 +0100 Subject: Move environments to specific attrs --- default.nix | 1 + environments/default.nix | 4 ++ environments/immae-eu.nix | 131 ++++++++++++++++++++++++++++++++++++ overlays/default.nix | 1 - overlays/environments/default.nix | 3 - overlays/environments/immae-eu.nix | 133 ------------------------------------- pkgs/default.nix | 1 + 7 files changed, 137 insertions(+), 137 deletions(-) create mode 100644 environments/default.nix create mode 100644 environments/immae-eu.nix delete mode 100644 overlays/environments/default.nix delete mode 100644 overlays/environments/immae-eu.nix diff --git a/default.nix b/default.nix index ae27e32e..3a4724bc 100644 --- a/default.nix +++ b/default.nix @@ -8,4 +8,5 @@ in modules = import ./modules; overlays = import ./overlays; pkgs = mypkgs; + environments = pkgs.callPackage ./environments {}; } // mypkgs diff --git a/environments/default.nix b/environments/default.nix new file mode 100644 index 00000000..5f17eb9e --- /dev/null +++ b/environments/default.nix @@ -0,0 +1,4 @@ +{ callPackage }: +{ + immae-eu = callPackage ./immae-eu.nix {}; +} diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix new file mode 100644 index 00000000..787d3033 --- /dev/null +++ b/environments/immae-eu.nix @@ -0,0 +1,131 @@ +{ pkgs }: with pkgs; +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 cardano-cli sia monero + xmr-stak + solc + iota-cli-app + + # debugging + rr valgrind netcat-gnu strace shellcheck + + # documentations + unicodeDoc + + # e-mails + muttprint mutt-ics + notmuch-python2 notmuch-python3 notmuch-vim + neomutt mairix notmuch + bogofilter fetchmail + sieve-connect + + # git + vcsh gitRepo gitAndTools.stgit tig ripgrep + + # graphical tools + nextcloud-client firefox + dwm dmenu st + + # images + feh imagemagick tiv graphicsmagick qrcode + + # internet browsing + w3m lynx links elinks browsh weboob urlview urlscan googler urlwatch + + # less + python3Packages.pygments lesspipe highlight sourceHighlight + + # monitoring + cnagios mtop pg_activity nagios-cli mtr + iftop htop iotop iperf bonfire + goaccess tcpdump tshark tcpflow mitmproxy + # nagnu + + # messaging/forums/news + #flrn slrn + telegram-cli telegram-history-dump telegramircd + weechat profanity + newsboat irssi + + # nix + mylibs.yarn2nixPackage.yarn2nix nix + nixops nix-prefetch-scripts nix-generate-from-cpan + nix-zsh-completions bundix nodePackages.bower2nix + nodePackages.node2nix + # (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 + fzf + buku + + # password management + pass apg pwgen + + # pdf + pdftk poppler_utils + + # programming + pelican emacs26-nox ctags + wdiff patch + + # security + keybase + + # todolist/time management + taskwarrior vit timewarrior + + # video/music + youtube-dl ncmpc ncmpcpp ffmpeg + + # s6 tools (part of skawarePackages) + skalibs execline s6 s6-dns s6-linux-utils s6-networking + s6-portable-utils + + # system tools + telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc + wget patchelf rename tmux (lib.meta.hiPrio nettools) + + # other tools + pgloader s3cmd lftp jq cpulimit libxslt gandi-cli + + # Terraform + AWS + terraform_0_12 awscli + (ansible.override { python2 = python3; }) python3Packages.boto + openvpn + ]; +in +buildEnv { + name = "immae-eu-packages"; + inherit paths; + pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"]; + extraOutputsToInstall = [ "bin" "man" "doc" "info" ]; + passthru = { packages = paths; }; +} diff --git a/overlays/default.nix b/overlays/default.nix index 8445f27c..a46986d0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -29,4 +29,3 @@ ympd = import ./ympd; } // import ./python-packages -// import ./environments diff --git a/overlays/environments/default.nix b/overlays/environments/default.nix deleted file mode 100644 index 630b0bd1..00000000 --- a/overlays/environments/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - immae-eu = import ./immae-eu.nix; -} diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix deleted file mode 100644 index 6287a97b..00000000 --- a/overlays/environments/immae-eu.nix +++ /dev/null @@ -1,133 +0,0 @@ -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 cardano-cli sia monero - xmr-stak - solc - iota-cli-app - - # debugging - rr valgrind netcat-gnu strace shellcheck - - # documentations - unicodeDoc - - # e-mails - muttprint mutt-ics - notmuch-python2 notmuch-python3 notmuch-vim - neomutt mairix notmuch - bogofilter fetchmail - sieve-connect - - # git - vcsh gitRepo gitAndTools.stgit tig ripgrep - - # graphical tools - nextcloud-client firefox - dwm dmenu st - - # images - feh imagemagick tiv graphicsmagick qrcode - - # internet browsing - w3m lynx links elinks browsh weboob urlview urlscan googler urlwatch - - # less - python3Packages.pygments lesspipe highlight sourceHighlight - - # monitoring - cnagios mtop pg_activity nagios-cli mtr - iftop htop iotop iperf bonfire - goaccess tcpdump tshark tcpflow mitmproxy - # nagnu - - # messaging/forums/news - #flrn slrn - telegram-cli telegram-history-dump telegramircd - weechat profanity - newsboat irssi - - # nix - mylibs.yarn2nixPackage.yarn2nix nix - nixops nix-prefetch-scripts nix-generate-from-cpan - nix-zsh-completions bundix nodePackages.bower2nix - nodePackages.node2nix - # (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 - fzf - buku - - # password management - pass apg pwgen - - # pdf - pdftk poppler_utils - - # programming - pelican emacs26-nox ctags - wdiff patch - - # security - keybase - - # todolist/time management - taskwarrior vit timewarrior - - # video/music - youtube-dl ncmpc ncmpcpp ffmpeg - - # s6 tools (part of skawarePackages) - skalibs execline s6 s6-dns s6-linux-utils s6-networking - s6-portable-utils - - # system tools - telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc - wget patchelf rename tmux (lib.meta.hiPrio nettools) - - # other tools - pgloader s3cmd lftp jq cpulimit libxslt gandi-cli - - # Terraform + AWS - terraform_0_12 awscli - (ansible.override { python2 = python3; }) python3Packages.boto - openvpn - ]; -in -{ - myEnvironments.immae-eu = buildEnv { - name = "immae-eu-packages"; - inherit paths; - pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"]; - extraOutputsToInstall = [ "bin" "man" "doc" "info" ]; - passthru = { packages = paths; }; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 54868ba9..2ad79a2f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,6 +4,7 @@ let mylibs = import ../lib { inherit pkgs; }; in rec { + myEnvironments = callPackage ../environments {}; boinctui = callPackage ../pkgs/boinctui {}; cnagios = callPackage ../pkgs/cnagios { inherit mylibs; }; duply = callPackage ../pkgs/duply {}; -- cgit v1.2.3