From 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 16 Feb 2016 17:14:27 +0100
Subject: l 2 xserver: add systemPackages PATH

---
 lass/2configs/xserver/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lass/2configs/xserver/default.nix')

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index c407bb59e..a7e77553f 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -93,11 +93,9 @@ let
   xmonad-start = pkgs.writeScriptBin "xmonad" ''
     #! ${pkgs.bash}/bin/bash
     set -efu
-    export PATH; PATH=${makeSearchPath "bin" [
-      pkgs.alsaUtils
-      pkgs.pulseaudioLight
+    export PATH; PATH=${makeSearchPath "bin" ([
       pkgs.rxvt_unicode
-    ]}:/var/setuid-wrappers
+    ] ++ config.environment.systemPackages)}:/var/setuid-wrappers
     settle() {(
       # Use PATH for a clean journal
       command=''${1##*/}
-- 
cgit v1.2.3


From a973f194b8dc824a2144da7da736d5085bb6d462 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:52:54 +0100
Subject: l 2 xserver: disable autorestarting of xmonad

---
 lass/2configs/xserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/xserver/default.nix')

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 203ed0b09..48bd31bf4 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -49,7 +49,7 @@ let
     services.xserver.enable = true;
 
     systemd.services.xmonad = {
-      wantedBy = [ "multi-user.target" ];
+      #wantedBy = [ "multi-user.target" ];
       requires = [ "xserver.service" ];
       environment = xmonad-environment;
       serviceConfig = {
-- 
cgit v1.2.3


From a9a736c5f801dc2a9e6b764a5d20a2e5349ccf9d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 7 Mar 2016 13:17:19 +0100
Subject: l 2 xserver: disable xmonad restart on change

---
 lass/2configs/xserver/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lass/2configs/xserver/default.nix')

diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 48bd31bf4..30afd787e 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -49,9 +49,10 @@ let
     services.xserver.enable = true;
 
     systemd.services.xmonad = {
-      #wantedBy = [ "multi-user.target" ];
+      wantedBy = [ "multi-user.target" ];
       requires = [ "xserver.service" ];
       environment = xmonad-environment;
+      restartIfChanged = false;
       serviceConfig = {
         ExecStart = "${xmonad-start}/bin/xmonad";
         ExecStop = "${xmonad-stop}/bin/xmonad-stop";
-- 
cgit v1.2.3