diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 18:37:12 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 18:37:12 +0100 |
commit | ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1 (patch) | |
tree | 34b2960c4adf0b0dfae222014322ed09a30968f6 | |
parent | 3759e9330cbb526525567c886fd18a6aa40973ca (diff) | |
download | nixos-ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1.tar nixos-ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1.tar.gz nixos-ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1.tar.bz2 nixos-ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1.tar.xz nixos-ea835cf5e4d72d14a2c50edb71bcfca80e70e5a1.zip |
Shuffle variables
-rw-r--r-- | hel.nix | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -418,6 +418,10 @@ | |||
418 | 418 | ||
419 | environment.variables = { | 419 | environment.variables = { |
420 | SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; | 420 | SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; |
421 | SANE_CONFIG_DIR = "/etc/sane.d"; | ||
422 | TPRINT_BASEURL = "http://bragi.asgard.yggdrasil/thermoprint/api"; | ||
423 | MPD_HOST = "bragi.asgard.yggdrasil"; | ||
424 | MPD_PORT = "6600"; | ||
421 | }; | 425 | }; |
422 | 426 | ||
423 | environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf; | 427 | environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./hel/wacom.conf; |
@@ -425,13 +429,6 @@ | |||
425 | environment.etc."sane.d/dll.conf".text = "xerox_mfp"; | 429 | environment.etc."sane.d/dll.conf".text = "xerox_mfp"; |
426 | environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; | 430 | environment.etc."sane.d/xerox_mfp.conf".text = "tcp printer.asgard.yggdrasil"; |
427 | 431 | ||
428 | environment.sessionVariables = { | ||
429 | "SANE_CONFIG_DIR" = "/etc/sane.d"; | ||
430 | "TPRINT_BASEURL" = "http://bragi.asgard.yggdrasil/thermoprint/api"; | ||
431 | "MPD_HOST" = "bragi.asgard.yggdrasil"; | ||
432 | "MPD_PORT" = "6600"; | ||
433 | }; | ||
434 | |||
435 | systemd.services."kill-user@" = { | 432 | systemd.services."kill-user@" = { |
436 | serviceConfig = { | 433 | serviceConfig = { |
437 | Type = "oneshot"; | 434 | Type = "oneshot"; |