public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/programs/plotinus.nix
+1 -1
View File
@@ -18,7 +18,7 @@ in
enable = mkOption {
default = false;
description = ''
Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a
Whether to enable the Plotinus GTK 3 plugin. Plotinus provides a
popup (triggered by Ctrl-Shift-P) to search the menus of a
compatible application.
'';
nixos/modules/programs/plotinus.xml
+2 -2
View File
@@ -13,10 +13,10 @@
<link xlink:href="https://github.com/p-e-w/plotinus"/>
</para>
<para>
Plotinus is a searchable command palette in every modern GTK+ application.
Plotinus is a searchable command palette in every modern GTK application.
</para>
<para>
When in a GTK+3 application and Plotinus is enabled, you can press
When in a GTK 3 application and Plotinus is enabled, you can press
<literal>Ctrl+Shift+P</literal> to open the command palette. The command
palette provides a searchable list of of all menu items in the application.
</para>