From b0911354527c2363332cd02fc7c2a3711ca7cbe2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 18 Mar 2015 11:57:50 +0100
Subject: aszlig/workstation: Use package.nix as a list.

Using package.nix as a module would mean that we would need to check for
the workstation profile in there again, so let's just make it a list and
import it from the default.nix where we only once check whether the
profile is enabled.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../user/aszlig/profiles/workstation/default.nix   |   4 +-
 .../user/aszlig/profiles/workstation/packages.nix  | 192 ++++++++++-----------
 2 files changed, 95 insertions(+), 101 deletions(-)

(limited to 'modules')

diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index a43a053e..fa387a9b 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -9,8 +9,6 @@ in {
     enable = lib.mkEnableOption "Workstation profile for aszlig";
   };
 
-  imports = [ ./packages.nix ];
-
   config = lib.mkIf cfg.enable {
     vuizvui.user.aszlig.profiles.base.enable = true;
 
@@ -27,7 +25,7 @@ in {
     in singleton (pkgs.writeScriptBin "xreset" ''
       #!${pkgs.stdenv.shell}
       ${pkgs.xorg.xrandr}/bin/xrandr ${concatStringsSep " " randrConf}
-    '');
+    '') ++ import ./packages.nix pkgs;
 
     hardware = {
       pulseaudio.enable = true;
diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix
index b94baf41..48188e7f 100644
--- a/modules/user/aszlig/profiles/workstation/packages.nix
+++ b/modules/user/aszlig/profiles/workstation/packages.nix
@@ -1,98 +1,94 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    aacolorize
-    acpi
-    apg
-    ascii
-    aspellDicts.de
-    aspellDicts.en
-    axbo
-    bc
-    beets
-    chromiumBeta
-    dash
-    dos2unix
-    erlang
-    fbida
-    ffmpeg
-    figlet
-    firefox
-    flac
-    gajim
-    gdb
-    ghostscript
-    gimp
-    glxinfo
-    gnumake
-    gnupg1compat
-    graphviz
-    haskellngPackages.cabal2nix
-    haskellngPackages.cabal-install
-    haskellngPackages.hlint
-    haskellngPackages.yesod-bin
-    haxe
-    hexedit
-    i3
-    i3lock
-    imagemagick
-    jwhois
-    keychain
-    lastwatch
-    lftp
-    ltrace
-    manpages
-    miro
-    mmv
-    mosh
-    mp3info
-    mpg321
-    mpv
-    mtr
-    mutt
-    ncdu
-    neko
-    netrw
-    nix-prefetch-scripts
-    nix-repl
-    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
-    sox
-    sqlite
-    strace
-    surfraw
-    taskwarrior
-    telnet
-    tomahawk
-    unzip
-    uqm
-    valgrind
-    vbindiff
-    vorbisTools
-    w3m
-    wireshark
-    xpdf
-    youtubeDL
-  ];
-}
+pkgs: with pkgs; [
+  aacolorize
+  acpi
+  apg
+  ascii
+  aspellDicts.de
+  aspellDicts.en
+  axbo
+  bc
+  beets
+  chromiumBeta
+  dash
+  dos2unix
+  erlang
+  fbida
+  ffmpeg
+  figlet
+  firefox
+  flac
+  gajim
+  gdb
+  ghostscript
+  gimp
+  glxinfo
+  gnumake
+  gnupg1compat
+  graphviz
+  haskellngPackages.cabal2nix
+  haskellngPackages.cabal-install
+  haskellngPackages.hlint
+  haskellngPackages.yesod-bin
+  haxe
+  hexedit
+  i3
+  i3lock
+  imagemagick
+  jwhois
+  keychain
+  lastwatch
+  lftp
+  ltrace
+  manpages
+  miro
+  mmv
+  mosh
+  mp3info
+  mpg321
+  mpv
+  mtr
+  mutt
+  ncdu
+  neko
+  netrw
+  nix-prefetch-scripts
+  nix-repl
+  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
+  sox
+  sqlite
+  strace
+  surfraw
+  taskwarrior
+  telnet
+  tomahawk
+  unzip
+  uqm
+  valgrind
+  vbindiff
+  vorbisTools
+  w3m
+  wireshark
+  xpdf
+  youtubeDL
+]
-- 
cgit 1.4.1