From 5b86fe1cd63a5c4cf5a83b7afabe5be34016e8a7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 15 Dec 2017 19:55:02 +0100
Subject: services.xresources -> krebs.xresources

---
 krebs/3modules/default.nix        |  1 +
 krebs/3modules/xresources.nix     | 58 +++++++++++++++++++++++++++++++++++++++
 lass/2configs/baseX.nix           |  4 +--
 lass/2configs/urxvt.nix           |  2 +-
 lass/3modules/default.nix         |  1 -
 lass/3modules/xresources.nix      | 58 ---------------------------------------
 lass/3modules/xserver/default.nix |  2 +-
 7 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 krebs/3modules/xresources.nix
 delete mode 100644 lass/3modules/xresources.nix

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 7a3c8ba4..9c343309 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -44,6 +44,7 @@ let
       ./tinc_graphs.nix
       ./urlwatch.nix
       ./repo-sync.nix
+      ./xresources.nix
       ./zones.nix
     ];
     options.krebs = api;
diff --git a/krebs/3modules/xresources.nix b/krebs/3modules/xresources.nix
new file mode 100644
index 00000000..017dbff2
--- /dev/null
+++ b/krebs/3modules/xresources.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+#TODO:
+#prefix with Attribute Name
+#ex: urxvt
+
+with builtins;
+with lib;
+
+
+let
+
+  inherit (pkgs) writeScript writeText;
+
+in
+
+{
+
+  options = {
+    services.xresources.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable the automatic loading of Xresources definitions at display-manager start;
+      '';
+    };
+
+    services.xresources.resources = mkOption {
+      default = {};
+      type = types.attrsOf types.str;
+      example = {
+        urxvt = ''
+          URxvt*scrollBar: false
+          URxvt*urgentOnBell: true
+        '';
+      };
+      description = ''
+        Xresources definitions.
+      '';
+    };
+  };
+
+  config =
+    let
+      cfg = config.services.xresources;
+      xres = writeText "xresources" (concatStringsSep "\n" (attrValues cfg.resources));
+
+    in mkIf cfg.enable {
+        services.xserver.displayManager.sessionCommands = ''
+          ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
+        '';
+        environment.systemPackages = [
+          (pkgs.writeDashBin "updateXresources" ''
+            ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
+          '')
+        ];
+      };
+}
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9712baff..0ff47407 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -41,7 +41,7 @@ in {
           default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1";
         };
       };
-      config.services.xresources.resources.X = ''
+      config.krebs.xresources.resources.X = ''
         *.font:       ${config.lass.fonts.regular}
         *.boldFont:   ${config.lass.fonts.bold}
         *.italicFont: ${config.lass.fonts.italic}
@@ -113,6 +113,6 @@ in {
   };
 
   services.urxvtd.enable = true;
-  services.xresources.enable = true;
+  krebs.xresources.enable = true;
   lass.screenlock.enable = true;
 }
diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix
index ee50b338..fc453714 100644
--- a/lass/2configs/urxvt.nix
+++ b/lass/2configs/urxvt.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
 {
   services.urxvtd.enable = true;
 
-  services.xresources.resources.urxvt = ''
+  krebs.xresources.resources.urxvt = ''
     URxvt*SaveLines: 4096
     URxvt*scrollBar:            false
     URxvt*urgentOnBell:         true
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 81b52c30..fd77b226 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -12,6 +12,5 @@ _:
     ./umts.nix
     ./usershadow.nix
     ./xserver
-    ./xresources.nix
   ];
 }
diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix
deleted file mode 100644
index 017dbff2..00000000
--- a/lass/3modules/xresources.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-#TODO:
-#prefix with Attribute Name
-#ex: urxvt
-
-with builtins;
-with lib;
-
-
-let
-
-  inherit (pkgs) writeScript writeText;
-
-in
-
-{
-
-  options = {
-    services.xresources.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable the automatic loading of Xresources definitions at display-manager start;
-      '';
-    };
-
-    services.xresources.resources = mkOption {
-      default = {};
-      type = types.attrsOf types.str;
-      example = {
-        urxvt = ''
-          URxvt*scrollBar: false
-          URxvt*urgentOnBell: true
-        '';
-      };
-      description = ''
-        Xresources definitions.
-      '';
-    };
-  };
-
-  config =
-    let
-      cfg = config.services.xresources;
-      xres = writeText "xresources" (concatStringsSep "\n" (attrValues cfg.resources));
-
-    in mkIf cfg.enable {
-        services.xserver.displayManager.sessionCommands = ''
-          ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
-        '';
-        environment.systemPackages = [
-          (pkgs.writeDashBin "updateXresources" ''
-            ${pkgs.xorg.xrdb}/bin/xrdb -merge ${xres}
-          '')
-        ];
-      };
-}
diff --git a/lass/3modules/xserver/default.nix b/lass/3modules/xserver/default.nix
index 92061c75..d16f89f4 100644
--- a/lass/3modules/xserver/default.nix
+++ b/lass/3modules/xserver/default.nix
@@ -76,7 +76,7 @@ let
         ];
       };
     };
-    services.xresources.resources.dpi = ''
+    krebs.xresources.resources.dpi = ''
       ${optionalString (xcfg.dpi != null) "Xft.dpi: ${toString xcfg.dpi}"}
     '';
     systemd.services.urxvtd = {
-- 
cgit v1.2.3