From ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 14 Mar 2017 18:37:12 +0100
Subject: Shuffle variables

---
 hel.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/hel.nix b/hel.nix
index 7a3a3af7..ae26c642 100644
--- a/hel.nix
+++ b/hel.nix
@@ -418,6 +418,10 @@
 
   environment.variables = {
     SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
+    SANE_CONFIG_DIR = "/etc/sane.d";
+    TPRINT_BASEURL = "http://bragi.asgard.yggdrasil/thermoprint/api";
+    MPD_HOST = "bragi.asgard.yggdrasil";
+    MPD_PORT = "6600";
   };
 
   environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf;
@@ -425,13 +429,6 @@
   environment.etc."sane.d/dll.conf".text = "xerox_mfp";
   environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil";
 
-  environment.sessionVariables = {
-    "SANE_CONFIG_DIR" = "/etc/sane.d";
-    "TPRINT_BASEURL" = "http://bragi.asgard.yggdrasil/thermoprint/api";
-    "MPD_HOST" = "bragi.asgard.yggdrasil";
-    "MPD_PORT" = "6600";
-  };
-
   systemd.services."kill-user@" = {
     serviceConfig = {
       Type = "oneshot";
-- 
cgit v1.2.3