Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
- Loading branch information
Showing
261 changed files
with
3,045 additions
and
2,049 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ config, lib, pkgs, ... }: | ||
|
||
with lib; | ||
|
||
let | ||
cfg = config.hardware.digitalbitbox; | ||
in | ||
|
||
{ | ||
options.hardware.digitalbitbox = { | ||
enable = mkOption { | ||
type = types.bool; | ||
default = false; | ||
description = '' | ||
Enables udev rules for Digital Bitbox devices. | ||
''; | ||
}; | ||
|
||
package = mkOption { | ||
type = types.package; | ||
default = pkgs.digitalbitbox; | ||
defaultText = "pkgs.digitalbitbox"; | ||
description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; | ||
}; | ||
}; | ||
|
||
config = mkIf cfg.enable { | ||
services.udev.packages = [ cfg.package ]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
{ config, lib, pkgs, ... }: | ||
|
||
with lib; | ||
|
||
let | ||
cfg = config.programs.digitalbitbox; | ||
in | ||
|
||
{ | ||
options.programs.digitalbitbox = { | ||
enable = mkOption { | ||
type = types.bool; | ||
default = false; | ||
description = '' | ||
Installs the Digital Bitbox application and enables the complementary hardware module. | ||
''; | ||
}; | ||
|
||
package = mkOption { | ||
type = types.package; | ||
default = pkgs.digitalbitbox; | ||
defaultText = "pkgs.digitalbitbox"; | ||
description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; | ||
}; | ||
}; | ||
|
||
config = mkIf cfg.enable { | ||
environment.systemPackages = [ cfg.package ]; | ||
hardware.digitalbitbox = { | ||
enable = true; | ||
package = cfg.package; | ||
}; | ||
}; | ||
|
||
meta = { | ||
doc = ./doc.xml; | ||
maintainers = with stdenv.lib.maintainers; [ vidbina ]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
<chapter xmlns="http://docbook.org/ns/docbook" | ||
xmlns:xlink="http://www.w3.org/1999/xlink" | ||
xmlns:xi="http://www.w3.org/2001/XInclude" | ||
version="5.0" | ||
xml:id="module-programs-digitalbitbox"> | ||
|
||
<title>Digital Bitbox</title> | ||
|
||
<para> | ||
Digital Bitbox is a hardware wallet and second-factor authenticator. | ||
</para> | ||
|
||
<para> | ||
The <literal>digitalbitbox</literal> programs module may be | ||
installed by setting <literal>programs.digitalbitbox</literal> | ||
to <literal>true</literal> in a manner similar to | ||
|
||
<programlisting> | ||
programs.digitalbitbox.enable = true; | ||
</programlisting> | ||
|
||
and bundles the <literal>digitalbitbox</literal> package (see <xref | ||
linkend="sec-digitalbitbox-package" />), which contains the | ||
<literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, | ||
along with the hardware module (see <xref | ||
linkend="sec-digitalbitbox-hardware-module" />) which sets up the | ||
necessary udev rules to access the device. | ||
</para> | ||
|
||
<para> | ||
Enabling the digitalbitbox module is pretty much the easiest way to | ||
get a Digital Bitbox device working on your system. | ||
</para> | ||
|
||
<para> | ||
For more information, see | ||
<link xlink:href="https://digitalbitbox.com/start_linux" />. | ||
</para> | ||
|
||
<section xml:id="sec-digitalbitbox-package"> | ||
<title>Package</title> | ||
|
||
<para> | ||
The binaries, <literal>dbb-app</literal> (a GUI tool) and | ||
<literal>dbb-cli</literal> (a CLI tool), are available through the | ||
<literal>digitalbitbox</literal> package which could be installed | ||
as follows: | ||
|
||
<programlisting> | ||
environment.systemPackages = [ | ||
pkgs.digitalbitbox | ||
]; | ||
</programlisting> | ||
</para> | ||
</section> | ||
|
||
|
||
<section xml:id="sec-digitalbitbox-hardware-module"> | ||
<title>Hardware</title> | ||
|
||
<para> | ||
The digitalbitbox hardware package enables the udev rules for | ||
Digital Bitbox devices and may be installed as follows: | ||
|
||
<programlisting> | ||
hardware.digitalbitbox.enable = true; | ||
</programlisting> | ||
</para> | ||
|
||
<para> | ||
In order to alter the udev rules, one may provide different values for | ||
the <literal>udevRule51</literal> and <literal>udevRule52</literal> | ||
attributes by means of overriding as follows: | ||
|
||
<programlisting> | ||
programs.digitalbitbox = { | ||
enable = true; | ||
package = pkgs.digitalbitbox.override { | ||
udevRule51 = "something else"; | ||
}; | ||
}; | ||
</programlisting> | ||
</para> | ||
</section> | ||
</chapter> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.