summaryrefslogtreecommitdiffstats
path: root/lass/3modules
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-12-27 17:09:35 +0100
committertv <tv@krebsco.de>2017-12-27 17:09:35 +0100
commit6ed214fc77b537dc74b92bbc37e2d2d68dfd9131 (patch)
tree97e0ca20812fa54edfa0bd60460800ff2f18626e /lass/3modules
parent04b711f516c978e84b334a82008d40dfaad1de1b (diff)
parent3a41a73f1fcc32736ace08783d9bfee8a77f3f80 (diff)
Merge remote-tracking branch 'prism/staging/test'
Diffstat (limited to 'lass/3modules')
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/xresources.nix58
-rw-r--r--lass/3modules/xserver/default.nix6
3 files changed, 1 insertions, 64 deletions
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 462c6deef..d16f89f45 100644
--- a/lass/3modules/xserver/default.nix
+++ b/lass/3modules/xserver/default.nix
@@ -17,10 +17,6 @@ let
imp = {
services.xserver = {
- # Don't install feh into systemPackages
- # refs <nixpkgs/nixos/modules/services/x11/desktop-managers>
- desktopManager.session = mkForce [];
-
enable = true;
display = 11;
tty = 11;
@@ -80,7 +76,7 @@ let
];
};
};
- services.xresources.resources.dpi = ''
+ krebs.xresources.resources.dpi = ''
${optionalString (xcfg.dpi != null) "Xft.dpi: ${toString xcfg.dpi}"}
'';
systemd.services.urxvtd = {