diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
| commit | 01358d3947b46c2d9cceb7f6c53855cb536d6efe (patch) | |
| tree | 194c3c5e346327774603f8948a0fa301a082be90 /lass/1systems/mors/config.nix | |
| parent | 390375cd8a0c745eb6b4df93f3f6f3e5f2985c90 (diff) | |
| parent | 6267aa42509a4f56dc95dfc2db7773c33ca12522 (diff) | |
Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'lass/1systems/mors/config.nix')
| -rw-r--r-- | lass/1systems/mors/config.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 936666a7..cbb71ab2 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -31,6 +31,8 @@ with import <stockholm/lib>; <stockholm/lass/2configs/c-base.nix> <stockholm/lass/2configs/br.nix> <stockholm/lass/2configs/ableton.nix> + <stockholm/lass/2configs/dunst.nix> + <stockholm/lass/2configs/rtl-sdr.nix> { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ @@ -89,6 +91,10 @@ with import <stockholm/lib>; fsType = "btrfs"; options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; + "/home/virtual" = { + device = "/dev/mapper/pool-virtual"; + fsType = "ext4"; + }; }; services.udev.extraRules = '' @@ -176,7 +182,7 @@ with import <stockholm/lib>; echo 'secrets are crypted' >&2 exit 23 else - exec nix-shell -I stockholm="$PWD" --run 'deploy --diff --system="$SYSTEM"' + exec nix-shell -I stockholm="$PWD" --run 'deploy --system="$SYSTEM"' fi ''; predeploy = pkgs.writeDash "predeploy" '' @@ -194,5 +200,6 @@ with import <stockholm/lib>; nix.package = pkgs.nixUnstable; programs.adb.enable = true; - users.users.mainUser.extraGroups = [ "adbusers" ]; + users.users.mainUser.extraGroups = [ "adbusers" "docker" ]; + virtualisation.docker.enable = true; } |