diff options
| -rw-r--r-- | collections/aszlig.nix | 81 | ||||
| -rw-r--r-- | nixpkgs/config.nix | 81 |
2 files changed, 83 insertions, 79 deletions
diff --git a/collections/aszlig.nix b/collections/aszlig.nix new file mode 100644 index 00000000..f820c749 --- /dev/null +++ b/collections/aszlig.nix @@ -0,0 +1,81 @@ +pkgs: + +{ + haskell = with pkgs.haskellPackages; [ + ghc cabalInstall hlint + darcs + diagrams + yesod yesodStatic yesodDefault yesodTest + hjsmin persistentSqlite + ]; + + python = with pkgs.pythonPackages; [ + pkgs.python3 + pkgs.python + pep8 + polib + ]; + + shell = with pkgs; [ + zsh dash + taskwarrior + screen + htop + bc + lftp + mmv + ncdu + surfraw + w3m + fbida + mutt + vlock + ]; + + multimedia = with pkgs; [ + pulseaudio pvolctrl + MPlayer + vorbisTools + mpg321 + mp3info + ]; + + crypto = with pkgs; [ + gnupg1compat openssh + keychain + ]; + + dev = with pkgs; [ + manpages + posix_man_pages + gitFull + gdb + gnumake + vim_configurable + ltrace strace + ]; + + net = with pkgs; [ + netrw + nmap + socat + ]; + + x11 = with pkgs; [ + i3 i3lock i3status dmenu conky + tkabber + tkabber_plugins + xpdf + ]; + + misc = with pkgs; [ + lastwatch + chromiumBetaWrapper + glxinfo + imagemagick + graphviz + youtubeDL + ghostscript + rtorrent + ]; +} diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix index 4957c483..b3134053 100644 --- a/nixpkgs/config.nix +++ b/nixpkgs/config.nix @@ -5,85 +5,8 @@ let inherit paths; ignoreCollisions = true; }; - in pkgs.lib.mapAttrsToList genAszligEnv { - haskell = with pkgs.haskellPackages; [ - ghc cabalInstall hlint - darcs - diagrams - yesod yesodStatic yesodDefault yesodTest - hjsmin persistentSqlite - ]; - - python = with pkgs.pythonPackages; [ - pkgs.python3 - pkgs.python - pep8 - polib - ]; - - shell = with pkgs; [ - zsh dash - taskwarrior - screen - htop - bc - lftp - mmv - ncdu - surfraw - w3m - fbida - mutt - vlock - ]; - - multimedia = with pkgs; [ - pulseaudio pvolctrl - MPlayer - vorbisTools - mpg321 - mp3info - ]; - - crypto = with pkgs; [ - gnupg1compat openssh - keychain - ]; - - dev = with pkgs; [ - manpages - posix_man_pages - gitFull - gdb - gnumake - vim_configurable - ltrace strace - ]; - - net = with pkgs; [ - netrw - nmap - socat - ]; - - x11 = with pkgs; [ - i3 i3lock i3status dmenu conky - tkabber - tkabber_plugins - xpdf - ]; - - misc = with pkgs; [ - lastwatch - chromiumBetaWrapper - glxinfo - imagemagick - graphviz - youtubeDL - ghostscript - rtorrent - ]; - }; + collection = import ../collections/aszlig.nix pkgs; + in pkgs.lib.mapAttrsToList genAszligEnv collection; tkabberRev = 2009; in { |