summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-12-15 19:55:02 +0100
committerlassulus <lassulus@lassul.us>2017-12-15 19:55:02 +0100
commit5b86fe1cd63a5c4cf5a83b7afabe5be34016e8a7 (patch)
tree139b0ee5d7f801efe62a7682fba73208c4bef184 /lass
parentccf5161e7b6481c2eecccdafca07bd3640a2a3d9 (diff)
services.xresources -> krebs.xresources
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/baseX.nix4
-rw-r--r--lass/2configs/urxvt.nix2
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/xresources.nix58
-rw-r--r--lass/3modules/xserver/default.nix2
5 files changed, 4 insertions, 63 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9712bafff..0ff47407a 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 ee50b3381..fc4537140 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 81b52c306..fd77b2262 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 017dbff2b..000000000
--- 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 92061c753..d16f89f45 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 = {