From 75682ee66475d2e7de5624baeb4db6a2eb731d27 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 19 Nov 2017 11:42:03 +0100
Subject: [PATCH] radio : extraction d'une option pour activer le profil
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ découpage des modules terminal/graphical
---
 applications/graphical/default.nix    |  1 +
 applications/graphical/radio.nix      | 26 +++++++++++++++++++++
 applications/terminal/default.nix     |  1 +
 applications/{ => terminal}/radio.nix | 33 ++-------------------------
 options.nix                           |  1 +
 5 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 applications/graphical/radio.nix
 rename applications/{ => terminal}/radio.nix (54%)

diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix
index 3fa8a5a..cdcdfc7 100644
--- a/applications/graphical/default.nix
+++ b/applications/graphical/default.nix
@@ -26,6 +26,7 @@ in
     ./edition-photo.nix         # modifier les photos & assimilé
     ./edition-video.nix         # modifier les vidéos
     ./jeux.nix                  # jouer, tout simplement ;)
+    ./radio.nix                 # outils pour faire de la radio SDR
 
     ## if isDesktop
     ./adminsys.nix              # pour gérer le système dans son ensemble et les services
diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
new file mode 100644
index 0000000..3afa2b1
--- /dev/null
+++ b/applications/graphical/radio.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf (flags.radio && flags.graphical) {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    ## GUI
+    gqrx          # GUI
+    #gnuradio     # Software Defined Radio (SDR) software
+    gnuradio-with-packages
+
+    ## A Trier
+    #
+    #gnuradio-osmosdr  # Gnuradio block for OsmoSDR and rtl-sdr
+
+    inspectrum    # Tool for analysing captured signals from sdr receivers
+    kalibrate-rtl # Calculate local oscillator frequency offset in RTL-SDR devices
+  ];
+}
diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix
index 3fa8a5a..cdcdfc7 100644
--- a/applications/terminal/default.nix
+++ b/applications/terminal/default.nix
@@ -26,6 +26,7 @@ in
     ./edition-photo.nix         # modifier les photos & assimilé
     ./edition-video.nix         # modifier les vidéos
     ./jeux.nix                  # jouer, tout simplement ;)
+    ./radio.nix                 # outils pour faire de la radio SDR
 
     ## if isDesktop
     ./adminsys.nix              # pour gérer le système dans son ensemble et les services
diff --git a/applications/radio.nix b/applications/terminal/radio.nix
similarity index 54%
rename from applications/radio.nix
rename to applications/terminal/radio.nix
index a5e07e3..08769a3 100644
--- a/applications/radio.nix
+++ b/applications/terminal/radio.nix
@@ -7,7 +7,7 @@ let
   flags = currentMachine.configurationFlags;
 in
 
-mkIf true {
+mkIf flags.radio {
 
 # pour que ça marche
 # sudo rmmod dvb_usb_rtl28xxu
@@ -19,41 +19,12 @@ mkIf true {
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    ## TERMINAL
-    rtl-sdr       # Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
-
-    ## GUI
-    #gnuradio
-    gnuradio-with-packages
-
-    ## A Trier
     gnss-sdr    # Global Navigation Satellite Systems software-defined receiver
-    #gnuradio    # Software Defined Radio (SDR) software
-    #gnuradio-osmosdr  # Gnuradio block for OsmoSDR and rtl-sdr
-    gqrx          # GUI
-    inspectrum    # Tool for analysing captured signals from sdr receivers
-    kalibrate-rtl # Calculate local oscillator frequency offset in RTL-SDR devices
-
-
-    # Inutile
-    #hackrf        # An open source SDR platform
-
+    rtl-sdr       # Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
   ];
 
   # Configuration matérielle
   boot.blacklistedKernelModules = [
     "dvb_usb_rtl28xxu"
   ];
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    gnuradio-with-packages = pkgs.gnuradio-with-packages.override {
-      extraPackages = with pkgs; [
-        gnuradio-ais
-        gnuradio-gsm
-        gnuradio-nacl
-        gnuradio-osmosdr
-        gnuradio-rds
-      ];
-    };
-  };
 }
diff --git a/options.nix b/options.nix
index 216c10b..d5cc47c 100644
--- a/options.nix
+++ b/options.nix
@@ -47,6 +47,7 @@ let
         print                 = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
         pulseaudio            = mkEnableOption "Profil pour activer pulseaudio.";
         rabbitmq              = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
+        radio                 = mkEnableOption "Profil pour activer les outils pour faire de radio numérique - SDR.";
         radicale              = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
         rmilter               = mkEnableOption "Profil pour activer le filtrage de mails par postfix.";
         scanner               = mkEnableOption "Profil pour que les scanners soient utilisable.";