From d49e2dedf231fb35ebe4cf661a3f1699c621d573 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Wed, 18 Sep 2024 22:47:57 +0200
Subject: [PATCH] feat: add libsigrok as pulseview dependency

---
 flake.lock                   |  6 +++---
 hosts/brontes/home.nix       |  1 -
 hosts/marr/configuration.nix |  2 ++
 hosts/marr/home.nix          |  1 -
 options/default.nix          |  2 --
 options/pulseview.nix        | 28 ++++++++++++++++++++++++++++
 parts/lib/functions.nix      |  1 +
 7 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 options/pulseview.nix

diff --git a/flake.lock b/flake.lock
index 28fb2d2..bbfac50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -176,11 +176,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1726062873,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
+        "lastModified": 1726463316,
+        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
+        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
         "type": "github"
       },
       "original": {
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index d1113a2..68623b1 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -56,7 +56,6 @@
         soundconverter
         foliate
         kid3
-        pulseview
         prismlauncher
 
         # proprietary
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 3a7d3cf..9144ebd 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -41,6 +41,8 @@
     HibernateDelaySec=1200
   '';
 
+  programs.pulseview.enable = true;
+
   specialisation = {
     gpu.configuration = {
       imports = [ inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia ];
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index b92f6e1..35e28e7 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -51,7 +51,6 @@
         varia
         signal-desktop
         calibre
-        pulseview
         foot
 
         # Proprietary
diff --git a/options/default.nix b/options/default.nix
index ac736a6..03ed40a 100644
--- a/options/default.nix
+++ b/options/default.nix
@@ -1,9 +1,7 @@
 { lib, ... }:
 let
   inherit (lib.types) bool array string;
-
 in
-
 {
   options = {
     device = {
diff --git a/options/pulseview.nix b/options/pulseview.nix
new file mode 100644
index 0000000..3b1dbbd
--- /dev/null
+++ b/options/pulseview.nix
@@ -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
+      ];
+    };
+  };
+}
diff --git a/parts/lib/functions.nix b/parts/lib/functions.nix
index b3e48b6..1b26555 100644
--- a/parts/lib/functions.nix
+++ b/parts/lib/functions.nix
@@ -26,6 +26,7 @@
       modules = [
         "${self}/hosts/${hostname}/configuration.nix"
         "${self}/options"
+        "${self}/options/pulseview.nix"
         { networking.hostName = hostname; }
       ] ++ extraModules;
       specialArgs = {