diff options
| -rw-r--r-- | tv/1systems/wu.nix | 15 | ||||
| -rw-r--r-- | tv/2configs/hw/w110er.nix | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index d5be57bb8..a9d7e94eb 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -23,7 +23,6 @@ with import <stockholm/lib>; # stockholm gnumake hashPassword - haskellPackages.lentil parallel # root @@ -47,7 +46,6 @@ with import <stockholm/lib>; p7zip push qrencode - texLive tmux #ack @@ -116,18 +114,23 @@ with import <stockholm/lib>; boot.initrd.luks = { cryptoModules = [ "aes" "sha512" "xts" ]; devices = [ - { name = "home"; device = "/dev/vg840/enchome"; preLVM = false; } + { name = "wuca"; device = "/dev/sda2"; } ]; }; fileSystems = { "/" = { - device = "/dev/mapper/vg840-wuroot"; + device = "/dev/mapper/wuvga-root"; + fsType = "btrfs"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; + }; + "/bku" = { + device = "/dev/mapper/wuvga-bku"; fsType = "btrfs"; options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; "/home" = { - device = "/dev/mapper/home"; + device = "/dev/mapper/wuvga-home"; fsType = "btrfs"; options = ["defaults" "noatime" "ssd" "compress=lzo"]; }; @@ -174,5 +177,5 @@ with import <stockholm/lib>; KERNEL=="hpet", GROUP="audio" ''; - services.virtualboxHost.enable = true; + virtualisation.virtualbox.host.enable = true; } diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix index aa8292441..787bfc6e9 100644 --- a/tv/2configs/hw/w110er.nix +++ b/tv/2configs/hw/w110er.nix @@ -12,9 +12,11 @@ boot.initrd.availableKernelModules = [ "ahci" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.loader.gummiboot.enable = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; + networking.wireless.enable = true; nix = { @@ -31,10 +33,6 @@ HandleSuspendKey=ignore ''; - services.xserver = { - vaapiDrivers = [ pkgs.vaapiIntel ]; - }; - system.activationScripts.powertopTunables = '' echo 1 > /sys/module/snd_hda_intel/parameters/power_save echo 1500 > /proc/sys/vm/dirty_writeback_centisecs |