diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-28 17:09:12 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-28 17:09:12 +0000 |
commit | c6617d28ef3762bbd5cb11dd3c56afb778ff42cc (patch) | |
tree | 18fbdfb4783a2e0c5625cdb51606058ca50e2ca8 /nixos/modules/programs | |
parent | 29cdd8ae609d107889469610176aa53676382eb1 (diff) | |
parent | 05d95cfe79a69cf690cec5d356b37e29d7d13d18 (diff) |
Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r-- | nixos/modules/programs/chromium.nix | 2 | ||||
-rw-r--r-- | nixos/modules/programs/ssmtp.nix | 2 | ||||
-rw-r--r-- | nixos/modules/programs/vim.nix | 14 | ||||
-rw-r--r-- | nixos/modules/programs/wshowkeys.nix | 22 |
4 files changed, 36 insertions, 4 deletions
diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 3f0429136190..b727f850a949 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -29,7 +29,7 @@ in page. To install a chromium extension not included in the chrome web store, append to the extension id a semicolon ";" followed by a URL pointing to an Update Manifest XML file. See - <link xlink:href="https://www.chromium.org/administrators/policy-list-3#ExtensionInstallForcelist">ExtensionInstallForcelist</link> + <link xlink:href="https://cloud.google.com/docs/chrome-enterprise/policies/?policy=ExtensionInstallForcelist">ExtensionInstallForcelist</link> for additional details. ''; default = []; diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 15d2750c193f..98ff21bd37f2 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -1,6 +1,6 @@ # Configuration for `ssmtp', a trivial mail transfer agent that can # replace sendmail/postfix on simple systems. It delivers email -# directly to an SMTP server defined in its configuration file, wihout +# directly to an SMTP server defined in its configuration file, without # queueing mail locally. { config, lib, pkgs, ... }: diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix index fe0e7f2c6d6b..9f46dff2a293 100644 --- a/nixos/modules/programs/vim.nix +++ b/nixos/modules/programs/vim.nix @@ -14,10 +14,20 @@ in { using the EDITOR environment variable. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.vim; + defaultText = "pkgs.vim"; + example = "pkgs.vimHugeX"; + description = '' + vim package to use. + ''; + }; }; config = mkIf cfg.defaultEditor { - environment.systemPackages = [ pkgs.vim ]; - environment.variables = { EDITOR = mkOverride 900 "vim"; }; + environment.systemPackages = [ cfg.package ]; + environment.variables = { EDITOR = mkOverride 900 "vim"; }; }; } diff --git a/nixos/modules/programs/wshowkeys.nix b/nixos/modules/programs/wshowkeys.nix new file mode 100644 index 000000000000..09b008af1d5d --- /dev/null +++ b/nixos/modules/programs/wshowkeys.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.wshowkeys; +in { + meta.maintainers = with maintainers; [ primeos ]; + + options = { + programs.wshowkeys = { + enable = mkEnableOption '' + wshowkeys (displays keypresses on screen on supported Wayland + compositors). It requires root permissions to read input events, but + these permissions are dropped after startup''; + }; + }; + + config = mkIf cfg.enable { + security.wrappers.wshowkeys.source = "${pkgs.wshowkeys}/bin/wshowkeys"; + }; +} |