diff options
| -rw-r--r-- | collections/aszlig.nix | 74 | ||||
| -rw-r--r-- | common.nix | 2 |
2 files changed, 43 insertions, 33 deletions
diff --git a/collections/aszlig.nix b/collections/aszlig.nix index aae1b3bf..0f9a98ff 100644 --- a/collections/aszlig.nix +++ b/collections/aszlig.nix @@ -4,20 +4,26 @@ with pkgs; { haskell = with haskellPackages; [ - ghc cabalInstall hlint + bytedump cabal2nix + cabalInstall darcs diagrams - bytedump - yesod yesodStatic yesodDefault yesodTest - hjsmin persistentSqlite + ghc + hjsmin + hlint + persistentSqlite + yesod + yesodDefault + yesodStatic + yesodTest ]; python = with pythonPackages; [ - pkgs.python3 - pkgs.python pep8 polib + pkgs.python + pkgs.python3 ]; games = [ @@ -25,85 +31,89 @@ with pkgs; ]; shell = [ - ascii apg + ascii + bc dash dos2unix - taskwarrior - screen + fbida figlet hexedit - bc lftp mmv - ncdu - surfraw - w3m - fbida mutt + ncdu p7zip rlwrap + screen + surfraw + taskwarrior unzip vbindiff + w3m ]; multimedia = [ - pulseaudio pvolctrl miro + mp3info + mpg321 mplayer + pavucontrol picard + pulseaudio + pvolctrl vorbisTools - mpg321 - mp3info - pavucontrol ]; crypto = [ - gnupg1compat openssh + gnupg1compat keychain + openssh ]; dev = [ - manpages - posix_man_pages - gitFull gdb + gitFull gnumake gitAndTools.hub + ltrace + manpages nix-repl nixpkgs-lint - ltrace strace + posix_man_pages + strace valgrind ]; dicts = with aspellDicts; [ de en ]; net = [ + jwhois mtr netrw nmap - socat samplicator - jwhois + socat ]; x11 = [ - scrot - i3 i3lock gajim + i3 + i3lock + scrot xpdf ]; misc = [ - lastwatch chromiumBetaWrapper firefox - glxinfo - imagemagick + ghostscript gimp + glxinfo graphviz - youtubeDL - ghostscript + imagemagick + lastwatch rtorrent + youtubeDL ]; } diff --git a/common.nix b/common.nix index e435051e..d59c57bd 100644 --- a/common.nix +++ b/common.nix @@ -195,12 +195,12 @@ }; environment.systemPackages = with pkgs; [ + binutils cacert file htop iotop psmisc - binutils unrar unzip vim_configurable |