From 613ee4c9ba347cd6b0c96b1193c8cc34451f2c63 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 29 Nov 2017 15:39:14 +0100
Subject: l: refactor xresources

---
 lass/3modules/xresources.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'lass/3modules/xresources.nix')

diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix
index 074963022..629b2303c 100644
--- a/lass/3modules/xresources.nix
+++ b/lass/3modules/xresources.nix
@@ -4,16 +4,13 @@
 #prefix with Attribute Name
 #ex: urxvt
 
-#
-#
 with builtins;
 with lib;
 
 
 let
 
-  inherit (import ../../tv/4lib { inherit pkgs lib; }) shell-escape;
-  inherit (pkgs) writeScript;
+  inherit (pkgs) writeScript writeText;
 
 in
 
@@ -46,12 +43,11 @@ in
   config =
     let
       cfg = config.services.xresources;
-      xres = concatStringsSep "\n" (attrValues cfg.resources);
+      xres = writeText "xresources" (concatStringsSep "\n" (attrValues cfg.resources));
 
     in mkIf cfg.enable {
         services.xserver.displayManager.sessionCommands = ''
-          echo ${shell-escape xres} | xrdb -merge
+          xrdb -merge ${xres}
         '';
       };
-
 }
-- 
cgit v1.2.3


From b4850cfd1dbfaa5ddea0b51799ff6eb9447cf3f7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Dec 2017 23:17:25 +0100
Subject: l xresources: fix xrdb path

---
 lass/3modules/xresources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/3modules/xresources.nix')

diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix
index 629b2303c..bf7e2a015 100644
--- a/lass/3modules/xresources.nix
+++ b/lass/3modules/xresources.nix
@@ -47,7 +47,7 @@ in
 
     in mkIf cfg.enable {
         services.xserver.displayManager.sessionCommands = ''
-          xrdb -merge ${xres}
+          ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
         '';
       };
 }
-- 
cgit v1.2.3


From 99468fec8fe675ffd224ded2ff91ed22c021bb52 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 4 Dec 2017 11:51:25 +0100
Subject: l xresources: add updateXresources cmd

---
 lass/3modules/xresources.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lass/3modules/xresources.nix')

diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix
index bf7e2a015..017dbff2b 100644
--- a/lass/3modules/xresources.nix
+++ b/lass/3modules/xresources.nix
@@ -49,5 +49,10 @@ in
         services.xserver.displayManager.sessionCommands = ''
           ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
         '';
+        environment.systemPackages = [
+          (pkgs.writeDashBin "updateXresources" ''
+            ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
+          '')
+        ];
       };
 }
-- 
cgit v1.2.3