From 980581249df7a6d45c47357392d6e6a2f770ba29 Mon Sep 17 00:00:00 2001 From: servostar Date: Fri, 17 Nov 2023 16:15:01 +0100 Subject: [PATCH] added extra folder with addional configs and moved dvd decryption to extra --- configuration.nix | 5 +++-- extra/dvd.nix | 7 +++++++ nixos-build.sh | 6 ++++-- users/servostar/user.nix | 1 - 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 extra/dvd.nix diff --git a/configuration.nix b/configuration.nix index 9ed32c1..5a81029 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,6 +19,7 @@ in ./users/servostar/user.nix ./.luks-swap.nix ./fonts.nix + ./extra/dvd.nix ]; hardware.bluetooth.enable = true; @@ -170,7 +171,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 @@ -228,7 +229,7 @@ in wineWowPackages.stable winetricks - ]; + ]); # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/extra/dvd.nix b/extra/dvd.nix new file mode 100644 index 0000000..2cfd044 --- /dev/null +++ b/extra/dvd.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + # packages needed for decrypting DVDs with handbrake + environment.systemPackages = with pkgs; [ + libdvdcss + handbrake + ]; +} diff --git a/nixos-build.sh b/nixos-build.sh index d608417..9f97129 100644 --- a/nixos-build.sh +++ b/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" \ No newline at end of file +echo "done" diff --git a/users/servostar/user.nix b/users/servostar/user.nix index 9ad1ed0..fb7bd60 100644 --- a/users/servostar/user.nix +++ b/users/servostar/user.nix @@ -113,7 +113,6 @@ mpv inkscape krita - handbrake libreoffice-qt libsForQt5.kcalc libsForQt5.ark