diff options
author | makefu <github@syntax-fehler.de> | 2017-12-18 21:24:28 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-12-18 21:24:28 +0100 |
commit | af308642031f971bc30c5694385eb7af1e9ea618 (patch) | |
tree | 7e9e55f7d5de874a61a5d9294065a4f9749ee83e /lass/3modules | |
parent | 4feafd70204f9c13500bd427d250fac60ca595ef (diff) | |
parent | 676c76dd8e0b5cbe3d1bdba49b21b1b5cfc578a1 (diff) |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'lass/3modules')
-rw-r--r-- | lass/3modules/default.nix | 1 | ||||
-rw-r--r-- | lass/3modules/xresources.nix | 58 | ||||
-rw-r--r-- | lass/3modules/xserver/default.nix | 6 |
3 files changed, 1 insertions, 64 deletions
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 462c6dee..d16f89f4 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 = { |