diff options
| author | tv <tv@krebsco.de> | 2017-06-27 19:40:31 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-06-27 19:40:31 +0200 |
| commit | e1e16e0d5d3c8b80000899920cea89c1b8bd5be4 (patch) | |
| tree | f3f2765ac510bc578d2a9c350e9384284fe5fd83 /lass/1systems | |
| parent | 74429f245d366e783ecbcfb0ebd83a7f57e78e6a (diff) | |
| parent | 10b6ac40265a0f653b8753e87894cbfb6fa00590 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/iso.nix | 2 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 12 | ||||
| -rw-r--r-- | lass/1systems/prism.nix | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 8b2e82d31..b45d5b228 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -21,7 +21,6 @@ with import <stockholm/lib>; coreutils = pkgs.symlinkJoin { name = "coreutils-hack"; paths = [ - pkgs.coreutils (pkgs.writeDashBin "tee" '' if test "$1" = /dev/stderr; then while read -r line; do @@ -32,6 +31,7 @@ with import <stockholm/lib>; ${super.coreutils}/bin/tee "$@" fi '') + pkgs.coreutils ]; }; }; diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 6790c0aea..b9ab54503 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -17,7 +17,7 @@ with import <stockholm/lib>; ../2configs/steam.nix ../2configs/wine.nix ../2configs/git.nix - ../2configs/libvirt.nix + ../2configs/virtualbox.nix ../2configs/fetchWallpaper.nix #../2configs/c-base.nix ../2configs/mail.nix @@ -156,15 +156,6 @@ with import <stockholm/lib>; #activationScripts #split up and move into base system.activationScripts.powertopTunables = '' - #Enable Audio codec power management - echo '1' > '/sys/module/snd_hda_intel/parameters/power_save' - #VM writeback timeout - echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs' - #Autosuspend for USB device Broadcom Bluetooth Device [Broadcom Corp] - #echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control' - #Autosuspend for USB device Biometric Coprocessor - #echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' - #Runtime PMs echo 'auto' > '/sys/bus/pci/devices/0000:00:02.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:00.0/power/control' @@ -183,6 +174,7 @@ with import <stockholm/lib>; environment.systemPackages = with pkgs; [ acronym + brain cac-api sshpass get diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 02054a8e5..af847333d 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -46,6 +46,10 @@ in { ../2configs/paste.nix ../2configs/syncthing.nix ../2configs/coders-irc.nix + ../2configs/ciko.nix + { + lass.pyload.enable = true; + } { imports = [ ../2configs/bepasty.nix |