diff options
| -rw-r--r-- | common-workstation.nix | 1 | ||||
| -rw-r--r-- | envs/default.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/config.nix | 7 | ||||
| -rw-r--r-- | packages.nix (renamed from collections/aszlig.nix) | 157 | ||||
| -rw-r--r-- | release.nix | 4 |
5 files changed, 66 insertions, 121 deletions
diff --git a/common-workstation.nix b/common-workstation.nix index 5d952677..83e6f81f 100644 --- a/common-workstation.nix +++ b/common-workstation.nix @@ -3,6 +3,7 @@ { imports = [ ./common.nix + ./packages.nix <nixpkgs/nixos/modules/programs/virtualbox.nix> ]; diff --git a/envs/default.nix b/envs/default.nix deleted file mode 100644 index 9806d61c..00000000 --- a/envs/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -pkgs: - -with pkgs; - -{ - aszligEnv = buildEnv { - name = "aszlig-env"; - paths = let - genAszligEnv = name: paths: buildEnv { - name = "aszlig-${name}-packages"; - inherit paths; - ignoreCollisions = true; - }; - collection = import ../collections/aszlig.nix pkgs; - in lib.mapAttrsToList genAszligEnv collection; - ignoreCollisions = true; - }; -} diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix index ca1d33f3..45d3de5f 100644 --- a/nixpkgs/config.nix +++ b/nixpkgs/config.nix @@ -1,13 +1,10 @@ { pulseaudio = true; - chromium.jre = true; + chromium.enablePepperFlash = true; firefox.jre = true; # Needed for CPU microcode allowUnfree = true; - packageOverrides = pkgs: let - mainOverrides = import ../overrides pkgs; - envs = import ../envs (pkgs // mainOverrides); - in mainOverrides // envs; + packageOverrides = import ../overrides; } diff --git a/collections/aszlig.nix b/packages.nix index f2cd57b0..7a1f170b 100644 --- a/collections/aszlig.nix +++ b/packages.nix @@ -1,124 +1,93 @@ -pkgs: - -with pkgs; +{ pkgs, ... }: { - haskell = with haskellPackages; [ - cabal2nix - hlint - yesodBin - ]; - - python = with pythonPackages; [ - hetzner - pep8 - polib - pkgs.python - pkgs.python3 - ]; - - games = [ - uqm - ]; - - shell = [ + environment.systemPackages = with pkgs; [ apg ascii + aspellDicts.de + aspellDicts.en + axbo bc + chromiumBeta dash dos2unix + erlang fbida - figlet - hexedit - lftp - mmv - mutt - ncdu - openssl - p7zip - rlwrap - screen - surfraw - taskwarrior - unzip - vbindiff - w3m - ]; - - multimedia = [ ffmpeg + figlet + firefox flac - miro - mp3info - mpg321 - mplayer - pavucontrol - picard - pulseaudio - pvolctrl - vorbisTools - ]; - - crypto = [ - gnupg1compat - keychain - openssh - ]; - - dev = [ - erlang + gajim gdb + ghostscript + gimp gitAndTools.hub gitFull + glxinfo gnumake + gnupg1compat + graphviz + haskellPackages.cabal2nix + haskellPackages.hlint + haskellPackages.yesodBin haxe + hexedit + i3 + i3lock + imagemagick + jwhois + keychain + lastwatch + lftp ltrace manpages + miro + mmv + mp3info + mpg321 + mplayer + mtr + mutt + ncdu neko + netrw nix-prefetch-scripts nix-repl - nixpkgs-lint - posix_man_pages - strace - valgrind - ]; - - dicts = with aspellDicts; [ de en ]; - - net = [ - jwhois - mtr - netrw nixops + nixpkgs-lint nmap + openssh + openssl + p7zip + pavucontrol + picard + posix_man_pages + pulseaudio + pvolctrl + python + python3 + pythonPackages.hetzner + pythonPackages.pep8 + pythonPackages.polib + rlwrap + rtorrent samplicator + screen + scrot socat + sqlite + strace + surfraw + taskwarrior telnet + unzip + uqm + valgrind + vbindiff + vorbisTools + w3m wireshark - ]; - - x11 = [ - gajim - i3 - i3lock - scrot xpdf - ]; - - misc = [ - axbo - (chromiumBeta.override { - enablePepperFlash = true; - }) - firefox - ghostscript - gimp - glxinfo - graphviz - imagemagick - lastwatch - rtorrent - sqlite youtubeDL ]; } diff --git a/release.nix b/release.nix index 4ea7a7f0..52126c8c 100644 --- a/release.nix +++ b/release.nix @@ -8,8 +8,4 @@ with import <nixpkgs/lib>; tests = { i3 = import ./tests/i3.nix { system = "x86_64-linux"; }; }; - - envs = (import ./envs) (import <nixpkgs> { - config = import ./nixpkgs/config.nix; - }); } |