From 9ed945bba84258cb51c9bf0a4dec7d4e96d9dc55 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 25 Nov 2020 00:18:49 +0100 Subject: [PATCH 01/41] channel nixos-unstable --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3d4bff3..6e2f698 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ optimise: $(TIME) nix optimise-store rebuild-build: - nix-channel --add https://nixos.org/channels/nixos-19.09 nixos + nix-channel --add https://nixos.org/channels/nixos-unstable 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.09 nixos + nix-channel --add https://nixos.org/channels/nixos-unstable nixos $(TIME) nixos-rebuild switch --upgrade --fallback --show-trace ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes From 4a5f0ba1a7748465b869bf98a1ff3a21a70b14cd Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 6 May 2021 23:50:07 +0200 Subject: [PATCH 02/41] utilisation de networking.fqdn (hostName + domain) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Les nouvelles règles dans NixOS obligent à avoir dans networking.hostName un label DNS strict, il faut donc préciser le domaine à part dans networking.domain. networking.fqdn est une facilité pour concaténer les deux, en lecture seule. --- README.md | 1 + applications/graphical/adminsys.nix | 2 +- applications/graphical/bureau.nix | 2 +- applications/graphical/bureautique.nix | 2 +- applications/graphical/cao.nix | 2 +- applications/graphical/cartographie.nix | 2 +- applications/graphical/client-internet.nix | 2 +- applications/graphical/default-applications.nix | 2 +- applications/graphical/default.nix | 2 +- applications/graphical/developpement-elm.nix | 2 +- applications/graphical/developpement-haskell.nix | 2 +- applications/graphical/developpement-java.nix | 2 +- applications/graphical/developpement-jetbrains.nix | 2 +- applications/graphical/developpement-rust.nix | 2 +- applications/graphical/developpement.nix | 2 +- applications/graphical/edition-musique.nix | 2 +- applications/graphical/edition-photo.nix | 2 +- applications/graphical/edition-video.nix | 2 +- applications/graphical/jeux.nix | 2 +- applications/graphical/multimedia.nix | 2 +- applications/graphical/network.nix | 2 +- applications/graphical/radio.nix | 2 +- applications/graphical/securite.nix | 2 +- applications/overrides.nix | 2 +- applications/terminal/adminsys.nix | 2 +- applications/terminal/bureau.nix | 2 +- applications/terminal/bureautique.nix | 2 +- applications/terminal/cao.nix | 2 +- applications/terminal/cartographie.nix | 2 +- applications/terminal/client-internet.nix | 2 +- applications/terminal/default-applications.nix | 2 +- applications/terminal/default.nix | 2 +- applications/terminal/developpement-elm.nix | 2 +- applications/terminal/developpement-haskell.nix | 2 +- applications/terminal/developpement-java.nix | 2 +- applications/terminal/developpement-jetbrains.nix | 2 +- applications/terminal/developpement-rust.nix | 2 +- applications/terminal/developpement.nix | 2 +- applications/terminal/edition-musique.nix | 2 +- applications/terminal/edition-photo.nix | 2 +- applications/terminal/edition-video.nix | 2 +- applications/terminal/jeux.nix | 2 +- applications/terminal/multimedia.nix | 2 +- applications/terminal/network.nix | 2 +- applications/terminal/radio.nix | 2 +- applications/terminal/securite.nix | 2 +- config-generator.nix | 7 ++++--- configuration/auto-upgrade.nix | 2 +- configuration/awesome.nix | 2 +- configuration/default.nix | 2 +- configuration/environment.nix | 2 +- configuration/laptop.nix | 2 +- configuration/localisation.nix | 2 +- configuration/network-ipv6.nix | 2 +- configuration/network.nix | 4 ++-- configuration/swap.nix | 2 +- configuration/u2f.nix | 2 +- configuration/udev.nix | 2 +- iso-image/configuration.nix | 3 ++- module-template.nix | 2 +- options.nix | 2 +- services/dbus.nix | 2 +- services/default.nix | 2 +- services/docker.nix | 2 +- services/elasticsearch.nix | 2 +- services/gpm.nix | 2 +- services/haveged.nix | 2 +- services/hoogle.nix | 2 +- services/hydra-build.nix | 2 +- services/hydra-core.nix | 6 +++--- services/kibana.nix | 2 +- services/locate.nix | 2 +- services/monitoring-munin.nix | 10 +++++----- services/nixos-manual.nix | 2 +- services/print.nix | 2 +- services/pulseaudio.nix | 2 +- services/scanner.nix | 2 +- services/ssh.nix | 2 +- services/virtualbox.nix | 2 +- services/x11.nix | 2 +- services/xmonad/xmonad.nix | 2 +- services/yubikey.nix | 2 +- 82 files changed, 93 insertions(+), 90 deletions(-) diff --git a/README.md b/README.md index d3310e7..dcaa86c 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Ce dépôt stocke une configuration générique des machines. * mettre à jour les dépôts avec les dernières versions, `make submodules-update` * vérifier que `configuration.nix` contient `services.xserver.enable = true;` pour les machines avec interface graphique * vérifier que `configuration.nix` contient le nom de la machine `networking.hostName = "";` +* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "";` * tester la configuration : `nixos-rebuild build` * corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` ) * lorsque tout semble bon, vérifier : diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix index bfc6681..e213860 100644 --- a/applications/graphical/adminsys.nix +++ b/applications/graphical/adminsys.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index 1438c0e..228d80c 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix index fbc2a8c..8fab7d9 100644 --- a/applications/graphical/bureautique.nix +++ b/applications/graphical/bureautique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/cao.nix b/applications/graphical/cao.nix index a3d2a6d..43db259 100644 --- a/applications/graphical/cao.nix +++ b/applications/graphical/cao.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/cartographie.nix b/applications/graphical/cartographie.nix index 4c3d269..cb18604 100644 --- a/applications/graphical/cartographie.nix +++ b/applications/graphical/cartographie.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix index 750aeaf..688aaf6 100644 --- a/applications/graphical/client-internet.nix +++ b/applications/graphical/client-internet.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix index 659131d..7f75276 100644 --- a/applications/graphical/default-applications.nix +++ b/applications/graphical/default-applications.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix index cdcdfc7..75e111e 100644 --- a/applications/graphical/default.nix +++ b/applications/graphical/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix index f37bc7b..c0b7123 100644 --- a/applications/graphical/developpement-elm.nix +++ b/applications/graphical/developpement-elm.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix index 3257559..ae2157e 100644 --- a/applications/graphical/developpement-haskell.nix +++ b/applications/graphical/developpement-haskell.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix index 2b830f3..c43280d 100644 --- a/applications/graphical/developpement-java.nix +++ b/applications/graphical/developpement-java.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix index b42320a..0a5f154 100644 --- a/applications/graphical/developpement-jetbrains.nix +++ b/applications/graphical/developpement-jetbrains.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix index 0b6f0b4..f9ede33 100644 --- a/applications/graphical/developpement-rust.nix +++ b/applications/graphical/developpement-rust.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix index 51b8af2..5d68fb2 100644 --- a/applications/graphical/developpement.nix +++ b/applications/graphical/developpement.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/edition-musique.nix b/applications/graphical/edition-musique.nix index 2d04441..3329821 100644 --- a/applications/graphical/edition-musique.nix +++ b/applications/graphical/edition-musique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/edition-photo.nix b/applications/graphical/edition-photo.nix index e0573ad..c731c6b 100644 --- a/applications/graphical/edition-photo.nix +++ b/applications/graphical/edition-photo.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix index 61f9a2b..124a911 100644 --- a/applications/graphical/edition-video.nix +++ b/applications/graphical/edition-video.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix index d426081..b126e59 100644 --- a/applications/graphical/jeux.nix +++ b/applications/graphical/jeux.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix index 1ea891a..3b2d0b8 100644 --- a/applications/graphical/multimedia.nix +++ b/applications/graphical/multimedia.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix index 80cedb2..b3a6277 100644 --- a/applications/graphical/network.nix +++ b/applications/graphical/network.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix index 05bbaed..c0a6b3d 100644 --- a/applications/graphical/radio.nix +++ b/applications/graphical/radio.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix index 543c611..4fd424d 100644 --- a/applications/graphical/securite.nix +++ b/applications/graphical/securite.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/overrides.nix b/applications/overrides.nix index 756c730..56d314e 100644 --- a/applications/overrides.nix +++ b/applications/overrides.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index a66799a..92e6bb6 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix index 02337b1..a68eb59 100644 --- a/applications/terminal/bureau.nix +++ b/applications/terminal/bureau.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index f594437..d30cfc2 100644 --- a/applications/terminal/bureautique.nix +++ b/applications/terminal/bureautique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix index 30f33c9..b40b88d 100644 --- a/applications/terminal/cao.nix +++ b/applications/terminal/cao.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix index f748045..aa76d40 100644 --- a/applications/terminal/cartographie.nix +++ b/applications/terminal/cartographie.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix index 7ee9da1..2b9445f 100644 --- a/applications/terminal/client-internet.nix +++ b/applications/terminal/client-internet.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 05bec37..1db9a37 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix index cdcdfc7..75e111e 100644 --- a/applications/terminal/default.nix +++ b/applications/terminal/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-elm.nix b/applications/terminal/developpement-elm.nix index 01a604b..3782c50 100644 --- a/applications/terminal/developpement-elm.nix +++ b/applications/terminal/developpement-elm.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index 6425bb2..9889fee 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix index c347694..4062b11 100644 --- a/applications/terminal/developpement-java.nix +++ b/applications/terminal/developpement-java.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix index ff91e67..79ba128 100644 --- a/applications/terminal/developpement-jetbrains.nix +++ b/applications/terminal/developpement-jetbrains.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index 40a6750..b6981f1 100644 --- a/applications/terminal/developpement-rust.nix +++ b/applications/terminal/developpement-rust.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix index dab2fa1..1f45c8f 100644 --- a/applications/terminal/developpement.nix +++ b/applications/terminal/developpement.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/edition-musique.nix b/applications/terminal/edition-musique.nix index cead741..6344c61 100644 --- a/applications/terminal/edition-musique.nix +++ b/applications/terminal/edition-musique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix index dc14969..89dacf9 100644 --- a/applications/terminal/edition-photo.nix +++ b/applications/terminal/edition-photo.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix index af23cb8..8a375e4 100644 --- a/applications/terminal/edition-video.nix +++ b/applications/terminal/edition-video.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/jeux.nix b/applications/terminal/jeux.nix index 2f1aa79..615f422 100644 --- a/applications/terminal/jeux.nix +++ b/applications/terminal/jeux.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix index 717b9fb..4ca10aa 100644 --- a/applications/terminal/multimedia.nix +++ b/applications/terminal/multimedia.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix index 9e9c263..1a9a9db 100644 --- a/applications/terminal/network.nix +++ b/applications/terminal/network.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/radio.nix b/applications/terminal/radio.nix index 2b70407..d7f52b8 100644 --- a/applications/terminal/radio.nix +++ b/applications/terminal/radio.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/securite.nix b/applications/terminal/securite.nix index a03980e..eca7959 100644 --- a/applications/terminal/securite.nix +++ b/applications/terminal/securite.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/config-generator.nix b/config-generator.nix index 92ddc96..891db05 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -5,9 +5,9 @@ let cfg = config.r6d.config-generator; pfl = config.r6d.profiles; comp = config.r6d.computers; - host = config.networking.hostName; + host = config.networking.fqdn; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in @@ -43,7 +43,8 @@ in #tincAddress = "192.168.12.8/24"; (mkIf comp.isNomade{ - networking.hostName = "nomade.dubronetwork.fr"; # Define your hostname. + networking.hostName = "nomade"; # Define your hostname. + networking.domain = "dubronetwork.fr"; r6d.profiles.isDubronetwork = true; r6d.config-generator = { diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix index 04ff7f5..17e8d89 100644 --- a/configuration/auto-upgrade.nix +++ b/configuration/auto-upgrade.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/awesome.nix b/configuration/awesome.nix index ae5b73d..25a3742 100644 --- a/configuration/awesome.nix +++ b/configuration/awesome.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/default.nix b/configuration/default.nix index b521f55..7b38dd9 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/environment.nix b/configuration/environment.nix index 811d77a..aa6ba87 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/laptop.nix b/configuration/laptop.nix index 0ed3ace..019b8d2 100644 --- a/configuration/laptop.nix +++ b/configuration/laptop.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/localisation.nix b/configuration/localisation.nix index aa0c60a..4340285 100644 --- a/configuration/localisation.nix +++ b/configuration/localisation.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/network-ipv6.nix b/configuration/network-ipv6.nix index ab2d78a..cd988a3 100644 --- a/configuration/network-ipv6.nix +++ b/configuration/network-ipv6.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/network.nix b/configuration/network.nix index b6b181a..69042ba 100644 --- a/configuration/network.nix +++ b/configuration/network.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in @@ -13,7 +13,7 @@ mkIf true { # Il s'avère que hostname vérifie la validité du FQDN et du reverse. # Fixer ces paramètres dans les hosts permet de faire tomber en marche networking.extraHosts = '' - 127.0.0.1 ${config.networking.hostName} + 127.0.0.1 ${config.networking.fqdn} ${config.networking.hostName} ''; # Activation du routage diff --git a/configuration/swap.nix b/configuration/swap.nix index 602fdd5..0f44623 100644 --- a/configuration/swap.nix +++ b/configuration/swap.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/u2f.nix b/configuration/u2f.nix index a52b369..ac5c6e2 100644 --- a/configuration/u2f.nix +++ b/configuration/u2f.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/udev.nix b/configuration/udev.nix index bbdb94b..63adf9a 100644 --- a/configuration/udev.nix +++ b/configuration/udev.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/iso-image/configuration.nix b/iso-image/configuration.nix index b5bf770..f411956 100644 --- a/iso-image/configuration.nix +++ b/iso-image/configuration.nix @@ -19,5 +19,6 @@ } ]; environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";}; - networking.hostName = "nixos-livecd.corp.capgemini.com"; + networking.hostName = "nixos-livecd"; + networking.domain = "grudu.net"; } diff --git a/module-template.nix b/module-template.nix index 3cb37ef..6d9b71a 100644 --- a/module-template.nix +++ b/module-template.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/options.nix b/options.nix index 138e178..1bfe8ad 100644 --- a/options.nix +++ b/options.nix @@ -160,7 +160,7 @@ let }; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/dbus.nix b/services/dbus.nix index 78faab8..3419dfb 100644 --- a/services/dbus.nix +++ b/services/dbus.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/default.nix b/services/default.nix index 8f86e92..3b958a3 100644 --- a/services/default.nix +++ b/services/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/docker.nix b/services/docker.nix index 95b96b4..87164e1 100644 --- a/services/docker.nix +++ b/services/docker.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/elasticsearch.nix b/services/elasticsearch.nix index f3f4974..3e2895c 100644 --- a/services/elasticsearch.nix +++ b/services/elasticsearch.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/gpm.nix b/services/gpm.nix index 6bbcb44..913dd22 100644 --- a/services/gpm.nix +++ b/services/gpm.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/haveged.nix b/services/haveged.nix index 35a272c..b419419 100644 --- a/services/haveged.nix +++ b/services/haveged.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/hoogle.nix b/services/hoogle.nix index cb8760f..139cb48 100644 --- a/services/hoogle.nix +++ b/services/hoogle.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/hydra-build.nix b/services/hydra-build.nix index 42aeb13..089a7ab 100644 --- a/services/hydra-build.nix +++ b/services/hydra-build.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in # TODO: ménage diff --git a/services/hydra-core.nix b/services/hydra-core.nix index 0688dfd..757c615 100644 --- a/services/hydra-core.nix +++ b/services/hydra-core.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; @@ -54,8 +54,8 @@ mkIf flags.hydra-core { services.hydra = { enable = true; - hydraURL = "http://hydra.${config.networking.hostName}"; - notificationSender = "hydra@${config.networking.hostName}"; + hydraURL = "http://hydra.${config.networking.fqdn}"; + notificationSender = "hydra@${config.networking.fqdn}"; listenHost = "localhost"; minimumDiskFree = 50; # Go smtpHost = "localhost"; diff --git a/services/kibana.nix b/services/kibana.nix index b002ef3..afaf86e 100644 --- a/services/kibana.nix +++ b/services/kibana.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/locate.nix b/services/locate.nix index adac879..c8dde77 100644 --- a/services/locate.nix +++ b/services/locate.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix index 6591a85..a4948ca 100644 --- a/services/monitoring-munin.nix +++ b/services/monitoring-munin.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in @@ -54,7 +54,7 @@ mkIf flags.munin { services.munin-cron = { enable = true; hosts = '' - [${config.networking.hostName}] + [${config.networking.fqdn}] address 127.0.0.1 df._dev_sda2.warning 35 use_node_name yes @@ -65,9 +65,9 @@ mkIf flags.munin { # http://guide.munin-monitoring.org/en/latest/tutorial/alert.html#syntax-of-warning-and-critical extraGlobalConfig = '' #--- - #contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr - contact.email.command /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr - contact.syslog.command /run/current-system/sw/bin/logger -p user.crit -t "Munin notification for ${config.networking.hostName}" + #contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.fqdn}" root@ocean.prunetwork.fr + contact.email.command /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.fqdn}" root@ocean.prunetwork.fr + contact.syslog.command /run/current-system/sw/bin/logger -p user.crit -t "Munin notification for ${config.networking.fqdn}" #--- contact.email.always_send ok,warning,critical,unknown diff --git a/services/nixos-manual.nix b/services/nixos-manual.nix index fc2c9a3..a49ff97 100644 --- a/services/nixos-manual.nix +++ b/services/nixos-manual.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/print.nix b/services/print.nix index 1362bac..3a21096 100644 --- a/services/print.nix +++ b/services/print.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix index a770dd7..bee41d4 100644 --- a/services/pulseaudio.nix +++ b/services/pulseaudio.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/scanner.nix b/services/scanner.nix index e320186..86da935 100644 --- a/services/scanner.nix +++ b/services/scanner.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/ssh.nix b/services/ssh.nix index 1030bfd..2abc847 100644 --- a/services/ssh.nix +++ b/services/ssh.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/virtualbox.nix b/services/virtualbox.nix index 8d5e874..d61937e 100644 --- a/services/virtualbox.nix +++ b/services/virtualbox.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/x11.nix b/services/x11.nix index acf108d..f91f8e6 100644 --- a/services/x11.nix +++ b/services/x11.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index 2f1768c..46734db 100644 --- a/services/xmonad/xmonad.nix +++ b/services/xmonad/xmonad.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/yubikey.nix b/services/yubikey.nix index 3ca6d30..3aefd53 100644 --- a/services/yubikey.nix +++ b/services/yubikey.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in From 2064606f186f4a726070f4fc953c27a7d675a15a Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 7 May 2021 07:14:24 +0200 Subject: [PATCH 03/41] =?UTF-8?q?paquets=20marqu=C3=A9s=20comme=20cass?= =?UTF-8?q?=C3=A9s=20dans=20nixpkgs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/bureautique.nix | 2 +- applications/terminal/developpement-haskell.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index d30cfc2..ec91001 100644 --- a/applications/terminal/bureautique.nix +++ b/applications/terminal/bureautique.nix @@ -24,7 +24,7 @@ mkIf flags.officeSuite { #jekyll # générateur statique de site web #odpdown # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown pandoc - haskellPackages.pandoc-citeproc + #haskellPackages.pandoc-citeproc # ***BROKEN*** texlive.combined.scheme-full # distribution LaTeX #texLive # distribution LaTeX de base #texLiveBeamer # paquets et extensions pour Beamer diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index 9889fee..20bb5e3 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.nix @@ -22,7 +22,7 @@ mkIf flags.developpement-haskell { #brittany # formatteur de code #darcs # gestionnaire de version éponyme #ghc-mod # outil d'analyse de code haskell utilisé par IDE - hindent # indentation code + #hindent # indentation code ***BROKEN*** hlint # qualite de code, analyse statique de code + astuces & bonnes pratiques #postgrest # mapper HTTP <-> PostgreSQL servant # génération d'API REST @@ -31,6 +31,6 @@ mkIf flags.developpement-haskell { # Application perso #hahp - pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc + #pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc ***BROKEN*** ]); } From c33f0f9c506010ffc460d0391363e4ec08cda268 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 7 May 2021 07:15:30 +0200 Subject: [PATCH 04/41] =?UTF-8?q?mise=20=C3=A0=20jour=20paquets=20python?= =?UTF-8?q?=20en=203.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/bureautique.nix | 2 +- applications/terminal/client-internet.nix | 2 +- services/scanner.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index ec91001..55aeede 100644 --- a/applications/terminal/bureautique.nix +++ b/applications/terminal/bureautique.nix @@ -13,7 +13,7 @@ mkIf flags.officeSuite { environment.systemPackages = with pkgs; [ # Bureautique aspell aspellDicts.fr # correction d'ortographe - python36Packages.grammalecte # correction gramatical + python39Packages.grammalecte # correction gramatical # Gestion de tâche taskwarrior # gestionnaire de tâches en console diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix index 2b9445f..b51fb58 100644 --- a/applications/terminal/client-internet.nix +++ b/applications/terminal/client-internet.nix @@ -15,7 +15,7 @@ environment.systemPackages = with pkgs; [ ## Réseaux sociaux #turses # client twitter en ncurse - #python36Packages.rainbowstream # client twitter en console + #python39Packages.rainbowstream # client twitter en console #rtv # client reddit en console ## Mail & Discussion (texte, audio) diff --git a/services/scanner.nix b/services/scanner.nix index 86da935..224b2fe 100644 --- a/services/scanner.nix +++ b/services/scanner.nix @@ -13,7 +13,7 @@ mkIf flags.scanner { environment.systemPackages = with pkgs; [ # Driver hplip # Scanner HP - python27Packages.pyqt4 # dépendance hplip + python39Packages.pyqt4 # dépendance hplip # Outils pour exploiter les scanners simple-scan From 8f4f8ef9530ed78b8d156f381dd43f330019680b Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 7 May 2021 22:28:44 +0200 Subject: [PATCH 05/41] =?UTF-8?q?d=C3=A9placement=20d'options=20et=20paque?= =?UTF-8?q?ts=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/adminsys.nix | 2 +- configuration/localisation.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index 92e6bb6..1f24e58 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -23,7 +23,7 @@ mkIf true { powerline-fonts powertop #ansible - python36Packages.glances + glances pv # afficher le débit d'un flux dd if=/dev/zero | pv | dd of=/dev/null sysstat # pour la commande "iostat -x -1" de monitoring d'activité disque usbutils diff --git a/configuration/localisation.nix b/configuration/localisation.nix index 4340285..cc5f738 100644 --- a/configuration/localisation.nix +++ b/configuration/localisation.nix @@ -10,9 +10,11 @@ in mkIf true { # Select internationalisation properties. + console = { + font = "Lat2-Terminus16"; + keyMap = "fr"; + }; i18n = { - consoleFont = "Lat2-Terminus16"; - consoleKeyMap = "fr"; defaultLocale = "fr_FR.UTF-8"; }; From 67b9f5b0f798d1c5b35f56343b81dd44efc4677c Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 7 May 2021 23:47:18 +0200 Subject: [PATCH 06/41] =?UTF-8?q?dbus=20est=20d=C3=A9sormais=20tout=20le?= =?UTF-8?q?=20temps=20actif=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/dbus.nix | 13 ------------- services/default.nix | 1 - 2 files changed, 14 deletions(-) delete mode 100644 services/dbus.nix diff --git a/services/dbus.nix b/services/dbus.nix deleted file mode 100644 index 3419dfb..0000000 --- a/services/dbus.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) mkIf mkMerge mkThenElse; - annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.fqdn}"; - flags = currentMachine.configurationFlags; -in - -mkIf true { - # Lancement de dbus pour les utilisateurs - services.dbus.socketActivated = true; -} diff --git a/services/default.nix b/services/default.nix index 3b958a3..6f8523e 100644 --- a/services/default.nix +++ b/services/default.nix @@ -10,7 +10,6 @@ in { imports = [ # installées systématiquement - ./dbus.nix ./gpm.nix ./haveged.nix ./monitoring-munin.nix From e26453fc7ea79921aa81e71eea551d00692d7ffe Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 8 May 2021 00:16:32 +0200 Subject: [PATCH 07/41] =?UTF-8?q?gnuradio=20tire=20un=20vieux=20paquet=20p?= =?UTF-8?q?ython,=20Pilllow=206.2.2,=20marqu=C3=A9=20insecure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/graphical/radio.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix index c0a6b3d..5941cf0 100644 --- a/applications/graphical/radio.nix +++ b/applications/graphical/radio.nix @@ -20,4 +20,8 @@ mkIf (flags.radio && flags.graphical) { ## A Trier #inspectrum # Tool for analysing captured signals from sdr receivers ]; + + nixpkgs.config.permittedInsecurePackages = [ + "python2.7-Pillow-6.2.2" + ]; } From 3de6332c3e6021d0879d9c9fb8927311fca8d39d Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 9 May 2021 18:58:30 +0200 Subject: [PATCH 08/41] =?UTF-8?q?pgadmin=20comment=C3=A9,=20plus=20mis=20?= =?UTF-8?q?=C3=A0=20jour,=20tire=20un=20openssl=20d=C3=A9pr=C3=A9ci=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/graphical/developpement.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix index 5d68fb2..44054b2 100644 --- a/applications/graphical/developpement.nix +++ b/applications/graphical/developpement.nix @@ -12,7 +12,7 @@ mkIf (flags.developpement && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ # Base de données - pgadmin # interface d'administration de postgres + #pgadmin # interface d'administration de postgres ***plus à jour, version openssl dépréciée*** #sqlitebrowser # interface d'administration de sqlite # Documentation From ed937ba5bceac20b96392f498f79fe4964167b19 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 18 May 2021 09:55:00 +0200 Subject: [PATCH 09/41] =?UTF-8?q?activation=20par=20d=C3=A9faut=20de=20l'a?= =?UTF-8?q?gent=20gnupg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/default-applications.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 1db9a37..aa96d0a 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -33,4 +33,5 @@ mkIf true { wget # client HTTP console which # pour connaitre le chemin d'un exécutable ]; + programs.gnupg.agent.enable = true; } From edad20c5c073a524ac3d827e53b29efae662eb1b Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 11 Oct 2021 22:23:51 +0200 Subject: [PATCH 10/41] prompt: commentaires --- configuration/bash-prompt.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration/bash-prompt.sh b/configuration/bash-prompt.sh index 90affa8..0e958f5 100644 --- a/configuration/bash-prompt.sh +++ b/configuration/bash-prompt.sh @@ -1,4 +1,4 @@ -# Définition des couleurs du prompt +# Prompt colors if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then PS1_USER='\[$(tput setaf 27)\]' PS1_HOST='\[$(tput setaf 37)\]' @@ -18,10 +18,12 @@ fi BOLD='\[$(tput bold)\]' RESET='\[$(tput sgr0)\]' -# Définition du prompt +# Username or red color if root if [ $UID = 0 ]; then PS1_ID=$PS1_ROOT else PS1_ID=$PS1_USER'\u'$PS1_MISC@$PS1_HOST fi + +# Prompt definition PS1=$RESET$BOLD$PS1_ID'\h '$PS1_PATH'\w'$PS1_GIT'$(__git_ps1)'"\n"$PS1_MISC'\$ '$RESET From cf3c3c3603ef2668fb20910911889e255ea4c757 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 11 Oct 2021 22:24:09 +0200 Subject: [PATCH 11/41] fix: infos git dans le prompt --- configuration/bash-prompt.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration/bash-prompt.sh b/configuration/bash-prompt.sh index 0e958f5..23c8041 100644 --- a/configuration/bash-prompt.sh +++ b/configuration/bash-prompt.sh @@ -1,3 +1,6 @@ +# Git information in prompt +. /run/current-system/sw/share/bash-completion/completions/git-prompt.sh + # Prompt colors if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then PS1_USER='\[$(tput setaf 27)\]' From 204fb8320761cd1e1916b7225d3b8db723af601e Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 11 Oct 2021 22:24:56 +0200 Subject: [PATCH 12/41] =?UTF-8?q?git=20a=20son=20option=20d=C3=A9di=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/default-applications.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index aa96d0a..802f670 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -12,7 +12,7 @@ mkIf true { # Paquets environment.systemPackages = with pkgs; [ byobu # permet de se déconnecter d'un terminal sans l'arréter - gitAndTools.gitFull gitAndTools.tig gti # outil de gestion de version + tig gti # outil de gestion de version gnumake # pour décrire les recettes de compilation gnupg # GPG htop # monitoring @@ -33,5 +33,11 @@ mkIf true { wget # client HTTP console which # pour connaitre le chemin d'un exécutable ]; - programs.gnupg.agent.enable = true; + programs = { + gnupg.agent.enable = true; + git = { + enable = true; + package = pkgs.gitFull; + }; + }; } From ea33bac49be10ad5c19a7e11640f2f9e6cf07970 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 11 Oct 2021 22:38:42 +0200 Subject: [PATCH 13/41] =?UTF-8?q?options=20d=C3=A9di=C3=A9es=20pour=20sloc?= =?UTF-8?q?k,=20spacefm=20et=20udevil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/graphical/bureau.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index 228d80c..02ba6bd 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.nix @@ -27,7 +27,6 @@ mkIf currentMachine.profiles.isDesktopEnvironment { #kde5.dolphin # gestionnaire de fichiers graphique #kde5.dolphin-plugins # gestionnaire de fichiers graphique pcmanfm # gestionnaire de fichiers graphique - spaceFM # gestionnaire de fichiers graphique #vifm # gestionnaire de fichiers basé sur VIM (console) ## Terminal @@ -44,12 +43,9 @@ mkIf currentMachine.profiles.isDesktopEnvironment { hasklig # police dérivée de source-code-pro mais avec des ligatures ]; - # Paquets avec setuid root - security.wrappers = { - # pour le montage des media amovibles - devmon.source = "${pkgs.udevil}/bin/devmon"; - udevil.source = "${pkgs.udevil}/bin/udevil"; # utilisé par spacefm - # vérouiller l''écran. "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)" --> en root - slock.source = "${pkgs.slock}/bin/slock"; + programs = { + slock.enable = true; + spacefm.enable = true; + udevil.enable = true; }; } From 9310d01af6876c22c3ffd1bc349cc51ad52bcecd Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 11 Oct 2021 22:50:13 +0200 Subject: [PATCH 14/41] =?UTF-8?q?option=20d=C3=A9di=C3=A9e=20au=20mat?= =?UTF-8?q?=C3=A9riel=20rtl-sdr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/radio.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/applications/terminal/radio.nix b/applications/terminal/radio.nix index d7f52b8..ac93540 100644 --- a/applications/terminal/radio.nix +++ b/applications/terminal/radio.nix @@ -25,8 +25,5 @@ mkIf flags.radio { dump1090 # Listen to planes ADS-B and view them on a map ]; - # Configuration matérielle - boot.blacklistedKernelModules = [ - "dvb_usb_rtl28xxu" - ]; + hardware.rtl-sdr.enable = true; } From c8ae50be5be9d6c73ade8a9464736b1a98a90987 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 11 Oct 2021 22:52:08 +0200 Subject: [PATCH 15/41] ajout de rustup pour faciliter l'installation de toolchain rust --- applications/terminal/developpement-rust.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index b6981f1..9d07580 100644 --- a/applications/terminal/developpement-rust.nix +++ b/applications/terminal/developpement-rust.nix @@ -14,5 +14,6 @@ mkIf flags.developpement-rust { # Rust cargo # récupération des dépendances + compilation projet rust rustc # pour les appels depuis les scripts + rustup # outil de configuration de toolchain rust ]; } From af35de16392de694fd0d519a8d7fa59cb370fc71 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 18 May 2021 09:44:03 +0200 Subject: [PATCH 16/41] =?UTF-8?q?jetbrains=20mono=20en=20police=20mono=20p?= =?UTF-8?q?ar=20d=C3=A9faut=20(pour=20uniformiser=20avec=20Intellij)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/graphical/bureau.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index 02ba6bd..10c06ca 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.nix @@ -41,7 +41,11 @@ mkIf currentMachine.profiles.isDesktopEnvironment { font-awesome_5 # Jeux de police, utilisé avec Latex hack-font # police monospace créée explicitement pour coder hasklig # police dérivée de source-code-pro mais avec des ligatures + jetbrains-mono # police spécial développeurs par Jetbrains ]; + fonts.fontconfig.defaultFonts = { + monospace = [ "JetBrains Mono" ]; + }; programs = { slock.enable = true; From 032d7e8e1a021b233250bf87fd101f2c72367e6e Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 6 Nov 2021 14:59:51 +0100 Subject: [PATCH 17/41] auto-optimisation du store, options du ramasse-miettes --- configuration/auto-upgrade.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix index 17e8d89..fc5668f 100644 --- a/configuration/auto-upgrade.nix +++ b/configuration/auto-upgrade.nix @@ -12,5 +12,12 @@ mkIf flags.auto-upgrade { # Automatic update & automatic clean system.autoUpgrade.enable = true; - nix.gc.automatic = true; + nix = { + autoOptimiseStore = true; + gc = { + automatic = true; + dates = "daily"; + options = "--delete-older-than 7d"; + }; + }; } From 962c052b29247bf07c1afd2a2048c5e974364493 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 6 Nov 2021 15:21:27 +0100 Subject: [PATCH 18/41] =?UTF-8?q?seule=20la=20maj=20auto=20a=20besoin=20d'?= =?UTF-8?q?=C3=AAtre=20conditionnelle;=20nom=20de=20fichier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configuration/default.nix | 2 +- configuration/{auto-upgrade.nix => nix-options.nix} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename configuration/{auto-upgrade.nix => nix-options.nix} (86%) diff --git a/configuration/default.nix b/configuration/default.nix index 7b38dd9..8f55fe9 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -20,9 +20,9 @@ in # commandées par config-generator ## option de configuration spécifique - ./auto-upgrade.nix # mise à jour automatique du système ./awesome.nix # pour le gestionaire de fenêtres awesome ./laptop.nix # appli & configuration adaptée pour un PC portable + ./nix-options.nix # options de Nix (update, gc, optimisation) ./swap.nix # définition de l'utilisation du swap ]; } diff --git a/configuration/auto-upgrade.nix b/configuration/nix-options.nix similarity index 86% rename from configuration/auto-upgrade.nix rename to configuration/nix-options.nix index fc5668f..52971c4 100644 --- a/configuration/auto-upgrade.nix +++ b/configuration/nix-options.nix @@ -7,11 +7,11 @@ let flags = currentMachine.configurationFlags; in -mkIf flags.auto-upgrade { +{ # Automatic update & automatic clean - system.autoUpgrade.enable = true; + system.autoUpgrade.enable = flags.auto-upgrade; nix = { autoOptimiseStore = true; gc = { From b2505f45c48cf783755bdca72dd146b2a461ab96 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 27 Jan 2022 23:33:34 +0100 Subject: [PATCH 19/41] prise en compte globale de fish --- applications/terminal/default-applications.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 802f670..a833a7f 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -34,6 +34,7 @@ mkIf true { which # pour connaitre le chemin d'un exécutable ]; programs = { + fish.enable = true; gnupg.agent.enable = true; git = { enable = true; From 0364ea9b292b24ebeada3e2d340b929b8e8cdea2 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 27 Jan 2022 23:36:07 +0100 Subject: [PATCH 20/41] ajout de lazygit ; interface terminal sympa pour git --- applications/terminal/default-applications.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index a833a7f..1cbbda7 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -12,7 +12,7 @@ mkIf true { # Paquets environment.systemPackages = with pkgs; [ byobu # permet de se déconnecter d'un terminal sans l'arréter - tig gti # outil de gestion de version + tig gti lazygit # outil de gestion de version gnumake # pour décrire les recettes de compilation gnupg # GPG htop # monitoring From 30e2f312550ff9ce7436fcd48ab11d7e4061358f Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 27 Jan 2022 23:39:05 +0100 Subject: [PATCH 21/41] ajout de kitty : terminal virtuel rendu par GPU --- applications/graphical/bureau.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index 10c06ca..c133e1a 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.nix @@ -30,6 +30,7 @@ mkIf currentMachine.profiles.isDesktopEnvironment { #vifm # gestionnaire de fichiers basé sur VIM (console) ## Terminal + kitty # terminal avec rendu par GPU sakura # terminal ]; From 48a257405a72518558ba2bdf14b3e042c1b95429 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 1 Mar 2022 20:11:25 +0100 Subject: [PATCH 22/41] =?UTF-8?q?pr=C3=A9conisations=20des=20devs=20d'Open?= =?UTF-8?q?JDK=20:=20utilisons=20la=20derni=C3=A8re=20version=20disponible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/developpement-java.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix index 4062b11..6f33d47 100644 --- a/applications/terminal/developpement-java.nix +++ b/applications/terminal/developpement-java.nix @@ -12,7 +12,6 @@ mkIf flags.developpement-java { # Installe le paquet + JAVA_HOME programs.java = { enable = true; - package = pkgs.jdk11; }; # Paquets From 2d63aae5a1cb0c64b17c9d8199b259cc04b0f0c0 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 1 Mar 2022 20:13:16 +0100 Subject: [PATCH 23/41] syntaxe fish pour vim --- applications/terminal/vim.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/vim.nix b/applications/terminal/vim.nix index dd0c13a..9ec78a7 100644 --- a/applications/terminal/vim.nix +++ b/applications/terminal/vim.nix @@ -13,6 +13,7 @@ vim_configurable.customize { # They are installed managed by `vam` (a vim plugin manager) #"vim-addon-nix" "elm-vim" + "vim-fish" "vim-nix" "wombat256-vim" ]; } From 7679f865b06ede8cdec12970a7171f8bcaa475dc Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 1 Mar 2022 20:20:42 +0100 Subject: [PATCH 24/41] lazydocker pour controller les imgaes et containers dans le terminal --- services/docker.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/services/docker.nix b/services/docker.nix index 87164e1..235617a 100644 --- a/services/docker.nix +++ b/services/docker.nix @@ -14,6 +14,7 @@ mkIf flags.docker { # Ecosystème Docker docker docker-compose + lazydocker ]; virtualisation.docker.enable = true; From 03bcc056c1ef700bc0b7576a0182d7053694be76 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 1 Mar 2022 20:35:28 +0100 Subject: [PATCH 25/41] =?UTF-8?q?ajout=20d'un=20module=20pipewire=20en=20p?= =?UTF-8?q?r=C3=A9vision=20de=20remplacement=20de=20pulseaudio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options.nix | 1 + services/default.nix | 1 + services/pipewire.nix | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 services/pipewire.nix diff --git a/options.nix b/options.nix index 1bfe8ad..5aa062d 100644 --- a/options.nix +++ b/options.nix @@ -44,6 +44,7 @@ let nix-serve-server = mkEnableOption "Profil pour que la machine soit un serveur de cache nix."; nixStoreProxyCache = mkEnableOption "Profil pour activer le proxy cahce nginx pour le nix store"; officeSuite = mkEnableOption "Profil pour la suite bureautique"; + pipewire = mkEnableOption "Profil pour activer pipewire."; print = mkEnableOption "Profil pour activer cups & pouvoir imprimer."; pulseaudio = mkEnableOption "Profil pour activer pulseaudio."; rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP."; diff --git a/services/default.nix b/services/default.nix index 6f8523e..cb5237b 100644 --- a/services/default.nix +++ b/services/default.nix @@ -33,6 +33,7 @@ in ## if isDesktop ./pulseaudio.nix # activation du serveur audio + ./pipewire.nix # activation du serveur audio ./scanner.nix # utilisation d'un scanner ./x11.nix # activation du serveur graphique X ]; diff --git a/services/pipewire.nix b/services/pipewire.nix new file mode 100644 index 0000000..28dd419 --- /dev/null +++ b/services/pipewire.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + annuaire = config.r6d.machines; + currentMachine = annuaire."${config.networking.fqdn}"; + flags = currentMachine.configurationFlags; +in + +mkIf flags.pipewire { + + # Paquets + environment.systemPackages = with pkgs; [ + helvum # patchbay pipewire + paprefs # préferences pulseaudio + pavucontrol # mixer pulseaudio + pa_applet # status et contrôle dans le system tray + ]; + + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + +} From 518054fd0a663059bd0103c4365f92fc202bc77e Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 1 Mar 2022 20:55:11 +0100 Subject: [PATCH 26/41] gestionnaire graphique bluetooth --- configuration/laptop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration/laptop.nix b/configuration/laptop.nix index 019b8d2..5878457 100644 --- a/configuration/laptop.nix +++ b/configuration/laptop.nix @@ -33,6 +33,7 @@ mkIf flags.laptop { ]; # Services + services.blueman.enable = true; services.xserver.libinput = { enable = true; }; From 257f59054d90ef85c0130808d27125cba9badd05 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 1 Mar 2022 22:06:12 +0100 Subject: [PATCH 27/41] renommage d'options Nix --- configuration/environment.nix | 3 --- configuration/nix-options.nix | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configuration/environment.nix b/configuration/environment.nix index aa6ba87..83765ed 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -8,9 +8,6 @@ let in { - # Nombre de process d'installation en parrallèle effectués par Nix - nix.buildCores = 0; - # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "19.09"; diff --git a/configuration/nix-options.nix b/configuration/nix-options.nix index 52971c4..b44530a 100644 --- a/configuration/nix-options.nix +++ b/configuration/nix-options.nix @@ -13,7 +13,11 @@ in system.autoUpgrade.enable = flags.auto-upgrade; nix = { - autoOptimiseStore = true; + settings = { + auto-optimise-store = true; + # Nombre de process d'installation en parrallèle effectués par Nix + cores = 0; + }; gc = { automatic = true; dates = "daily"; From f6f3befe2fbdcd1116216f033a71e7c732e88794 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 2 Mar 2022 17:36:54 +0100 Subject: [PATCH 28/41] activation des sous-commandes nix et des flakes --- configuration/nix-options.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration/nix-options.nix b/configuration/nix-options.nix index b44530a..29d6c87 100644 --- a/configuration/nix-options.nix +++ b/configuration/nix-options.nix @@ -13,6 +13,9 @@ in system.autoUpgrade.enable = flags.auto-upgrade; nix = { + extraOptions = '' + experimental-features = nix-command flakes + ''; settings = { auto-optimise-store = true; # Nombre de process d'installation en parrallèle effectués par Nix From 28cf2d20719b913948f02258d5561e8dcb66bbb1 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 3 Mar 2022 11:57:10 +0100 Subject: [PATCH 29/41] lot de renommages dans nixpkgs --- applications/graphical/client-internet.nix | 6 +++--- applications/graphical/developpement-java.nix | 2 +- applications/graphical/developpement-jetbrains.nix | 8 ++++---- applications/overrides.nix | 2 +- applications/terminal/adminsys.nix | 2 +- applications/terminal/default-applications.nix | 2 +- applications/terminal/network.nix | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix index 688aaf6..75e6be2 100644 --- a/applications/graphical/client-internet.nix +++ b/applications/graphical/client-internet.nix @@ -18,7 +18,7 @@ environment.systemPackages = with pkgs; [ firefox ## Mail & Discussion (texte, audio) - clawsMail + claws-mail hexchat quasselClient mumble @@ -27,7 +27,7 @@ environment.systemPackages = with pkgs; [ # Transfert de fichier filezilla - transmission_gtk - transmission_remote_gtk + transmission-gtk + transmission-remote-gtk ]; } diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix index c43280d..dcc6609 100644 --- a/applications/graphical/developpement-java.nix +++ b/applications/graphical/developpement-java.nix @@ -12,6 +12,6 @@ mkIf (flags.developpement-java && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ # IDE - idea.idea-community # IntelliJ IDEA + jetbrains.idea-community # IntelliJ IDEA ]; } diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix index 0a5f154..e5302f0 100644 --- a/applications/graphical/developpement-jetbrains.nix +++ b/applications/graphical/developpement-jetbrains.nix @@ -11,9 +11,9 @@ mkIf (flags.jetbrains-licensed && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ - idea.idea-ultimate - idea.clion - idea.datagrip - idea.pycharm-professional + jetbrains.idea-ultimate + jetbrains.clion + jetbrains.datagrip + jetbrains.pycharm-professional ]; } diff --git a/applications/overrides.nix b/applications/overrides.nix index 56d314e..6349f52 100644 --- a/applications/overrides.nix +++ b/applications/overrides.nix @@ -10,7 +10,7 @@ in mkIf true { nixpkgs.config.packageOverrides = pkgs: { - clawsMail = pkgs.clawsMail.override { + claws-mail = pkgs.claws-mail.override { enablePgp = true; enablePluginArchive = true; #enablePluginFancy = false; # nécessite wekitgtk qui est troué # Option supprimée dans NixOS 20.03 diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index 1f24e58..e48ec3f 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -44,7 +44,7 @@ mkIf true { ntfs3g # ntfs samba # partages windows squashfsTools # squashfs - sshfsFuse # ssh + sshfs-fuse # ssh ## Gestion de FS nfs-utils diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 1cbbda7..6049299 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -25,7 +25,7 @@ mkIf true { pinentry # pour taper les mots de passe gpg psmisc # fournis les utilitaires comme killall, fuser, pstree #python # python -- python -m SimpleHTTPServer 8000 - shared_mime_info # MIME info + shared-mime-info # MIME info tmux # nécessaire pour byobu tree # affiche une arborescence de fichiers et dossiers usbutils diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix index 1a9a9db..bb93553 100644 --- a/applications/terminal/network.nix +++ b/applications/terminal/network.nix @@ -15,7 +15,7 @@ mkIf true { iperf # outil de mesure de la qualité du réseau iptraf-ng # outil de mesure de la qualité du réseau nload # affichage de statisques d'utilisation instantannées du réseau - telnet + inetutils ## Diagnostic arp-scan From 2fad38532f374d6ccfcfb3f6103395828908804e Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 14 Mar 2022 09:21:37 +0100 Subject: [PATCH 30/41] nouvelle syntaxe pour l'optimisation du store --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6e2f698..a6b3cfd 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ list-installed-packages: nixos-option environment.systemPackages | head -2 | tail -1 | sed -e 's/ /\n/g' | cut -d- -f2- | sort | uniq| sed -e 's/"$$//' optimise: - $(TIME) nix optimise-store + $(TIME) nix store optimise rebuild-build: nix-channel --add https://nixos.org/channels/nixos-unstable nixos From d4f2298518e63c15d13b89a31a397e4471e3a70c Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 25 Apr 2022 10:00:11 +0200 Subject: [PATCH 31/41] fix: mauvaise couleur de fond dans vim dans certains cas --- applications/terminal/vimrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/applications/terminal/vimrc b/applications/terminal/vimrc index 257846c..24051b9 100644 --- a/applications/terminal/vimrc +++ b/applications/terminal/vimrc @@ -32,3 +32,10 @@ if &t_Co > 8 let &colorcolumn="80,".join(range(120,999),",") highlight ColorColumn ctermbg=235 guibg=#2c2d27 endif + +" vim hardcodes background color erase even if the terminfo file does +" not contain bce (not to mention that libvte based terminals +" incorrectly contain bce in their terminfo files). This causes +" incorrect background rendering when using a color theme with a +" background color. +let &t_ut='' From e55568d1c699957c0cb34adc21bcc6f4f2479d96 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 7 May 2022 12:21:28 +0200 Subject: [PATCH 32/41] =?UTF-8?q?rdfind=20cass=C3=A9=20dans=20les=20paquet?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/adminsys.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index e48ec3f..f2a120b 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -53,6 +53,6 @@ mkIf true { inotify-tools # être notifié lorsque le contenu d'un répertoire change detox # The detox utility renames files to make them easier to work with. duff # outil de recherche de fichiers en doublons - rdfind # recherche de fichiers doublons pour remplacement par hard/soft link + #rdfind # recherche de fichiers doublons pour remplacement par hard/soft link ]; } From 812bc511e07050bee1962213602d9f3fba302e65 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 8 Jun 2022 15:51:06 +0200 Subject: [PATCH 33/41] impression vers des imprimantes Samba --- services/print.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/print.nix b/services/print.nix index 3a21096..d476097 100644 --- a/services/print.nix +++ b/services/print.nix @@ -9,12 +9,19 @@ in mkIf flags.print { + environment.systemPackages = with pkgs; [ + samba + python310Packages.pysmbc + ]; + services.samba.enable = true; # Services ## Enable CUPS to print documents. services.printing = { enable = true; drivers = [ pkgs.samsung-unified-linux-driver + pkgs.fxlinuxprint + pkgs.gutenprint ]; # Suppression automatique des fichiers temporaires. # Par défaut, cups conserve une copie de ce qui a été imprimé @@ -24,4 +31,6 @@ mkIf flags.print { PreserveJobFiles No ''; }; + services.avahi.enable = true; + services.avahi.nssmdns = true; } From 1b1aebd0a0d374845d0b868204851fe7c3066d16 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 8 Jun 2022 15:51:30 +0200 Subject: [PATCH 34/41] ajout du plugin vim-wiki --- applications/terminal/vim.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/vim.nix b/applications/terminal/vim.nix index 9ec78a7..6cac9e0 100644 --- a/applications/terminal/vim.nix +++ b/applications/terminal/vim.nix @@ -16,6 +16,7 @@ vim_configurable.customize { "vim-fish" "vim-nix" "wombat256-vim" + "vimwiki" ]; } ]; } From f751e24839f33bd20604f1caa644a8903d48d130 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 8 Jun 2022 15:52:09 +0200 Subject: [PATCH 35/41] =?UTF-8?q?outil=20pour=20g=C3=A9n=C3=A9rer=20une=20?= =?UTF-8?q?d=C3=A9rivation=20Nix=20dans=20un=20projet=20Rust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/terminal/developpement-rust.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index 9d07580..5f24eb9 100644 --- a/applications/terminal/developpement-rust.nix +++ b/applications/terminal/developpement-rust.nix @@ -15,5 +15,6 @@ mkIf flags.developpement-rust { cargo # récupération des dépendances + compilation projet rust rustc # pour les appels depuis les scripts rustup # outil de configuration de toolchain rust + crate2nix # génère les fichiers de build Nix dans un projet Rust ]; } From 51b98cda4f4643e53ce8f4911fa47f46355a37c0 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 10 Jun 2022 15:27:15 +0200 Subject: [PATCH 36/41] nettoyage paquets xmonad inutiles --- services/xmonad/xmonad.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index 46734db..14b86b9 100644 --- a/services/xmonad/xmonad.nix +++ b/services/xmonad/xmonad.nix @@ -9,20 +9,10 @@ in mkIf flags.xmonad { - # Paquets - environment.systemPackages = with pkgs; [ - dmenu - haskellPackages.xmobar - trayer - ]; - # Services services.xserver.windowManager.xmonad = { enable = true; enableContribAndExtras = true; - extraPackages = haskellPackages: [ - haskellPackages.xmobar - ]; }; environment.variables = { _JAVA_AWT_WM_NONREPARENTING = "1"; From 963b0b9d4b2bd60bb2891c33ad7ec2f6f64cd343 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 10 Jun 2022 15:27:40 +0200 Subject: [PATCH 37/41] configuration gnome active pour xmonad --- services/xmonad/xmonad.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index 14b86b9..60e8af1 100644 --- a/services/xmonad/xmonad.nix +++ b/services/xmonad/xmonad.nix @@ -8,6 +8,8 @@ let in mkIf flags.xmonad { + services.dbus.packages = with pkgs; [ dconf ]; + programs.dconf.enable = true; # Services services.xserver.windowManager.xmonad = { From 4fd9d0d7f87fe47b4507963a76f11490bc97c69f Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 5 Aug 2022 14:52:06 +0200 Subject: [PATCH 38/41] config git au format Nix --- .../terminal/default-applications.nix | 31 +++++++++++++++++++ configuration/environment.nix | 1 - configuration/gitconfig | 27 ---------------- 3 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 configuration/gitconfig diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 6049299..ca150ef 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -39,6 +39,37 @@ mkIf true { git = { enable = true; package = pkgs.gitFull; + config = { + # http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/ + color = { + diff = "auto"; + branch = "auto"; + interactive = "auto"; + pager = true; + showbranch = "auto"; + status = "auto"; + }; + alias = { + a = "add -p"; + br = "for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short)\t%(authorname)\t%(refname:short)'"; + ci = "commit"; + co = "checkout"; + ff = "pull --ff-only"; + oops = "commit --amend --no-edit"; + # Show files ignored by git + ignored = "ls-files -o -i --exclude-standard"; + ls = "ls-files"; + st = "status"; + # Logs + lol = "log --graph --decorate --pretty=oneline --abbrev-commit"; + lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all"; + not-pushed = "log --branches --not --remotes"; + }; + push.default = "simple"; + code.editor = "${pkgs.vim_configurable}/bin/vim"; + }; + lfs.enable = true; + }; }; }; } diff --git a/configuration/environment.nix b/configuration/environment.nix index 83765ed..8cc100b 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -43,7 +43,6 @@ in vi = "vim"; byobu-adminsys = "/etc/nixos/base/byobu-adminsys"; }; - etc.gitconfig.text = builtins.readFile ./gitconfig; }; programs.bash = { enableCompletion = true; diff --git a/configuration/gitconfig b/configuration/gitconfig deleted file mode 100644 index e3d4d5e..0000000 --- a/configuration/gitconfig +++ /dev/null @@ -1,27 +0,0 @@ -# http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/ -[color] - diff = auto - branch = auto - interactive = auto - pager = true - showbranch = auto - status = auto -[alias] - a = add -p - br = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short)\t%(authorname)\t%(refname:short)' - ci = commit - co = checkout - ff = pull --ff-only - oops = commit --amend --no-edit - # Show files ignored by git - ignored = ls-files -o -i --exclude-standard - ls = ls-files - st = status - # Logs - lol = log --graph --decorate --pretty=oneline --abbrev-commit - lola = log --graph --decorate --pretty=oneline --abbrev-commit --all - not-pushed = log --branches --not --remotes -[push] - default = simple -[core] - editor = /usr/bin/env vim From f7264ae43434ab218fab3f6982e7a277719cfe54 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 5 Aug 2022 16:03:14 +0200 Subject: [PATCH 39/41] =?UTF-8?q?vim:=20nouvelle=20fa=C3=A7on=20d'appeler?= =?UTF-8?q?=20les=20plugins,=20reorga=20du=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/default-applications.nix | 2 - applications/terminal/default.nix | 1 + applications/terminal/vim.nix | 46 +++++++++++-------- applications/terminal/vimrc | 2 + 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index ca150ef..89d3188 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -29,7 +29,6 @@ mkIf true { tmux # nécessaire pour byobu tree # affiche une arborescence de fichiers et dossiers usbutils - (import ./vim.nix) wget # client HTTP console which # pour connaitre le chemin d'un exécutable ]; @@ -70,6 +69,5 @@ mkIf true { }; lfs.enable = true; }; - }; }; } diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix index 75e111e..510a21c 100644 --- a/applications/terminal/default.nix +++ b/applications/terminal/default.nix @@ -27,6 +27,7 @@ in ./edition-video.nix # modifier les vidéos ./jeux.nix # jouer, tout simplement ;) ./radio.nix # outils pour faire de la radio SDR + ./vim.nix # vim avec plugins ## if isDesktop ./adminsys.nix # pour gérer le système dans son ensemble et les services diff --git a/applications/terminal/vim.nix b/applications/terminal/vim.nix index 6cac9e0..e392e77 100644 --- a/applications/terminal/vim.nix +++ b/applications/terminal/vim.nix @@ -1,22 +1,28 @@ -with import {}; +{pkgs, ... }: -vim_configurable.customize { - # Specifies the vim binary name. - # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim - # This allows to have multiple vim packages installed (e.g. with a different set of plugins) - name = "vim"; - vimrcConfig.customRC = builtins.readFile ./vimrc; - vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; - vimrcConfig.vam.pluginDictionaries = [ - { names = [ - # Here you can place all your vim plugins - # They are installed managed by `vam` (a vim plugin manager) - #"vim-addon-nix" - "elm-vim" - "vim-fish" - "vim-nix" - "wombat256-vim" - "vimwiki" - ]; } - ]; +let + myVim = pkgs.vim_configurable.customize { + # Specifies the vim binary name. + # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim + # This allows to have multiple vim packages installed (e.g. with a different set of plugins) + name = "vim"; + vimrcConfig.customRC = builtins.readFile ./vimrc; + vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { + start = [ + wombat256-vim + ]; + opt = [ + elm-vim + vim-fish + vim-nix + vimwiki + ]; + }; + }; + +in { + programs.vim = { + defaultEditor = true; + package = myVim; + }; } diff --git a/applications/terminal/vimrc b/applications/terminal/vimrc index 24051b9..b9f3c41 100644 --- a/applications/terminal/vimrc +++ b/applications/terminal/vimrc @@ -2,6 +2,8 @@ " This must be first, because it changes other options as a side effect. set nocompatible +syntax on + " allow backspacing over everything in insert mode set backspace=indent,eol,start From 06d73c9519abc12629b4e94f80417efd61bb9f42 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 9 Aug 2022 18:57:40 +0200 Subject: [PATCH 40/41] lancement auto des plugins vim selon le type de fichier --- applications/terminal/vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/terminal/vimrc b/applications/terminal/vimrc index b9f3c41..f10a1a4 100644 --- a/applications/terminal/vimrc +++ b/applications/terminal/vimrc @@ -2,6 +2,7 @@ " This must be first, because it changes other options as a side effect. set nocompatible +filetype plugin on syntax on " allow backspacing over everything in insert mode From c1b40f9d07f67ab255b0602da87bd86a1af8a91a Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 12 Aug 2022 15:30:32 +0200 Subject: [PATCH 41/41] =?UTF-8?q?nouveau=20site=20pour=20v=C3=A9rifier=20l?= =?UTF-8?q?e=20status=20de=20NixOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcaa86c..f01ad20 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Ce dépôt stocke une configuration générique des machines. ~~Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.~~ # Liens -* http://howoldis.herokuapp.com/ pour savoir de quand datent les différentes releases de NixOS +* https://status.nixos.org/ pour savoir de quand datent les différentes releases de NixOS * https://repology.org/repository/nix_unstable/problems pour lister les paquets avec problèmes # Notes de mise-à-jour