moved bluray deps to extra

configuration.nix

@@ -19,6 +19,8 @@ in
     ./users/servostar/user.nix
     ./.luks-swap.nix
     ./fonts.nix
+    ./extra/dvd.nix
+    ./extra/bluray.nix
   ];
 
   hardware.bluetooth.enable = true;
@@ -170,7 +172,7 @@ in
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = (with pkgs; [
     (python3.withPackages(python-packages))
 
     virt-manager
@@ -195,11 +197,6 @@ in
     openocd         # on-chip programming and debugging support
     avrdude         # esp32 and others support
 
-    libdvdcss
-    libaacs
-    libbdplus
-    libbluray
-
     devbox
     filelight
     ffmpeg-full
@@ -228,7 +225,7 @@ in
 
     wineWowPackages.stable
     winetricks
-  ];
+  ]);
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

extra/bluray.nix

@@ -0,0 +1,14 @@
+{ pkgs, config, ... }: {
+    # libaacs requires some extra configuration
+    # an extra VUK database setup in the users XDG config directory
+    # can be downloaded from: http://fvonline-db.bplaced.net/
+    # and must be placed in: ~/.config/aaacs/KEYDB.cfg
+
+    # packages needed for decrypting Blurays
+    environment.systemPackages = with pkgs; [
+        libdvdcss
+        libaacs
+        libbdplus
+        libbluray
+    ];
+}

extra/dvd.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+    # packages needed for decrypting DVDs with handbrake
+    environment.systemPackages = with pkgs; [
+        libdvdcss
+        handbrake
+    ];
+}

nixos-build.sh

@@ -6,7 +6,9 @@ read -r choice
 case "$choice" in 
     y|Y )
         echo "copying files..."
-        cp -rv nixos /etc
+        cp -rv extra /etc/nixos/
+        cp -rv users /etc/nixos/users
+        cp -rv *.nix /etc/nixos/
     ;;
     n|N )
         echo "aborting..."
@@ -32,4 +34,4 @@ case "$1" in
         ;;
 esac
 
-echo "done"
+echo "done"

python-packages.nix

@@ -11,5 +11,4 @@ ps: with ps;
   setuptools
   ipykernel
   scipy
-  gurobipy
+]
-]

users/servostar/user.nix

@@ -113,7 +113,6 @@
       mpv
       inkscape
       krita
-      handbrake
       libreoffice-qt
       libsForQt5.kcalc
       libsForQt5.ark