diff options
| author | K900 <me@0upti.me> | 2022-02-22 17:56:15 +0300 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-02-25 13:40:38 -0800 |
| commit | cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d (patch) | |
| tree | 63bf69cdc1c296e10bf6543aa890855cccf1da57 /nixos | |
| parent | 0c713dbed40dd87090a4632cffc7b088653f35cb (diff) | |
| download | nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.tar nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.tar.gz nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.tar.bz2 nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.tar.lz nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.tar.xz nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.tar.zst nixlib-cb2cfba6f7690d4b8754b0dd5a504efe93d7f44d.zip | |
treewide: switch all desktop file generators to new API
Notably: - remove explicit arguments that match the defaults - convert everything to the right Nix types
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/phosh.nix | 19 |
2 files changed, 10 insertions, 11 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index b7746ddc2115..9304c307af2f 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -129,7 +129,7 @@ let genericName = "View NixOS documentation in a web browser"; icon = "nix-snowflake"; exec = "nixos-help"; - categories = "System"; + categories = ["System"]; }; in pkgs.symlinkJoin { diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix index cba3f73768ec..ad875616ac9e 100644 --- a/nixos/modules/programs/phosh.nix +++ b/nixos/modules/programs/phosh.nix @@ -8,18 +8,17 @@ let # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop oskItem = pkgs.makeDesktopItem { name = "sm.puri.OSK0"; - type = "Application"; desktopName = "On-screen keyboard"; exec = "${pkgs.squeekboard}/bin/squeekboard"; - categories = "GNOME;Core;"; - extraEntries = '' - OnlyShowIn=GNOME; - NoDisplay=true - X-GNOME-Autostart-Phase=Panel - X-GNOME-Provides=inputmethod - X-GNOME-Autostart-Notify=true - X-GNOME-AutoRestart=true - ''; + categories = [ "GNOME" "Core" ]; + onlyShowIn = [ "GNOME" ]; + noDisplay = true; + extraConfig = { + X-GNOME-Autostart-Phase = "Panel"; + X-GNOME-Provides = "inputmethod"; + X-GNOME-Autostart-Notify = "true"; + X-GNOME-AutoRestart = "true"; + }; }; phocConfigType = types.submodule { |