feat: add libsigrok as pulseview dependency
This commit is contained in:
parent
8d00c45054
commit
d49e2dedf2
7 changed files with 34 additions and 7 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -176,11 +176,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726062873,
|
"lastModified": 1726463316,
|
||||||
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
|
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
|
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
soundconverter
|
soundconverter
|
||||||
foliate
|
foliate
|
||||||
kid3
|
kid3
|
||||||
pulseview
|
|
||||||
prismlauncher
|
prismlauncher
|
||||||
|
|
||||||
# proprietary
|
# proprietary
|
||||||
|
|
|
@ -41,6 +41,8 @@
|
||||||
HibernateDelaySec=1200
|
HibernateDelaySec=1200
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
programs.pulseview.enable = true;
|
||||||
|
|
||||||
specialisation = {
|
specialisation = {
|
||||||
gpu.configuration = {
|
gpu.configuration = {
|
||||||
imports = [ inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia ];
|
imports = [ inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia ];
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
varia
|
varia
|
||||||
signal-desktop
|
signal-desktop
|
||||||
calibre
|
calibre
|
||||||
pulseview
|
|
||||||
foot
|
foot
|
||||||
|
|
||||||
# Proprietary
|
# Proprietary
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib.types) bool array string;
|
inherit (lib.types) bool array string;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
device = {
|
device = {
|
||||||
|
|
28
options/pulseview.nix
Normal file
28
options/pulseview.nix
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.programs.pulseview;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.programs.pulseview = {
|
||||||
|
enable = lib.mkEnableOption "pulseview, a sigrok GUI.";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.pulseview
|
||||||
|
];
|
||||||
|
|
||||||
|
services.udev = {
|
||||||
|
packages = [
|
||||||
|
# Pulseview needs some udev rules provided by libsigrok to access devices
|
||||||
|
pkgs.libsigrok
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -26,6 +26,7 @@
|
||||||
modules = [
|
modules = [
|
||||||
"${self}/hosts/${hostname}/configuration.nix"
|
"${self}/hosts/${hostname}/configuration.nix"
|
||||||
"${self}/options"
|
"${self}/options"
|
||||||
|
"${self}/options/pulseview.nix"
|
||||||
{ networking.hostName = hostname; }
|
{ networking.hostName = hostname; }
|
||||||
] ++ extraModules;
|
] ++ extraModules;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue