From 41e62975de26755c1a7c44e4356a1d987b46f681 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorickvanpelt@gmail.com>
Date: Sat, 17 Sep 2016 16:02:14 +0200
Subject: [PATCH] move ascanius+woodhouse to i3, remove dependency on nixops

---
 ascanius/configuration.nix           |  3 ---
 ascanius/hardware-configuration.nix  |  2 ++
 conf                                 |  6 +++---
 roles/graphical.nix                  |  8 +++-----
 update_all.sh                        |  6 +++---
 woodhouse/configuration.nix          | 13 +++++++------
 woodhouse/hardware-configuration.nix |  1 +
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/ascanius/configuration.nix b/ascanius/configuration.nix
index ae1730f..1cc7682 100644
--- a/ascanius/configuration.nix
+++ b/ascanius/configuration.nix
@@ -37,7 +37,4 @@ in
 
   users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
 
-  services.xserver = {
-    desktopManager.enlightenment.enable = true;
-  };
 }
diff --git a/ascanius/hardware-configuration.nix b/ascanius/hardware-configuration.nix
index 3807e8f..bdc777b 100644
--- a/ascanius/hardware-configuration.nix
+++ b/ascanius/hardware-configuration.nix
@@ -64,4 +64,6 @@
     drivers = [ pkgs.gutenprint ];
   };
   nix.maxJobs = 8;
+
+  services.tcsd.enable = true; # it has a TPM. maybe use this?
 }
diff --git a/conf b/conf
index 502e55b..a73e58a 100755
--- a/conf
+++ b/conf
@@ -11,14 +11,14 @@ local)
 	eval ${@:2}
 	;;
 remote)
-	export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.03/nixexprs.tar.xz:ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix:muflax-blog=./vendor/muflax-blog
-	eval ${@:2}
+	export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.09/nixexprs.tar.xz:nixos-config=`pwd`/$2/configuration.nix:ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix:muflax-blog=./vendor/muflax-blog
+	eval ${@:3}
 	;;
 local-deploy)
 	sudo $0 local nixos-rebuild switch
 	;;
 remote-deploy)
-	$0 remote nixops deploy ${@:2}
+	$0 remote $2 nixos-rebuild --build-host localhost --target-host ${@:3}
 	;;
 update-encrypt)
 	gpg -a -r yorick --encrypt-files secrets.nix deploy_key keys/*.key
diff --git a/roles/graphical.nix b/roles/graphical.nix
index 2fa9364..5e5636b 100644
--- a/roles/graphical.nix
+++ b/roles/graphical.nix
@@ -5,15 +5,13 @@
     enable = true;
     synaptics = {
       twoFingerScroll = true;
-      # inverted scrolling
-      additionalOptions = ''
-        Option "HorizScrollDelta" "-107"
-        Option "VertScrollDelta" "-107"
-      '';
+      horizontalScroll = true;
+      scrollDelta = -107; # inverted scrolling
     };
     layout = "us";
     displayManager.slim.defaultUser = "yorick";
     # xkbOptions = "eurosign:e";
+    windowManager.i3-gaps.enable = true;
   };
   hardware.opengl = {
     enable = true;
diff --git a/update_all.sh b/update_all.sh
index 1e0dc6e..e39e7c0 100755
--- a/update_all.sh
+++ b/update_all.sh
@@ -22,11 +22,11 @@ echo "updating root conf"
 sh -c "$userspace_update_cmd"
 else
 	echo "updating" $1
-	./conf remote-deploy --include $1
 	HOST=$(nix-instantiate --eval -A hostnames.$1 secrets.nix | tr -d '"')
+	./conf remote-deploy $1 root@$HOST switch
 	echo "updating userspace"
-	# nix-copy-closure --to $HOST $(./conf remote nix-build --no-out-link "\<nixpkgs\>" -A hosts.woodhouse)
-	echo "nix-channel --update" | nixops ssh $1
+	#nix-copy-closure --to root@$HOST $(./conf remote nix-build --no-out-link "\<nixpkgs\>" -A hosts.$1)
+	echo "nix-channel --update" | ssh root@$HOST
 	cp deploy_key deploy_key2
 	chmod 0600 deploy_key2
 	ssh-agent bash <<J
diff --git a/woodhouse/configuration.nix b/woodhouse/configuration.nix
index e8dec8c..5cbe44e 100644
--- a/woodhouse/configuration.nix
+++ b/woodhouse/configuration.nix
@@ -15,8 +15,7 @@ in
       ../roles/graphical.nix
     ];
 
-  # Use the gummiboot efi boot loader.
-  boot.loader.gummiboot.enable = true;
+  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = secrets.hostnames.woodhouse;
@@ -31,6 +30,10 @@ in
 
   # List services that you want to enable:
 
+  hardware.opengl.driSupport32Bit = lib.mkOverride 30 false;
+  hardware.pulseaudio.support32Bit = lib.mkOverride 30 false;
+
+
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
@@ -52,14 +55,12 @@ in
   # services.xserver.desktopManager.kde4.enable = true;
 
   # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "16.03";
+  system.stateVersion = "16.09";
 
 
   services.redshift.enable = lib.mkOverride 30 false;
   services.xserver = {
-  	#windowManager.i3.enable = true;
-  	desktopManager.e19.enable = true;
-  	displayManager.slim.autoLogin = true;
+  	# displayManager.slim.autoLogin = true; # TODO: debug this
   };
 
   users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
diff --git a/woodhouse/hardware-configuration.nix b/woodhouse/hardware-configuration.nix
index f3dd966..e1c8a61 100644
--- a/woodhouse/hardware-configuration.nix
+++ b/woodhouse/hardware-configuration.nix
@@ -29,4 +29,5 @@
     ];
 
   nix.maxJobs = lib.mkDefault 4;
+  services.xserver.videoDrivers = ["intel"];
 }