ménage appli pour préparation migration NixOS 20.03

client mumble à nouveau fréquentable (build sans broncher)
radio: dump1090 écoute ADB-S des avions et placement sur une carte
2020-06-30 18:58:17 +02:00 · 2020-04-16 01:19:06 +02:00 · 2020-04-16 01:19:06 +02:00 · 2020-04-16 01:19:06 +02:00 · 2020-04-16 01:19:06 +02:00 · 2020-04-16 01:19:06 +02:00
9 changed files with 18 additions and 14 deletions
--- a/4
+++ b/4
@@ -35,7 +35,7 @@ optimise:
 	$(TIME) nix optimise-store

 rebuild-build:
-	nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
+	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
 	$(TIME) time nixos-rebuild build --fallback  --show-trace

 rebuild-switch:
@@ -58,7 +58,7 @@ store-repair:
 	$(TIME) nix-store --verify --check-contents --repair

 upgrade:
-	nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
+	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
 	$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace

 ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
--- a/applications/graphical/bureautique.nix
+++ b/applications/graphical/bureautique.nix
@@ -29,7 +29,7 @@ mkIf (flags.officeSuite && flags.graphical) {

    ## Visionneuse
    #kde5.okular   # pdf
-    mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque
+    #mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque # Supprimé dans NixOS 20.03
    pdfpc         # pdf
    qpdfview      # pdf
    gqview        # visionneuse image & gestion basique de collection
--- a/applications/graphical/client-internet.nix
+++ b/applications/graphical/client-internet.nix
@@ -21,7 +21,7 @@ environment.systemPackages = with pkgs; [
    clawsMail
    hexchat
    quasselClient
-    #mumble
+    mumble
    pidgin
    thunderbird

--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -12,7 +12,9 @@ mkIf (flags.radio && flags.graphical) {
  # Paquets
  environment.systemPackages = with pkgs; [
    ## GUI
+    chirp                   # Configuration de radios portatives
    gqrx                    # GUI
+    cubicsdr                # Another GUI
    gnuradio-with-packages  # Software Defined Radio (SDR) software

    ## A Trier
--- a/applications/overrides.nix
+++ b/applications/overrides.nix
@@ -13,7 +13,7 @@ mkIf true {
    clawsMail = pkgs.clawsMail.override {
      enablePgp = true;
      enablePluginArchive = true;
-      enablePluginFancy = false; # nécessite wekitgtk qui est troué
+      #enablePluginFancy = false; # nécessite wekitgtk qui est troué # Option supprimée dans NixOS 20.03
      enablePluginPdf = true;
      enablePluginRavatar = true;
      enablePluginSmime = true;
--- a/applications/terminal/radio.nix
+++ b/applications/terminal/radio.nix
@@ -22,6 +22,7 @@ mkIf flags.radio {
    gnss-sdr    # Global Navigation Satellite Systems software-defined receiver
    liquid-dsp  # Digital signal processing library for software-defined radios
    rtl-sdr     # Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+    dump1090    # Listen to planes ADS-B and view them on a map
  ];

  # Configuration matérielle
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -12,7 +12,7 @@ in
  nix.buildCores = 0;

  # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "19.03";
+  system.stateVersion = "19.09";

  # copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix)
  system.copySystemConfiguration = true;
--- a/options.nix
+++ b/options.nix
@@ -63,7 +63,7 @@ let

      ipAddress = mkOption {
        description = "Adresse IP.";
-        type = lib.types.string;
+        type = lib.types.str;
      };
      nix-serve-server = mkEnableOption "nix-serve server.";
      nix-serve-client = {
@@ -80,18 +80,18 @@ let
        dnsFQDN = mkOption {
          example = "device.example.net.";
          description = "DNS name of host pointing to tunnel IP.";
-          type = lib.types.string;
+          type = lib.types.str;
        };
        connectToAddress = mkOption {
          default = "";
          example = "192.168.1.1";
          description = "External address to connect from another node.";
-          type = lib.types.string;
+          type = lib.types.str;
        };
        vpnAddress = mkOption {
          example = "192.168.69.69/24";
          description = "VPN local node IP address.";
-          type = lib.types.string;
+          type = lib.types.str;
        };
        vpnCidrLength = mkOption {
          default = 24;
@@ -106,7 +106,7 @@ let
              ConnecTo = bar
          '';
          description = "Configuration supplémentaire pour tinc.";
-          type = lib.types.string;
+          type = lib.types.str;
        };
      };

@@ -129,7 +129,7 @@ let
        enable = mkEnableOption "Activation du démarrage de Windows par Grub";
        drive = mkOption {
          description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
-          type = lib.types.string;
+          type = lib.types.str;
          default = "hd0,1";
        };
      };
@@ -137,7 +137,7 @@ let
        enable = mkEnableOption "Montage de la partition data Windows";
        device = mkOption {
          description = "Lecteur sur lequel est présent le disque de data Windows";
-          type = lib.types.string;
+          type = lib.types.str;
          default = "/dev/sda2";
        };
      };
--- a/public/config-awesome-4-rc.lua
+++ b/public/config-awesome-4-rc.lua
@@ -413,7 +413,8 @@ globalkeys = awful.util.table.join(
    awful.key({ modkey, "Shift"   }, "F1",  function () awful.util.spawn("claws-mail") end,           {description = "Lance claws", group = "Lanceurs personnels"}),
    awful.key({ modkey, "Shift"   }, "F3",  function () awful.util.spawn("pcmanfm") end,              {description = "Lance pcmanfm", group = "Lanceurs personnels"}),
    awful.key({ modkey, "Shift"   }, "F6",  function () awful.util.spawn("clementine") end,           {description = "Lance clementine", group = "Lanceurs personnels"}),
-    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end,        {description = "Lance le script xrandr-auto-2", group = "Lanceurs personnels"})
+    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end,        {description = "Lance le script xrandr-auto-2", group = "Lanceurs personnels"}),
+    awful.key({ modkey  }, "l", function () awful.util.spawn("slock systemctl suspend -i") end, {description = "Verouille la session avec slock", group = "Lanceurs personnels"})
    --  awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
    --  awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
 )
Author	SHA1	Message	Date
Jean-Pierre PRUNARET	65e5776f86	ménage appli pour préparation migration NixOS 20.03	2020-06-30 18:58:17 +02:00
Yves Dubromelle	235e636451	client mumble à nouveau fréquentable (build sans broncher)	2020-04-16 01:19:06 +02:00
Yves Dubromelle	e849c55297	radio: dump1090 écoute ADB-S des avions et placement sur une carte	2020-04-16 01:19:06 +02:00
Yves Dubromelle	1e51d11778	radio: CubicSDR comme alternative à gqrx	2020-04-16 01:19:06 +02:00
Yves Dubromelle	f39f486f51	awesome: meta+l pour slock et suspend combinés	2020-04-16 01:19:06 +02:00
Yves Dubromelle	2a5809c3de	radio: chirp pour programmer les radios portatives	2020-04-16 01:19:06 +02:00
Yves Dubromelle	7681f7774e	nixos: 19.03 -> 19.09	2019-11-19 22:38:25 +01:00