diff options
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 | 2 | 
3 files changed, 1 insertions, 60 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 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 = { | 
