From 1cd76a43b7c91f96ded9905568b369148d3226c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 7 Mar 2020 01:57:00 +0000
Subject: [PATCH] kvm

---
 nixos/cli.nix     |  2 +-
 nixos/common.nix  |  2 +-
 nixos/libvirt.nix |  2 ++
 nixos/up.sh       | 17 -----------------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/nixos/cli.nix b/nixos/cli.nix
index b16c0896..3310d5a2 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -6,7 +6,7 @@
     ( pass.withExtensions (ext: [ ext.pass-otp ext.pass-import ext.pass-genphrase ext.pass-audit ext.pass-update ]))
     cabal-install stack hsetroot lm_sensors
     wirelesstools ranger apvlv
-    fontconfig rustup gcc gdb
+    fontconfig gcc gdb
     binutils veracrypt gitAndTools.diff-so-fancy
     restic ghc jq awscli
     hugo mercurial terraform
diff --git a/nixos/common.nix b/nixos/common.nix
index e6e2595f..cf294b90 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -34,7 +34,7 @@ in
 
       users.users.cyryl = {
         isNormalUser = true;
-        extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" ];
+        extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" "libvirtd" ];
         shell = pkgs.zsh;
       };
 
diff --git a/nixos/libvirt.nix b/nixos/libvirt.nix
index 768bd814..e26f7b90 100644
--- a/nixos/libvirt.nix
+++ b/nixos/libvirt.nix
@@ -1,4 +1,6 @@
 { config, pkgs, ... }:
 {
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelParams = [ "intel_iommu=on" ];
   virtualisation.libvirtd.enable = true;
 }
diff --git a/nixos/up.sh b/nixos/up.sh
index 75881c79..39f9feda 100755
--- a/nixos/up.sh
+++ b/nixos/up.sh
@@ -26,23 +26,6 @@ cp -v "$DIR/keeweb.desktop" ~/.local/share/applications/
 ln -vfs "$DIR/tools" ~/
 echo "all links done"
 
-set +e
-rustup update
-set -e
-rustup install stable
-set +e
-rustup install nightly
-set -e
-rustup default stable
-
-(test -x "${HOME}/.cargo/bin/cargo-install-update" || nix-shell -p gcc pkgconfig zlib openssl --run "cargo install cargo-update" )
-(test -x "${HOME}/.cargo/bin/genpass" || cargo install genpass)
-
-set +e
-nix-shell -p gcc pkgconfig zlib openssl --run "cargo install-update -a"
-set -e
-nix-shell -p gcc pkgconfig zlib openssl --run "rustup run nightly cargo install-update -a"
-
 sudo nix-channel --add https://nixos.org/channels/nixos-19.09-small nixos
 nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager
 nix-channel --update