summaryrefslogtreecommitdiffstats
path: root/modules/lass
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-19 01:00:11 +0200
committertv <tv@shackspace.de>2015-06-19 01:00:11 +0200
commite56f2179cb616d5c3773e6d125858fbb52755a3a (patch)
treec7844cc7f90282ad231a379dcc0b6b8b48562f43 /modules/lass
parent846a759d7397ab7d7a79e374508c9b68a4024e50 (diff)
parent98775ff29ec15452a56a6e3262d454c41d7ee87b (diff)
Merge remote-tracking branch 'mors/master' into morse-merge
Diffstat (limited to 'modules/lass')
-rw-r--r--modules/lass/xresources.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/lass/xresources.nix b/modules/lass/xresources.nix
index 1b85830cf..00a9e5c91 100644
--- a/modules/lass/xresources.nix
+++ b/modules/lass/xresources.nix
@@ -12,7 +12,7 @@ with lib;
let
- inherit (import ../../lib { inherit pkgs; }) shell-escape;
+ inherit (import ../../lib { inherit pkgs; inherit lib; }) shell-escape;
inherit (pkgs) writeScript;
in
@@ -43,7 +43,7 @@ in
};
};
- config =
+ config =
let
cfg = config.services.xresources;
xres = concatStringsSep "\n" (attrValues cfg.resources);
@@ -53,6 +53,5 @@ in
echo ${shell-escape xres} | xrdb -merge
'';
};
-
}