Compare commits

..

5 Commits

@ -1,10 +1,6 @@
GSF=git submodule foreach GSF=git submodule foreach
TIME=time TIME=time
CHRONY_STATUS=chronyc tracking
CHRONY_STATS=chronyc sources -v
CHRONY_STATS_SOURCES=chronyc sourcestats
all: rebuild-switch all: rebuild-switch
date date
##--------- Commandes spécifiques pour NixOS ##--------- Commandes spécifiques pour NixOS
@ -19,46 +15,24 @@ clean-total:
$(TIME) nix-collect-garbage -d $(TIME) nix-collect-garbage -d
clean-log: clean-log:
journalctl --flush --rotate
journalctl --vacuum-size=1G journalctl --vacuum-size=1G
full-auto: submodules-update upgrade clean optimise full-auto: submodules-update upgrade clean optimise
@date @date
list-installed-packages:
@# source : https://functor.tokyo/blog/2018-02-20-show-packages-installed-on-nixos
@# https://www.domenkozar.com/2014/01/02/getting-started-with-nix-package-manager/
@#nixos-option environment.systemPackages
nixos-option environment.systemPackages | head -2 | tail -1 | sed -e 's/ /\n/g' | cut -d- -f2- | sort | uniq| sed -e 's/"$$//'
optimise: optimise:
$(TIME) nix store optimise $(TIME) nix-store --optimise
rebuild-build:
nix-channel --add https://nixos.org/channels/nixos-unstable nixos
$(TIME) time nixos-rebuild build --fallback --show-trace
rebuild-switch: rebuild-switch:
$(TIME) time nixos-rebuild switch --fallback --show-trace $(TIME) time nixos-rebuild switch --fallback --show-trace
show-blackholed:
-@ip route |grep blackhole |wc -l| awk '{print "Il y a "$$1" route(s) en blackhole sur";system("hostname ")}' |cowsay
show-diff-with-current:
-diff /run/current-system/configuration.nix /etc/nixos/configuration.nix
show-roots: show-roots:
nix-store --gc --print-roots nix-store --gc --print-roots
show-time:
-@$(CHRONY_STATUS) && $(CHRONY_STATS)
-@watch -d -n 2 "$(CHRONY_STATUS) && echo "-- Statistiques générales :" && $(CHRONY_STATS) && echo "-- Statistiques sur les sources :" && $(CHRONY_STATS_SOURCES) && echo "-- Statistiques sur les clients :" && chronyc clients"
store-repair: store-repair:
$(TIME) nix-store --verify --check-contents --repair $(TIME) nix-store --verify --check-contents --repair
upgrade: upgrade:
nix-channel --add https://nixos.org/channels/nixos-unstable nixos
$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace $(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
##--------- Commandes spécifiques pour NixOS -- Opérations non courantes ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
@ -113,6 +87,3 @@ tmpfs-umount:
tmpfs-destroy: tmpfs-umount tmpfs-destroy: tmpfs-umount
rmdir /mnt/tmpfs rmdir /mnt/tmpfs
##- Test awesome
test-awesome:
Xephyr :5 & sleep 1; DISPLAY=:5 awesome

@ -1,35 +1,15 @@
# nixos-template-base # nixos-template-base
Versions de NixOS supportées : Versions de NixOS supportées :
* NixOS 16.09
* NixOS unstable * NixOS unstable
Ce dépôt stocke une configuration générique des machines. Ce dépôt stocke une configuration générique des machines.
Une recette dite "config-generator" adapte la configuration selon le nom de la machine (FQDN).
~~Une recette dite "config-generator" adapte la configuration selon le nom de la machine (FQDN).~~ Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.
~~Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.~~
# Liens
* 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 # Notes de mise-à-jour
## pour l'utilisation de l'annuaire (à partir de 2017-04-28)
* faire les mises à jour de l'OS
* commiter & pusher l'état des dépôts (au cas où). Pour les différents dépôts `git a`, `git commit` puis `make tag push`
* 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 = "<X>";`
* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "<X>";`
* tester la configuration : `nixos-rebuild build`
* corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` )
* lorsque tout semble bon, vérifier :
* qu'il y a toujours des utilisateurs dans la configuration
* que le moyen d'accéder à la machine n'a pas été supprimé (surtout les machines distantes)
* lancer la commande de build de l'os : `make` :)
## pour le passage de 16.09 à unstable ## pour le passage de 16.09 à unstable
* mettre à jour tous les dépôts * mettre à jour tous les dépôts
@ -113,13 +93,13 @@ Pour résoudre les soucis d'upgrade, il est conseillé :
* se connecter à la machine * se connecter à la machine
* passer en root * passer en root
~~~bash ~~~
sudo su - sudo su -
~~~ ~~~
* formater les partitions * formater les partitions
~~~bash ~~~
mkfs.ext4 -L nixos /dev/sda1 mkfs.ext4 -L nixos /dev/sda1
swapoff -a swapoff -a
mkswap /dev/sda2 mkswap /dev/sda2
@ -128,28 +108,24 @@ swapon -a
* monter les partitions dans /mnt * monter les partitions dans /mnt
~~~bash ~~~
mount /dev/sda1 /mnt/ mount /dev/sda1 /mnt/
mkdir /mnt/etc/ mkdir /mnt/etc/
mkdir /mnt/etc/nixos
mkdir /etc/nixos mkdir /etc/nixos
mkdir /mnt/nix mkdir /mnt/nix
mkdir /nix
mount --bind /mnt/nix/ /nix mount --bind /mnt/nix/ /nix
mkdir /mnt/tmp
mount --bind /mnt/tmp /tmp
~~~ ~~~
* installer les paquets nécessaires * installer les paquets nécessaires
~~~bash ~~~
apt-get install bzip2 git byobu htop glances apt-get install bzip2 git byobu htop glances
~~~ ~~~
* création d'utilisateur (n'importe quil mot de passe) * création d'utilisateur (n'importe quil mot de passe)
~~~bash ~~~
adduser nix adduser nix
groupadd -r nixbld groupadd -r nixbld
for n in $(seq 1 10); do useradd -c "Nix build user $n" -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" nixbld$n; done for n in $(seq 1 10); do useradd -c "Nix build user $n" -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" nixbld$n; done
@ -157,14 +133,14 @@ for n in $(seq 1 10); do useradd -c "Nix build user $n" -d /var/empty -g nixbld
* mise-à-jour des certificats * mise-à-jour des certificats
~~~bash ~~~
update-ca-certificates update-ca-certificates
~~~ ~~~
* installer nix * installer nix
~~~bash ~~~
chown -R nix /nix /tmp chown -R nix /nix
su - nix su - nix
bash <(curl https://nixos.org/nix/install) bash <(curl https://nixos.org/nix/install)
exit exit
@ -172,22 +148,22 @@ exit
* créer un profil nix pour root & un channel * créer un profil nix pour root & un channel
~~~bash ~~~
. ~nix/.nix-profile/etc/profile.d/nix.sh . ~nix/.nix-profile/etc/profile.d/nix.sh
nix-channel --remove nixpkgs nix-channel --remove nixpkgs
nix-channel --add https://nixos.org/channels/nixos-unstable nixos nix-channel --add http://nixos.org/channels/nixos-unstable nixos
nix-channel --update nix-channel --update
~~~ ~~~
* installer un editeur de texte * installer un editeur de texte
~~~bash ~~~
nix-env -i vim_configurable nix-env -i vim_configurable
~~~ ~~~
* installation de nixos-install * installation de nixos-install
~~~bash ~~~
cat <<EOF > /root/configuration.nix cat <<EOF > /root/configuration.nix
{ fileSystems."/" = {}; { fileSystems."/" = {};
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
@ -206,7 +182,7 @@ nix-env -i -A config.system.build.nixos-install \
si la machine existe déjà, cloner le dépôt dans /mnt/etc/nixos si la machine existe déjà, cloner le dépôt dans /mnt/etc/nixos
pour cela, créer clef ssh et l'ajouter sur la forge pour cela, créer clef ssh et l'ajouter sur la forge
~~~bash ~~~
ssh-keygen -t ed25519 ssh-keygen -t ed25519
cp ~/.ssh/id_ed25519* /mnt/etc/nixos/ cp ~/.ssh/id_ed25519* /mnt/etc/nixos/
@ -217,13 +193,13 @@ git submodule update
* monter /etc/nixos vers /mnt/etc/nixos pour que la config clonée fonctionne * monter /etc/nixos vers /mnt/etc/nixos pour que la config clonée fonctionne
~~~bash ~~~
mount --bind /mnt/etc/nixos/ /etc/nixos/ mount --bind /mnt/etc/nixos/ /etc/nixos/
~~~ ~~~
* mettre à jour la configuration matérielle * mettre à jour la configuration matérielle
~~~bash ~~~
export NIX_PATH=nixpkgs=/root/.nix-defexpr/channels/nixos:nixos=/root/.nix-defexpr/channels/nixos/nixos export NIX_PATH=nixpkgs=/root/.nix-defexpr/channels/nixos:nixos=/root/.nix-defexpr/channels/nixos/nixos
nixos-generate-config --root /mnt nixos-generate-config --root /mnt
~~~ ~~~
@ -234,7 +210,8 @@ notamment le périphérique utilisé par grub
* installer le système sur le disque * installer le système sur le disque
~~~bash ~~~
unset NIXOS_CONFIG unset NIXOS_CONFIG
nixos-install nixos-install
~~~ ~~~

@ -2,20 +2,17 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.graphical { mkIf cfg.graphical {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Gestion de FS # Gestion de FS
gparted # Gestion graphique de partitions gparted # Gestion graphique de partitions
unetbootin # création de clefs USB bootables unetbootin # création de clefs USB bootables
# visualisation de log
#logstalgia
]; ];
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf currentMachine.profiles.isDesktopEnvironment { mkIf profiles.isDesktopEnvironment {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -24,13 +24,11 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
gnome3.adwaita-icon-theme # thème d'icone - semble fonctionner avec spaceFM gnome3.adwaita-icon-theme # thème d'icone - semble fonctionner avec spaceFM
## Manipulation de fichier ## Manipulation de fichier
#kde5.dolphin # gestionnaire de fichiers graphique
#kde5.dolphin-plugins # gestionnaire de fichiers graphique
pcmanfm # gestionnaire de fichiers graphique pcmanfm # gestionnaire de fichiers graphique
spaceFM # gestionnaire de fichiers graphique
#vifm # gestionnaire de fichiers basé sur VIM (console) #vifm # gestionnaire de fichiers basé sur VIM (console)
## Terminal ## Terminal
kitty # terminal avec rendu par GPU
sakura # terminal sakura # terminal
]; ];
@ -39,18 +37,16 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
fira # police créée pour Firefox fira # police créée pour Firefox
fira-code # idem fira-mono + ligatures pour la programmation fira-code # idem fira-mono + ligatures pour la programmation
fira-mono # dérivée de fira en monospace fira-mono # dérivée de fira en monospace
font-awesome_5 # Jeux de police, utilisé avec Latex
hack-font # police monospace créée explicitement pour coder hack-font # police monospace créée explicitement pour coder
hasklig # police dérivée de source-code-pro mais avec des ligatures 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 = { # Paquets avec setuid root
slock.enable = true; security.wrappers = {
spacefm.enable = true; # pour le montage des media amovibles
udevil.enable = true; 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";
}; };
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.officeSuite && flags.graphical) { mkIf (cfg.officeSuite && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -24,12 +24,12 @@ mkIf (flags.officeSuite && flags.graphical) {
## Editeur de texte ## Editeur de texte
#lyx # surcouche WISIWIM à LaTeX #lyx # surcouche WISIWIM à LaTeX
#focuswriter # outil pour l'écriture #focuswriter # outil pour l'écriture
#textadept # un éditeur de texte facile pour copier-coller graphique textadept # un éditeur de texte facile pour copier-coller graphique
#zim # outil de prise de notes, wiki de bureau #zim # outil de prise de notes, wiki de bureau
## Visionneuse ## Visionneuse
#kde5.okular # pdf #kde5.okular # pdf
#mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque # Supprimé dans NixOS 20.03 mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque
pdfpc # pdf pdfpc # pdf
qpdfview # pdf qpdfview # pdf
gqview # visionneuse image & gestion basique de collection gqview # visionneuse image & gestion basique de collection

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.conception-assistee && flags.graphical) { mkIf (cfg.conception-assistee && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.cartographie && flags.graphical) { mkIf (cfg.cartographie && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
# TODO: ménage
mkIf (flags.internetSuite && flags.graphical) { mkIf (cfg.internetSuite && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -18,8 +18,9 @@ environment.systemPackages = with pkgs; [
firefox firefox
## Mail & Discussion (texte, audio) ## Mail & Discussion (texte, audio)
claws-mail clawsMail
hexchat hexchat
quassel
quasselClient quasselClient
mumble mumble
pidgin pidgin
@ -27,7 +28,23 @@ environment.systemPackages = with pkgs; [
# Transfert de fichier # Transfert de fichier
filezilla filezilla
transmission-gtk transmission_gtk
transmission-remote-gtk transmission_remote_gtk
]; ];
nixpkgs.config.packageOverrides = pkgs: {
clawsMail = pkgs.clawsMail.override {
enablePluginFancy = false; # nécessite wekitgtk qui est troué
enablePluginPdf = true;
enablePluginRavatar = true;
enablePluginSmime = true;
enablePluginVcalendar = true;
enableSpellcheck = true;
};
mumble = pkgs.mumble.override { pulseSupport = true; };
};
#nixpkgs.config.permittedInsecurePackages = [
# "webkitgtk-2.4.11" # pour que le plugin fancy de claws-mail fonctionne
#];
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (true && flags.graphical) { mkIf (true && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,9 +2,9 @@
let let
#inherit (lib) mkIf mkMerge mkThenElse; #inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
{ {
@ -26,7 +26,6 @@ in
./edition-photo.nix # modifier les photos & assimilé ./edition-photo.nix # modifier les photos & assimilé
./edition-video.nix # modifier les vidéos ./edition-video.nix # modifier les vidéos
./jeux.nix # jouer, tout simplement ;) ./jeux.nix # jouer, tout simplement ;)
./radio.nix # outils pour faire de la radio SDR
## if isDesktop ## if isDesktop
./adminsys.nix # pour gérer le système dans son ensemble et les services ./adminsys.nix # pour gérer le système dans son ensemble et les services

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.developpement-elm && flags.graphical) { mkIf (cfg.developpement-elm && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,17 +2,17 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.developpement-haskell && flags.graphical) { mkIf (cfg.developpement-haskell && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
] ++ (with pkgs.haskellPackages; [ ] ++ (with pkgs.haskellPackages; [
# Haskell lib # Haskell lib
#threadscope # visualisation des threads (<bidule>.eventlog) threadscope # visualisation des threads (<bidule>.eventlog)
]); ]);
} }

@ -2,16 +2,16 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.developpement-java && flags.graphical) { mkIf (cfg.developpement-java && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# IDE # IDE
jetbrains.idea-community # IntelliJ IDEA idea.idea-community # IntelliJ IDEA
]; ];
} }

@ -2,18 +2,18 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.jetbrains-licensed && flags.graphical) { mkIf (cfg.jetbrains-licensed && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
jetbrains.idea-ultimate idea.idea-ultimate
jetbrains.clion idea.clion
jetbrains.datagrip idea.datagrip
jetbrains.pycharm-professional idea.pycharm-professional
]; ];
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.developpement-rust && flags.graphical) { mkIf (cfg.developpement-rust && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,18 +2,18 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.developpement && flags.graphical) { mkIf (cfg.developpement && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Base de données # Base de données
#pgadmin # interface d'administration de postgres ***plus à jour, version openssl dépréciée*** pgadmin # interface d'administration de postgres
#sqlitebrowser # interface d'administration de sqlite sqlitebrowser # interface d'administration de sqlite
# Documentation # Documentation
#zeal # consulter la documentation hors ligne #zeal # consulter la documentation hors ligne
@ -21,6 +21,7 @@ mkIf (flags.developpement && flags.graphical) {
# Gestion des sources # Gestion des sources
#gitg # interface pour utiliser git (historique, commit) #gitg # interface pour utiliser git (historique, commit)
gitstats # génère un site web statique avec des statistiques gitstats # génère un site web statique avec des statistiques
gitAndTools.gitFull # pour gitk
git-cola # interface pour utiliser git (historique, commit) git-cola # interface pour utiliser git (historique, commit)
## Visualisation & outils de diff ## Visualisation & outils de diff

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.edition-musique && flags.graphical) { mkIf (cfg.edition-musique && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.edition-photo && flags.graphical) { mkIf (cfg.edition-photo && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.edition-video && flags.graphical) { mkIf (cfg.edition-video && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.jeux && flags.graphical) { mkIf (cfg.jeux && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,15 +2,20 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.multimediaSuite && flags.graphical) { # TODO ranger le spécifique pulseaudio
mkIf (cfg.multimediaSuite && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## Audio
paprefs # préferences pulseaudio
pavucontrol # mixer pulseaudio
## Video ## Video
smplayer # lecteur vidéo smplayer # lecteur vidéo
vlc # lecteur vidéo vlc # lecteur vidéo

@ -2,20 +2,16 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (true && flags.graphical) { mkIf (true && cfg.graphical) {
# Diagnostic réseau Wireshark (droits fins par le groupe wireshark)
programs.wireshark = {
enable = true;
package = pkgs.wireshark;
};
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## Diagnostic
wireshark
]; ];
} }

@ -1,27 +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 (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
#inspectrum # Tool for analysing captured signals from sdr receivers
];
nixpkgs.config.permittedInsecurePackages = [
"python2.7-Pillow-6.2.2"
];
}

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf (flags.securitySuite && flags.graphical) { mkIf (cfg.securitySuite && cfg.graphical) {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -1,48 +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 {
nixpkgs.config.packageOverrides = pkgs: {
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
enablePluginPdf = true;
enablePluginRavatar = true;
enablePluginSmime = true;
enablePluginVcalendar = true;
enableSpellcheck = true;
};
ffmpeg-full = pkgs.ffmpeg-full.override {
nonfreeLicensing = true;
nvenc = true;
};
# bug connu : https://nixos.org/nix-dev/2014-December/015225.html
# find /nix/store/ -maxdepth 1 -type d -name "*gnuradio-*"
# Commande pour générer le path : find /nix/store/ -maxdepth 1 -type d -name "*gnuradio-*"|paste -d: -s -
gnuradio-with-packages = pkgs.gnuradio-with-packages.override {
extraPackages = with pkgs; [
gnuradio-ais
gnuradio-gsm
gnuradio-nacl
gnuradio-osmosdr # support des dongle Realtek
gnuradio-rds # support du décodage de RDS sur les radio FM
];
};
mumble = pkgs.mumble.override { pulseSupport = true; };
};
#nixpkgs.config.permittedInsecurePackages = [
# "webkitgtk-2.4.11" # pour que le plugin fancy de claws-mail fonctionne
#];
}

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
@ -12,9 +12,7 @@ mkIf true {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Adminsys # Adminsys
bind # utilisé pour les utilitaires comme dig
cowsay # pour ansible & 4lulz cowsay # pour ansible & 4lulz
dhcp # client dhcp
iotop iotop
lm_sensors lm_sensors
lshw lshw
@ -22,15 +20,13 @@ mkIf true {
ntp ntp
powerline-fonts powerline-fonts
powertop powertop
#ansible python27Packages.ansible2
glances python27Packages.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 sysstat # pour la commande "iostat -x -1" de monitoring d'activité disque
usbutils usbutils
# Backup # Backup
duplicity # création de sauvegarde chiffrées (GPG) duplicity # création de sauvegarde chiffrées (GPG)
par2cmdline # outil de récupération de fichiers corrompus - .par2
# Compression # Compression
lz4 lz4
@ -44,7 +40,7 @@ mkIf true {
ntfs3g # ntfs ntfs3g # ntfs
samba # partages windows samba # partages windows
squashfsTools # squashfs squashfsTools # squashfs
sshfs-fuse # ssh sshfsFuse # ssh
## Gestion de FS ## Gestion de FS
nfs-utils nfs-utils
@ -53,6 +49,6 @@ mkIf true {
inotify-tools # être notifié lorsque le contenu d'un répertoire change 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. detox # The detox utility renames files to make them easier to work with.
duff # outil de recherche de fichiers en doublons 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
]; ];
} }

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {

@ -2,18 +2,17 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.officeSuite { mkIf cfg.officeSuite {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Bureautique # Bureautique
aspell aspellDicts.fr # correction d'ortographe aspell aspellDicts.fr # correction d'ortographe
python39Packages.grammalecte # correction gramatical
# Gestion de tâche # Gestion de tâche
taskwarrior # gestionnaire de tâches en console taskwarrior # gestionnaire de tâches en console
@ -24,7 +23,7 @@ mkIf flags.officeSuite {
#jekyll # générateur statique de site web #jekyll # générateur statique de site web
#odpdown # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown #odpdown # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown
pandoc pandoc
#haskellPackages.pandoc-citeproc # ***BROKEN*** haskellPackages.pandoc-citeproc
texlive.combined.scheme-full # distribution LaTeX texlive.combined.scheme-full # distribution LaTeX
#texLive # distribution LaTeX de base #texLive # distribution LaTeX de base
#texLiveBeamer # paquets et extensions pour Beamer #texLiveBeamer # paquets et extensions pour Beamer

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.conception-assistee { mkIf cfg.conception-assistee {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.cartographie { mkIf cfg.cartographie {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,29 +2,26 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
# TODO: ménage
mkIf flags.internetSuite { mkIf cfg.internetSuite {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Clients Internet # Clients Internet
## Réseaux sociaux ## Réseaux sociaux
#turses # client twitter en ncurse #python27Packages.turses # client twitter en ncurse
#python39Packages.rainbowstream # client twitter en console python27Packages.rainbowstream # client twitter en console
#rtv # client reddit en console rtv # client reddit en console
## Mail & Discussion (texte, audio) ## Mail & Discussion (texte, audio)
mutt mutt
## Sauvegarde nuagique (cloud storage) ## Sauvegarde nuagique (cloud storage)
#rclone rclone
## P2P
rtorrent # outil de téléchargement de torrent & magnet
]; ];
} }

@ -2,72 +2,41 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
byobu # permet de se déconnecter d'un terminal sans l'arréter bind # utilisé pour les utilitaires comme dig
tig gti lazygit # outil de gestion de version byobu # permet de se déconnecter d'un terminal sans l'aréter
dhcp # client dhcp
git gitAndTools.gitSVN gitAndTools.tig gti # outil de gestion de version
gnumake # pour décrire les recettes de compilation gnumake # pour décrire les recettes de compilation
gnupg # GPG gnupg # GPG
gpm # prise en charge de la souris en console
htop # monitoring htop # monitoring
lsb-release # pour les scripts qui utilisent cet outil (dont byobu) lsb-release # pour les scripts qui utilisent cet outil
#libressl # librairie pour faire du TLS et les algorithmes de crypto par OpenBSD #libressl # librairie pour faire du TLS et les algorithmes de crypto par OpenBSD
ncdu # outil pour voir l'espace utilisé ncdu # outil pour voir l'espace utilisé
par2cmdline # outil de récupération de fichiers corrompus - .par2
p7zip # compression de fichier p7zip # compression de fichier
parted # partitionnement de disque parted # partitionnement de disque
pciutils pciutils
pinentry # pour taper les mots de passe gpg pinentry # pour taper les mots de passe gpg
psmisc # fournis les utilitaires comme killall, fuser, pstree psmisc # fournis les utilitaires comme killall, fuser, pstree
#python # python -- python -m SimpleHTTPServer 8000 python # python -- python -m SimpleHTTPServer 8000
shared-mime-info # MIME info #python34Packages.glances # monitoring
pwgen # générateur de mot de passe
rtorrent # TODO outil de téléchargement de torrent & magnet
tmux # nécessaire pour byobu tmux # nécessaire pour byobu
tree # affiche une arborescence de fichiers et dossiers tree # affiche une arborescence de fichiers et dossiers
usbutils usbutils
(import ./vim.nix)
wget # client HTTP console wget # client HTTP console
which # pour connaitre le chemin d'un exécutable which # pour connaitre le chemin d'un exécutable
]; ];
programs = {
fish.enable = true;
gnupg.agent.enable = 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;
};
};
} }

@ -2,9 +2,9 @@
let let
#inherit (lib) mkIf mkMerge mkThenElse; #inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
{ {
@ -26,8 +26,6 @@ in
./edition-photo.nix # modifier les photos & assimilé ./edition-photo.nix # modifier les photos & assimilé
./edition-video.nix # modifier les vidéos ./edition-video.nix # modifier les vidéos
./jeux.nix # jouer, tout simplement ;) ./jeux.nix # jouer, tout simplement ;)
./radio.nix # outils pour faire de la radio SDR
./vim.nix # vim avec plugins
## if isDesktop ## if isDesktop
./adminsys.nix # pour gérer le système dans son ensemble et les services ./adminsys.nix # pour gérer le système dans son ensemble et les services

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.developpement-elm { mkIf cfg.developpement-elm {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.developpement-haskell { mkIf cfg.developpement-haskell {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -19,18 +19,15 @@ mkIf flags.developpement-haskell {
] ++ (with pkgs.haskellPackages; [ ] ++ (with pkgs.haskellPackages; [
# Haskell lib # Haskell lib
autoproc # ? procmail autoproc # ? procmail
#brittany # formatteur de code darcs # Gestionnaire de version éponyme
#darcs # gestionnaire de version éponyme ghc-mod
#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 hlint # qualite de code, analyse statique de code + astuces & bonnes pratiques
#postgrest # mapper HTTP <-> PostgreSQL #postgrest # mapper HTTP <-> PostgreSQL
servant # génération d'API REST
stylish-haskell # qualité de code stylish-haskell # qualité de code
turtle # genre shell-scripting turtle # genre shell-scripting
# Application perso # Application perso
#hahp hahp
#pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc ***BROKEN***
]); ]);
} }

@ -2,23 +2,20 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.developpement-java { mkIf cfg.developpement-java {
# Installe le paquet + JAVA_HOME
programs.java = {
enable = true;
};
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Systèmes de build autour de java # Java
ant
maven maven
gradle openjdk
]; ];
environment.variables = {
JAVA_HOME = "${pkgs.openjdk}";
};
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.jetbrains-licensed { mkIf cfg.jetbrains-licensed {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,19 +2,17 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.developpement-rust { mkIf cfg.developpement-rust {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Rust # Rust
cargo # récupération des dépendances + compilation projet rust cargo # récupération des dépendances + compilation projet rust
rustc # pour les appels depuis les scripts 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
]; ];
} }

@ -2,35 +2,24 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.developpement { mkIf cfg.developpement {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Build / outil de construction
autobuild
autoconf
automake
# Base de données
pg_top # monitoring de PostgreSQL
sqlite # le moteur de base de données
# C / C++ # C / C++
gcc # pour les appels depuis les scripts gcc # pour les appels depuis les scripts
# Gestion des sources # Gestion des sources
cloc # outil pour compter les lignes de code source cloc # outil pour compter les lignes de code source
git # déjà présent dans "base"
mercurial mercurial
subversion subversion
# spécification
plantuml # diagrammes UML et plus si affinité
# Mono # Mono
#mono46 # interpréteur .NET #mono46 # interpréteur .NET

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.edition-musique { mkIf cfg.edition-musique {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.edition-photo { mkIf cfg.edition-photo {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,15 +2,22 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.edition-video { mkIf cfg.edition-video {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ffmpeg-full # assemblage de flux audio & video en ligne de commande ffmpeg-full # assemblage de flux audio & video en ligne de commande
]; ];
nixpkgs.config.packageOverrides = pkgs: {
ffmpeg-full = pkgs.ffmpeg-full.override {
nonfreeLicensing = true;
nvenc = true;
};
};
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.jeux { mkIf cfg.jeux {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.multimediaSuite { mkIf cfg.multimediaSuite {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
@ -15,18 +15,19 @@ mkIf true {
iperf # outil de mesure de la qualité du réseau iperf # outil de mesure de la qualité du réseau
iptraf-ng # 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 nload # affichage de statisques d'utilisation instantannées du réseau
inetutils telnet
## Diagnostic ## Diagnostic
arp-scan arp-scan
#mtr -> installé plus bas
nmap # outil de scan de port réseau nmap # outil de scan de port réseau
whois whois
]; ];
# https://github.com/NixOS/nixpkgs/issues/30335 # Paquets avec setuid root
# Some programs need SUID wrappers, can be configured further or are started in user sessions. security.wrappers = {
programs.mtr.enable = true; # outil de diagnostic réseau
mtr.source = "${pkgs.mtr}/bin/mtr";
};
networking.firewall = { networking.firewall = {
allowedTCPPorts = [ allowedTCPPorts = [

@ -1,29 +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 flags.radio {
# pour que ça marche
# sudo rmmod dvb_usb_rtl28xxu
# lecture radio FM
# rtl_fm -f 96.9e6 -M wbfm -s 440000 -r 44100 - | aplay -r 44100 -f S16_LE
# rtl_fm -f 96.95e6 -M wbfm -s 441000 -r 44100 - | aplay -r 44100 -f S16_LE -t raw -c 1
# rtl_fm -f 96.95e6 -M wbfm -s 441000 -r 44100 -E deemp - |pv| aplay -r 44100 -f S16_LE -t raw -c 1
# Paquets
environment.systemPackages = with pkgs; [
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
];
hardware.rtl-sdr.enable = true;
}

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.securitySuite { mkIf cfg.securitySuite {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -1,28 +1,20 @@
{pkgs, ... }: with import <nixpkgs> {};
let vim_configurable.customize {
myVim = pkgs.vim_configurable.customize {
# Specifies the vim binary name. # Specifies the vim binary name.
# E.g. set this to "my-vim" and you need to type "my-vim" to open this vim # 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) # This allows to have multiple vim packages installed (e.g. with a different set of plugins)
name = "vim"; name = "vim";
vimrcConfig.customRC = builtins.readFile ./vimrc; vimrcConfig.customRC = builtins.readFile ./vimrc;
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { vimrcConfig.vam.knownPlugins = pkgs.vimPlugins;
start = [ vimrcConfig.vam.pluginDictionaries = [
wombat256-vim { 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-nix"
"wombat256-vim"
]; }
]; ];
opt = [
elm-vim
vim-fish
vim-nix
vimwiki
];
};
};
in {
programs.vim = {
defaultEditor = true;
package = myVim;
};
} }

@ -2,9 +2,6 @@
" This must be first, because it changes other options as a side effect. " This must be first, because it changes other options as a side effect.
set nocompatible set nocompatible
filetype plugin on
syntax on
" allow backspacing over everything in insert mode " allow backspacing over everything in insert mode
set backspace=indent,eol,start set backspace=indent,eol,start
@ -35,10 +32,3 @@ if &t_Co > 8
let &colorcolumn="80,".join(range(120,999),",") let &colorcolumn="80,".join(range(120,999),",")
highlight ColorColumn ctermbg=235 guibg=#2c2d27 highlight ColorColumn ctermbg=235 guibg=#2c2d27
endif 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=''

@ -1,13 +1,16 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let
#inherit (lib) mkIf mkMerge mkThenElse;
cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
{ {
imports = [ imports = [
# moulinette de configuration # moulinette de configuration
/*./config-generator.nix*/ ./config-generator.nix
./options.nix
# Redéfinition d'applications et de modules
./applications/overrides.nix
# subfolders # subfolders
./applications/graphical/default.nix ./applications/graphical/default.nix

@ -5,22 +5,107 @@ let
cfg = config.r6d.config-generator; cfg = config.r6d.config-generator;
pfl = config.r6d.profiles; pfl = config.r6d.profiles;
comp = config.r6d.computers; comp = config.r6d.computers;
host = config.networking.fqdn; host = config.networking.hostName;
annuaire = config.r6d.machines;
currentMachine = annuaire."${config.networking.fqdn}";
flags = currentMachine.configurationFlags;
in in
{ {
# TODO camel case partout # TODO camel case partout
# TODO everything in english # TODO everything in english
# TODO sortir ce qui est privé # TODO sortir ce qui est privé
# TODO portage du système d'annuaire de machines de capgemini
###### interface ###### interface
options = { options = {
#* Utilisé pour afecter des capacités aux machines
r6d.profiles = {
# Domaine
isDubronetwork = mkEnableOption "Pour distinguer les machines dubronetwork.";
isPrunetwork = mkEnableOption "Pour distinguer les machines prunetwork.";
# Utilisation machine
isDesktopEnvironment = mkEnableOption "Pour indiquer une machine avec interface graphique.";
isServer = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
isWorkstation = mkEnableOption "Pour indiquer que la machine sert à travailler.";
};
#* Utilisé dans les fichiers .nix
r6d.config-generator = {
#enable = mkEnableOption "Génération de la configuration d'une machine.";
awesome = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
auto-upgrade = mkEnableOption "Profil pour activer les mises à jour automatiques.";
cartographie = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
database_postgres = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
developpement = mkEnableOption "Profil pour activer les outils de développement";
developpement-elm = mkEnableOption "Profil pour activer les outils de développement Elm";
developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
developpement-java = mkEnableOption "Profil pour activer les outils de développement Java";
developpement-rust = mkEnableOption "Profil pour activer les outils de développement Rust";
docker = mkEnableOption "Profil pour l'utilisation de Docker.";
dovecot = mkEnableOption "Profil pour activer le serveur Dovecot.";
dns_autorite = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
dns_resolveur = mkEnableOption "Profil pour activer un résolveur DNS local.";
edition-musique = mkEnableOption "Profil pour la création/édition de musique.";
edition-photo = mkEnableOption "Profil pour la création/édition de photos.";
edition-video = mkEnableOption "Profil pour la création/édition de video.";
elasticsearch = mkEnableOption "Profil pour activer le service elasticsearch.";
fail2ban = mkEnableOption "Profil pour activer Fail2ban.";
graphical = mkEnableOption "Profil pour activer les applications graphgiques.";
hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra.";
hydra-core = mkEnableOption "Profil pour un serveur hydra.";
kibana = mkEnableOption "Profil pour activer le service kibana.";
internetSuite = mkEnableOption "Profil pour la suite de logiciels pour Internet.";
jetbrains-licensed = mkEnableOption "Profil pour la suite de développement Jetbrains payante (sous-ensemble).";
jeux = mkEnableOption "Profil pour les jeux vidéos.";
laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.";
locate = mkEnableOption "Profil pour activer la fonction locate.";
mailboxes = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
multimediaSuite = mkEnableOption "Profil pour la suite multimédia.";
murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
nix-serve-client = mkEnableOption "Profil pour que la machine soit un client de cache nix.";
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";
print = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
pulseaudio = mkEnableOption "Profil pour activer pulseaudio.";
rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
radicale = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
scanner = mkEnableOption "Profil pour que les scanners soient utilisable.";
securitySuite = mkEnableOption "Profil pour la suite de logiciels de sécurité.";
smokeping = mkEnableOption "Profil pour activer le monitoring réseau par smokeping.";
swap = mkEnableOption "Profil pour que le swap soit activé.";
virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
znc = mkEnableOption "Profil pour activer le relais IRC ZNC.";
tincAddress = mkOption {
default = "";
example = "192.168.1.1";
description = "Adresse du noeud tinc local";
type = lib.types.string;
};
tincExtraConfig = mkOption {
default = "";
example = ''
Mode = router
ConnecTo = bar
'';
description = "Configuration supplémentaire pour tinc";
type = lib.types.string;
};
};
#* Utilisé pour avoir des raccourcis de machine #* Utilisé pour avoir des raccourcis de machine
r6d.computers = { r6d.computers = {
isHydra = mkEnableOption "Identification du nom de machine.";
isLatitude = mkEnableOption "Identification du nom de machine.";
isMonstre = mkEnableOption "Identification du nom de machine.";
isNeoNomade = mkEnableOption "Identification du nom de machine.";
isNomade = mkEnableOption "Identification du nom de machine."; isNomade = mkEnableOption "Identification du nom de machine.";
isOcean = mkEnableOption "Identification du nom de machine.";
isPedro = mkEnableOption "Identification du nom de machine.";
isPhenom = mkEnableOption "Identification du nom de machine.";
isRadx = mkEnableOption "Identification du nom de machine.";
isRollo = mkEnableOption "Identification du nom de machine.";
}; };
}; };
@ -30,26 +115,295 @@ in
config = mkMerge config = mkMerge
[ [
## Définition des profils génériques ## Définition des profils génériques
(mkIf pfl.isDesktopEnvironment {
r6d.config-generator = {
awesome = true;
internetSuite = true;
multimediaSuite = true;
officeSuite = true;
pulseaudio = true;
securitySuite = true;
};
})
(mkIf (pfl.isServer && !comp.isMonstre) {
r6d.config-generator = {
#database_postgres = true;
dns_autorite = true;
#dns_resolveur = true;
# inutile d'exposer la conf complète du serveur par le store tant qu'il n'y a pas de protection complémentaire - utilisation SSH ?
#nix-serve-server = true;
smokeping = true;
#rabbitmq = true;
};
})
# /!\ PAS un serveur # /!\ PAS un serveur
(mkIf (!pfl.isServer || comp.isMonstre) { (mkIf (!pfl.isServer || comp.isMonstre) {
r6d.config-generator = { r6d.config-generator = {
dns_resolveur = true; dns_resolveur = true;
}; };
}) })
(mkIf pfl.isWorkstation {
r6d.profiles.isDesktopEnvironment = true;
r6d.config-generator = {
docker = true;
graphical = true;
};
})
## Profils liés à Dubronetwork
(mkIf pfl.isDubronetwork {
r6d.config-generator = {
auto-upgrade = true;
locate = true;
print = true;
};
})
(mkIf (pfl.isDubronetwork && pfl.isWorkstation) {
r6d.config-generator = {
cartographie = true;
conception-assistee = true;
docker = true;
developpement = true;
developpement-elm = true;
developpement-haskell = true;
developpement-java = true;
developpement-rust = true;
edition-musique = true;
edition-photo = true;
edition-video = true;
scanner = true;
virtualbox = true;
xmonad = true;
};
})
## Profils liés à Prunetwork
(mkIf pfl.isPrunetwork {
r6d.config-generator = {
auto-upgrade = true;
docker = true;
locate = true;
fail2ban = true;
smokeping = true;
swap = true;
};
})
(mkIf (pfl.isPrunetwork && pfl.isWorkstation) {
r6d.config-generator = {
cartographie = true;
conception-assistee = true;
docker = true;
developpement = true;
#developpement-elm = true;
developpement-haskell = true;
developpement-java = true;
developpement-rust = true;
edition-musique = true;
edition-photo = true;
edition-video = true;
hydra-core = false; # DO NOT ENABLE ON WORKSTATION, YOU CAN CRASH YOUR SYSTEM
print = true;
scanner = true;
#virtualbox = true;
#xmonad = true;
};
})
## Affectation des profils aux machines ## Affectation des profils aux machines
(mkIf comp.isHydra {
networking.hostName = "hydra.prunetwork.fr"; # Define your hostname.
r6d.profiles = {
isPrunetwork = true;
isServer = true;
};
r6d.config-generator = {
docker = true;
hydra-builder = true;
hydra-core = true;
nix-serve-server = true;
tincAddress = "192.168.12.9/24";
tincExtraConfig = ''
ConnectTo = rollo_dubronetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
};
})
(mkIf comp.isOcean {
networking.hostName = "ocean.prunetwork.fr"; # Define your hostname.
r6d.profiles = {
isPrunetwork = true;
isServer = true;
};
r6d.config-generator = {
docker = true;
hydra-builder = true;
radicale = true;
nix-serve-client = true;
nix-serve-server = true;
tincAddress = "192.168.12.6/24";
tincExtraConfig = ''
ConnectTo = hydra_prunetwork_fr
ConnectTo = rollo_dubronetwork_fr
'';
};
})
(mkIf comp.isRadx {
networking.hostName = "radx.prunetwork.fr"; # Define your hostname.
r6d.profiles = {
isPrunetwork = true;
isWorkstation = true;
};
r6d.config-generator = {
database_postgres = true;
elasticsearch = true;
#hydra-core = false; # DO NOT ENABLE ON WORKSTATION
kibana = true;
nix-serve-client = true;
nix-serve-server = true;
rabbitmq = true;
tincAddress = "192.168.12.3/24";
tincExtraConfig = ''
ConnectTo = monstre_dubronetwork_fr
ConnectTo = rollo_dubronetwork_fr
ConnectTo = hydra_prunetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
virtualbox = true;
};
})
(mkIf comp.isLatitude {
networking.hostName = "latitude.dubronetwork.fr"; # Define your hostname.
r6d.profiles = {
isDubronetwork = true;
isWorkstation = true;
};
r6d.config-generator = {
jetbrains-licensed = true;
laptop = true;
nix-serve-client = true;
nix-serve-server = true;
tincAddress = "192.168.12.2/24";
tincExtraConfig = ''
ConnectTo = monstre_dubronetwork_fr
ConnectTo = rollo_dubronetwork_fr
ConnectTo = hydra_prunetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
};
})
(mkIf comp.isMonstre {
networking.hostName = "monstre.dubronetwork.fr"; # Define your hostname.
r6d.profiles = {
isDubronetwork = true;
isServer = true;
};
r6d.config-generator = {
fail2ban = true;
murmur = true;
nix-serve-client = true;
nix-serve-server = true;
nixStoreProxyCache = true;
tincAddress = "192.168.12.4/24";
tincExtraConfig = ''
ConnectTo = rollo_dubronetwork_fr
ConnectTo = hydra_prunetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
};
})
(mkIf comp.isNeoNomade{
networking.hostName = "neo-nomade.dubronetwork.fr"; # Define your hostname.
r6d.profiles = {
isDubronetwork = true;
isDesktopEnvironment = true;
};
r6d.config-generator = {
laptop = true;
graphical = true;
scanner = true;
tincAddress = "192.168.12.7/24";
tincExtraConfig = ''
ConnectTo = monstre_dubronetwork_fr
ConnectTo = rollo_dubronetwork_fr
ConnectTo = hydra_prunetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
};
})
# Dubro Vivo - St Malo # Dubro Vivo - St Malo
#tincAddress = "192.168.12.8/24"; #tincAddress = "192.168.12.8/24";
(mkIf comp.isNomade{ (mkIf comp.isNomade{
networking.hostName = "nomade"; # Define your hostname. networking.hostName = "nomade.dubronetwork.fr"; # Define your hostname.
networking.domain = "dubronetwork.fr";
r6d.profiles.isDubronetwork = true; r6d.profiles.isDubronetwork = true;
r6d.config-generator = { r6d.config-generator = {
laptop = true; laptop = true;
}; };
}) })
(mkIf comp.isPedro {
r6d.profiles = {
isDubronetwork = true;
isServer = true;
};
r6d.config-generator = {
fail2ban = true;
};
})
(mkIf comp.isPhenom {
networking.hostName = "phenom.dubronetwork.fr"; # Define your hostname.
r6d.profiles = {
isDubronetwork = true;
isWorkstation = true;
};
r6d.config-generator = {
jetbrains-licensed = true;
#hydra-core = true;
nix-serve-client = true;
nix-serve-server = true;
edition-photo = true;
tincAddress = "192.168.12.1/24";
tincExtraConfig = ''
ConnectTo = monstre_dubronetwork_fr
ConnectTo = rollo_dubronetwork_fr
ConnectTo = hydra_prunetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
};
})
(mkIf comp.isRollo {
networking.hostName = "rollo.dubronetwork.fr"; # Define your hostname.
r6d.profiles = {
isDubronetwork = true;
isServer = true;
};
r6d.config-generator = {
dovecot = true;
fail2ban = true;
mailboxes = true;
murmur = true;
nix-serve-client = true;
nix-serve-server = true;
tincAddress = "192.168.12.5/24";
tincExtraConfig = ''
ConnectTo = hydra_prunetwork_fr
ConnectTo = ocean_prunetwork_fr
'';
virtualbox = true;
znc = true;
};
})
]; ];
} }

@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkMerge mkThenElse;
cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf cfg.auto-upgrade {
# Automatic update & automatic clean
system.autoUpgrade.enable = true;
nix.gc.automatic = true;
}

@ -2,13 +2,13 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
# TODO: rc.lua par défaut (système) # TODO: rc.lua par défaut (système)
mkIf flags.awesome { mkIf cfg.awesome {
environment.variables = { environment.variables = {
# Export the current path for the awesome derivation, useful for users rc.lua # Export the current path for the awesome derivation, useful for users rc.lua
@ -20,6 +20,4 @@ mkIf flags.awesome {
# #
AWESOME_CONFIG_DIR = "${pkgs.awesome}"; AWESOME_CONFIG_DIR = "${pkgs.awesome}";
}; };
environment.etc."xdg/awesome/rc.lua".text = builtins.readFile ./../public/config-awesome-4-rc.lua;
} }

@ -1,7 +1,4 @@
# Git information in prompt # Définition des couleurs du prompt
. /run/current-system/sw/share/bash-completion/completions/git-prompt.sh
# Prompt colors
if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
PS1_USER='\[$(tput setaf 27)\]' PS1_USER='\[$(tput setaf 27)\]'
PS1_HOST='\[$(tput setaf 37)\]' PS1_HOST='\[$(tput setaf 37)\]'
@ -21,12 +18,10 @@ fi
BOLD='\[$(tput bold)\]' BOLD='\[$(tput bold)\]'
RESET='\[$(tput sgr0)\]' RESET='\[$(tput sgr0)\]'
# Username or red color if root # Définition du prompt
if [ $UID = 0 ]; then if [ $UID = 0 ]; then
PS1_ID=$PS1_ROOT PS1_ID=$PS1_ROOT
else else
PS1_ID=$PS1_USER'\u'$PS1_MISC@$PS1_HOST PS1_ID=$PS1_USER'\u'$PS1_MISC@$PS1_HOST
fi fi
# Prompt definition
PS1=$RESET$BOLD$PS1_ID'\h '$PS1_PATH'\w'$PS1_GIT'$(__git_ps1)'"\n"$PS1_MISC'\$ '$RESET PS1=$RESET$BOLD$PS1_ID'\h '$PS1_PATH'\w'$PS1_GIT'$(__git_ps1)'"\n"$PS1_MISC'\$ '$RESET

@ -2,9 +2,9 @@
let let
#inherit (lib) mkIf mkMerge mkThenElse; #inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
{ {
@ -15,14 +15,13 @@ in
./localisation.nix ./localisation.nix
./network.nix ./network.nix
#./network-ipv6.nix #./network-ipv6.nix
./u2f.nix
./udev.nix ./udev.nix
# commandées par config-generator # commandées par config-generator
## option de configuration spécifique ## option de configuration spécifique
./auto-upgrade.nix # mise à jour automatique du système
./awesome.nix # pour le gestionaire de fenêtres awesome ./awesome.nix # pour le gestionaire de fenêtres awesome
./laptop.nix # appli & configuration adaptée pour un PC portable ./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 ./swap.nix # définition de l'utilisation du swap
]; ];
} }

@ -2,14 +2,18 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
# TODO: ménage
{ {
# 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. # The NixOS release to be compatible with for stateful data such as databases.
system.stateVersion = "19.09"; system.stateVersion = "17.03";
# copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix) # 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; system.copySystemConfiguration = true;
@ -17,16 +21,12 @@ in
# On autorise les paquets non-libres # On autorise les paquets non-libres
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# Lancement de dbus pour les utilisateurs
services.dbus.socketActivated = true;
# NixOS Hardening # NixOS Hardening
#security.grsecurity.enable = true; #security.grsecurity.enable = true;
# Ménage de /tmp au boot
boot.cleanTmpDir = true;
# Activation des pages de manuel
documentation.man.enable = true;
# Paquets # Paquets
environment = { environment = {
shellAliases = { shellAliases = {
@ -43,6 +43,7 @@ in
vi = "vim"; vi = "vim";
byobu-adminsys = "/etc/nixos/base/byobu-adminsys"; byobu-adminsys = "/etc/nixos/base/byobu-adminsys";
}; };
etc.gitconfig.text = builtins.readFile ./gitconfig;
}; };
programs.bash = { programs.bash = {
enableCompletion = true; enableCompletion = true;
@ -57,7 +58,7 @@ in
# Host keys the client accepts - order here is honored by OpenSSH # Host keys the client accepts - order here is honored by OpenSSH
HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256 HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256 KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp256,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256
MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
''; '';

@ -0,0 +1,26 @@
# 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
[push]
default = simple
[core]
editor = /usr/bin/env vim

@ -2,39 +2,32 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.laptop { mkIf cfg.laptop {
# Gestion spécifique pour PC portable # Gestion spécifique pour PC portable
## Gestion de l'énergie ## Gestion de l'énergie
services.tlp.enable = true; powerManagement.cpuFreqGovernor = "powersave";
## Activation d'un gestionnaire de réseau ## Activation d'un gestionnaire de réseau
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
hardware.bluetooth = { hardware.bluetooth.enable = true;
enable = true;
powerOnBoot = false;
};
# Gestion graphique du réseau dans la barre système
programs.nm-applet.enable = true;
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
networkmanagerapplet # gestionnaire réseau graphique + console (nm-applet + nmtui)
wirelesstools # fournis iwconfig wirelesstools # fournis iwconfig
blueman # outils bluetooth (manager, system tray)
cbatticon # status de la batterie dans le system tray
]; ];
# Services # Services
services.blueman.enable = true; services.xserver.synaptics = {
services.xserver.libinput = {
enable = true; enable = true;
twoFingerScroll = true;
}; };
} }

@ -2,19 +2,17 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
# Select internationalisation properties. # Select internationalisation properties.
console = {
font = "Lat2-Terminus16";
keyMap = "fr";
};
i18n = { i18n = {
consoleFont = "Lat2-Terminus16";
consoleKeyMap = "fr";
defaultLocale = "fr_FR.UTF-8"; defaultLocale = "fr_FR.UTF-8";
}; };

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
@ -23,7 +23,6 @@ mkIf true {
"net.ipv6.conf.default.temp_valid_lft" = 3600; # 1 heure "net.ipv6.conf.default.temp_valid_lft" = 3600; # 1 heure
"net.ipv6.conf.default.use_tempaddr" = 2; # activé "net.ipv6.conf.default.use_tempaddr" = 2; # activé
# Activation du routage
"net.ipv6.conf.all.forwarding" = true; "net.ipv6.conf.all.forwarding" = true;
"net.ipv6.conf.default.forwarding" = true; "net.ipv6.conf.default.forwarding" = true;
}; };

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
@ -13,10 +13,9 @@ mkIf true {
# Il s'avère que hostname vérifie la validité du FQDN et du reverse. # 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 # Fixer ces paramètres dans les hosts permet de faire tomber en marche
networking.extraHosts = '' networking.extraHosts = ''
127.0.0.1 ${config.networking.fqdn} ${config.networking.hostName} 127.0.0.1 ${config.networking.hostName}
''; '';
# Activation du routage
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.ipv4.conf.all.forwarding" = true; "net.ipv4.conf.all.forwarding" = true;
"net.ipv4.conf.default.forwarding" = true; "net.ipv4.conf.default.forwarding" = true;

@ -1,30 +0,0 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines;
currentMachine = annuaire."${config.networking.fqdn}";
flags = currentMachine.configurationFlags;
in
{
# Automatic update & automatic clean
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
cores = 0;
};
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 7d";
};
};
}

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.swap { mkIf cfg.swap {
# Gestion du swap # Gestion du swap

@ -1,41 +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 {
# Ajout du support des yobikey & hyperfido
## source des valeurs udev : https://github.com/Yubico/libu2f-host/blob/master/70-u2f.rules
## source car udev sur nixos semble ancien : https://raw.githubusercontent.com/Yubico/libu2f-host/master/70-old-u2f.rules
services.udev.extraRules = ''
# this udev file should be used with udev older than 188
ACTION!="add|change", GOTO="u2f_end"
# Yubico YubiKey
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0113|0114|0115|0116|0120|0402|0403|0406|0407|0410", GROUP="plugdev", MODE="0660"
# Happlink (formerly Plug-Up) Security KEY
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="f1d0", GROUP="plugdev", MODE="0660"
# Neowave Keydo and Keydo AES
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct}=="f1d0|f1ae", GROUP="plugdev", MODE="0660"
# HyperSecu HyperFIDO
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0880", GROUP="plugdev", MODE="0660"
LABEL="u2f_end"
SUBSYSTEM=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", GROUP="audio", MODE="0666", SYMLINK+="rtl_sdr"
'';
security.pam.u2f.enable = true;
environment.systemPackages = with pkgs; [
libu2f-host
];
}

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf false { mkIf false {

@ -19,6 +19,5 @@
} }
]; ];
environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";}; environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
networking.hostName = "nixos-livecd"; networking.hostName = "nixos-livecd.corp.capgemini.com";
networking.domain = "grudu.net";
} }

@ -1,50 +0,0 @@
let
lib = with import <nixpkgs> {}; pkgs.lib;
profiles = {
isDesktopEnvironment = {
awesome = true;
internetSuite = true;
graphical = true;
multimediaSuite = true;
officeSuite = true;
pulseaudio = true;
securitySuite = true;
};
isWorkstation = {
docker = true;
developpement = true;
developpement-elm = true;
developpement-haskell = true;
developpement-java = true;
developpement-rust = true;
};
#isServer = {
#};
};
in
with lib; rec{
# Apply the profiles (pre-defined + custom) to the whole directory
applyProfilesToDirectory = customProfiles: directory:
lib.mapAttrs (applyProfilesToMachine customProfiles) directory;
# Apply the profiles (pre-defined + custom) to a machine
applyProfilesToMachine = customProfiles: machineName: machineOptions:
{ configurationFlags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configurationFlags;
configurationOptions = machineOptions.configurationOptions;
profiles = machineOptions.profiles;
};
# Generate a set of configuration flags based on profiles
generateFlagsSet = customProfiles: machineProfiles:
let
allProfiles = recursiveUpdate profiles customProfiles;
conditionalFlags = name: value:
if machineProfiles.${name}
then value
else {};
in
foldr (a: b: a // b) {} (mapAttrsToList conditionalFlags allProfiles);
}

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
@ -22,11 +22,4 @@ mkIf true {
allowedUDPPorts = [ allowedUDPPorts = [
]; ];
}; };
} // {
assertions = [
{
assertion = true;
message = "Assetion toujours valide.";
}
];
} }

@ -1,8 +0,0 @@
#!/usr/bin/env bash
EXCLUSION="~$|swp$|swo$"
while inotifywait --exclude $EXCLUSION -r -e modify .
do
$@
done

@ -1,216 +0,0 @@
{ config, lib, pkgs, r6d, ... }:
let
inherit (lib) mkEnableOption mkTextOption mkIf mkMerge mkOption singleton types;
# TODO: Anglish :)
machineOptions = types.submodule {
options = {
configurationFlags = {
#enable = mkEnableOption "Génération de la configuration d'une machine.";
awesome = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
auto-upgrade = mkEnableOption "Profil pour activer les mises à jour automatiques.";
cartographie = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
database_postgres = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
developpement = mkEnableOption "Profil pour activer les outils de développement";
developpement-elm = mkEnableOption "Profil pour activer les outils de développement Elm";
developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
developpement-java = mkEnableOption "Profil pour activer les outils de développement Java";
developpement-rust = mkEnableOption "Profil pour activer les outils de développement Rust";
docker = mkEnableOption "Profil pour l'utilisation de Docker.";
dovecot = mkEnableOption "Profil pour activer le serveur Dovecot.";
dns_autorite = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
dns_resolveur = mkEnableOption "Profil pour activer un résolveur DNS local.";
edition-musique = mkEnableOption "Profil pour la création/édition de musique.";
edition-photo = mkEnableOption "Profil pour la création/édition de photos.";
edition-video = mkEnableOption "Profil pour la création/édition de video.";
elasticsearch = mkEnableOption "Profil pour activer le service elasticsearch.";
fail2ban = mkEnableOption "Profil pour activer Fail2ban.";
graphical = mkEnableOption "Profil pour activer les applications graphgiques.";
hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra.";
hydra-core = mkEnableOption "Profil pour un serveur hydra.";
kibana = mkEnableOption "Profil pour activer le service kibana.";
internetSuite = mkEnableOption "Profil pour la suite de logiciels pour Internet.";
jetbrains-licensed = mkEnableOption "Profil pour la suite de développement Jetbrains payante (sous-ensemble).";
jeux = mkEnableOption "Profil pour les jeux vidéos.";
laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.";
locate = mkEnableOption "Profil pour activer la fonction locate.";
mailboxes = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
multimediaSuite = mkEnableOption "Profil pour la suite multimédia.";
munin = mkEnableOption "Profil pour activer la supervision par Munin";
murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
nixos-manual = mkEnableOption "Profil pour activer la documentation nixos en local sur un TTY";
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.";
radio = mkEnableOption "Profil pour activer les outils pour faire de radio numérique - SDR.";
radicale = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
rmilter = mkEnableOption "Profil pour activer le filtrage de mails par postfix.";
scanner = mkEnableOption "Profil pour que les scanners soient utilisable.";
securitySuite = mkEnableOption "Profil pour la suite de logiciels de sécurité.";
smokeping = mkEnableOption "Profil pour activer le monitoring réseau par smokeping.";
swap = mkEnableOption "Profil pour que le swap soit activé.";
virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
znc = mkEnableOption "Profil pour activer le relais IRC ZNC.";
};
configurationOptions = {
ipAddress = mkOption {
description = "Adresse IP.";
type = lib.types.str;
};
nix-serve-server = mkEnableOption "nix-serve server.";
nix-serve-client = {
enable = mkEnableOption "nix-serve client";
servers = mkOption {
default = [ https://cache.nixos.org/ ];
description = "List of nix-serve servers providing binary caches.";
type = types.listOf types.str;
};
};
tinc = {
enable = mkEnableOption "Enable tinc service.";
dnsFQDN = mkOption {
example = "device.example.net.";
description = "DNS name of host pointing to tunnel IP.";
type = lib.types.str;
};
connectToAddress = mkOption {
default = "";
example = "192.168.1.1";
description = "External address to connect from another node.";
type = lib.types.str;
};
vpnAddress = mkOption {
example = "192.168.69.69/24";
description = "VPN local node IP address.";
type = lib.types.str;
};
vpnCidrLength = mkOption {
default = 24;
example = 24;
description = "VPN netmask length.";
type = lib.types.int;
};
extraConfig = mkOption {
default = "";
example = ''
Mode = router
ConnecTo = bar
'';
description = "Configuration supplémentaire pour tinc.";
type = lib.types.str;
};
};
quagga = {
enable = mkEnableOption "Enable Quagga + BGP service";
bgpConfig = mkOption {
type = types.lines;
default = "";
example =''
router bgp 65001
neighbor 10.0.0.1 remote-as 65001
'';
description = ''
BGP configuration statements.
'';
};
};
windowsBoot = {
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.str;
default = "hd0,1";
};
};
windowsMount ={
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.str;
default = "/dev/sda2";
};
};
};
profiles = {
# Domaine
isDubronetwork = mkEnableOption "Pour distinguer les machines dubronetwork.";
isDubronetworkServer = mkEnableOption "Pour distinguer les machines dubronetwork avec Server.";
isDubronetworkWorkstation = mkEnableOption "Pour distinguer les machines dubronetwork avec Workstation.";
isPrunetwork = mkEnableOption "Pour distinguer les machines prunetwork.";
isPrunetworkServer = mkEnableOption "Pour distinguer les machines prunetwork avec Server.";
isPrunetworkWorkstation = mkEnableOption "Pour distinguer les machines prunetwork avec Workstation.";
# Utilisation machine
isDesktopEnvironment = mkEnableOption "Pour indiquer une machine avec interface graphique.";
isServer = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
isWorkstation = mkEnableOption "Pour indiquer que la machine sert à travailler.";
};
};
};
annuaire = config.r6d.machines;
currentMachine = annuaire."${config.networking.fqdn}";
flags = currentMachine.configurationFlags;
in
{
options = {
r6d.machines = mkOption {
type = types.attrsOf machineOptions;
description = ''
Machines directory.
'';
};
};
config = {
/**
prototype : (expression A ) && tests || !(expression A) -> réalise le test si A est satisfait, et continue sinon = pas de politique
*/
assertions = [
{
assertion = (currentMachine.profiles.isWorkstation && (currentMachine.configurationFlags.graphical == true))
|| (!currentMachine.profiles.isWorkstation);
message = "A workstation requires a graphical environement.";
}
{
assertion = (currentMachine.profiles.isDesktopEnvironment && (currentMachine.configurationFlags.graphical == true))
|| (!currentMachine.profiles.isDesktopEnvironment);
message = "A desktop station requires a graphical environement.";
}
{
assertion = (currentMachine.profiles.isDesktopEnvironment && (config.services.xserver.enable == true))
|| (!currentMachine.profiles.isDesktopEnvironment);
message = "You need to enable xserver manually.";
}
{
assertion = (currentMachine.profiles.isServer && (currentMachine.profiles.isDesktopEnvironment == false))
|| (!currentMachine.profiles.isServer);
message = "A graphical environment is not required for a server.";
}
{
/* At least one (authorité or resolveur) */
assertion = flags.dns_autorite || flags.dns_resolveur;
message = "DNS service is disabled. You must enable a dns recursor or autoritative.";
}
{
/* authorité xor resolveur */
assertion = (flags.dns_autorite && ! flags.dns_resolveur)
|| (!flags.dns_autorite && flags.dns_resolveur);
message = "Both authoritative and recursor DNS services can't be live simultaneously. Choose only one!";
}
];
};
}

@ -18,11 +18,9 @@ local hotkeys_popup = require("awful.hotkeys_popup").widget
-- Check if awesome encountered an error during startup and fell back to -- Check if awesome encountered an error during startup and fell back to
-- another config (This code will only ever execute for the fallback config) -- another config (This code will only ever execute for the fallback config)
if awesome.startup_errors then if awesome.startup_errors then
naughty.notify({ naughty.notify({ preset = naughty.config.presets.critical,
preset = naughty.config.presets.critical,
title = "Oops, there were errors during startup!", title = "Oops, there were errors during startup!",
text = awesome.startup_errors text = awesome.startup_errors })
})
end end
-- Handle runtime errors after startup -- Handle runtime errors after startup
@ -33,11 +31,9 @@ do
if in_error then return end if in_error then return end
in_error = true in_error = true
naughty.notify({ naughty.notify({ preset = naughty.config.presets.critical,
preset = naughty.config.presets.critical,
title = "Oops, an error happened!", title = "Oops, an error happened!",
text = tostring(err) text = tostring(err) })
})
in_error = false in_error = false
end) end)
end end
@ -106,17 +102,13 @@ myawesomemenu = {
{ "quit", function() awesome.quit() end} { "quit", function() awesome.quit() end}
} }
mymainmenu = awful.menu({ mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
items = {
{ "awesome", myawesomemenu, beautiful.awesome_icon },
{ "open terminal", terminal } { "open terminal", terminal }
} }
}) })
mylauncher = awful.widget.launcher({ mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
image = beautiful.awesome_icon, menu = mymainmenu })
menu = mymainmenu
})
-- Menubar configuration -- Menubar configuration
menubar.utils.terminal = terminal -- Set the terminal for applications that require it menubar.utils.terminal = terminal -- Set the terminal for applications that require it
@ -131,51 +123,24 @@ mytextclock = wibox.widget.textclock()
-- Create a wibox for each screen and add it -- Create a wibox for each screen and add it
local taglist_buttons = awful.util.table.join( local taglist_buttons = awful.util.table.join(
awful.button( awful.button({ }, 1, function(t) t:view_only() end),
{ }, awful.button({ modkey }, 1, function(t)
1,
function(t) t:view_only() end
),
awful.button(
{ modkey },
1,
function(t)
if client.focus then if client.focus then
client.focus:move_to_tag(t) client.focus:move_to_tag(t)
end end
end end),
), awful.button({ }, 3, awful.tag.viewtoggle),
awful.button( awful.button({ modkey }, 3, function(t)
{ },
3,
awful.tag.viewtoggle
),
awful.button(
{ modkey },
3,
function(t)
if client.focus then if client.focus then
client.focus:toggle_tag(t) client.focus:toggle_tag(t)
end end
end end),
), awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
awful.button( awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
{ },
4,
function(t) awful.tag.viewnext(t.screen) end
),
awful.button(
{ },
5,
function(t) awful.tag.viewprev(t.screen) end
)
) )
local tasklist_buttons = awful.util.table.join( local tasklist_buttons = awful.util.table.join(
awful.button( awful.button({ }, 1, function (c)
{ },
1,
function (c)
if c == client.focus then if c == client.focus then
c.minimized = true c.minimized = true
else else
@ -190,28 +155,14 @@ local tasklist_buttons = awful.util.table.join(
client.focus = c client.focus = c
c:raise() c:raise()
end end
end end),
), awful.button({ }, 3, client_menu_toggle_fn()),
awful.button( awful.button({ }, 4, function ()
{ },
3,
client_menu_toggle_fn()
),
awful.button(
{ },
4,
function ()
awful.client.focus.byidx(1) awful.client.focus.byidx(1)
end end),
), awful.button({ }, 5, function ()
awful.button(
{ },
5,
function ()
awful.client.focus.byidx(-1) awful.client.focus.byidx(-1)
end end))
)
)
local function set_wallpaper(s) local function set_wallpaper(s)
-- Wallpaper -- Wallpaper
@ -225,70 +176,10 @@ local function set_wallpaper(s)
end end
end end
local iostat_tooltiptext = ""
-- Widget de monitoring de l'activité des disques https://awesomewm.org/recipes/watch/
-- disk I/O using iostat from sysstat utilities
local iotable = {}
local iostat = awful.widget.watch("iostat -dm -y 1 1", 2, -- in Kb, use -dm for Mb
function(widget, stdout)
for line in stdout:match("(sd.*)\n"):gmatch("(.-)\n") do
local device, tps, read_s, wrtn_s, read, wrtn =
line:match("(%w+)%s*(%d+,?%d*)%s*(%d+,?%d*)%s*(%d+,?%d*)%s*(%d+,?%d*)%s*(%d+,?%d*)")
-- [1] [2] [3] [4] [5]
iotable[device] = { tps, read_s, wrtn_s, read, wrtn }
end
local label = ""
for device,values in spairs(iotable) do
label = label..(device..": "..iotable[device][2].." MB_read/s |"..iotable[device][3].." MB_wrtn/s").."\n"
end
iostat_tooltiptext = label
-- customize here
--widget:set_text("sda: "..iotable["sda"][2].."/"..iotable["sda"][3]) -- read_s/wrtn_s
widget:set_text("iostat")
end
)
iostat_t = awful.tooltip({
--objects = { },
timer_function = function()
return iostat_tooltiptext
end,
})
iostat_t:add_to_object(iostat)
-- tris d'un tableau par la clef https://stackoverflow.com/questions/15706270/sort-a-table-in-lua
function spairs(t, order)
-- collect the keys
local keys = {}
for k in pairs(t) do keys[#keys+1] = k end
-- if order function given, sort by it by passing the table and keys a, b,
-- otherwise just sort the keys
if order then
table.sort(keys, function(a,b) return order(t, a, b) end)
else
table.sort(keys)
end
-- return the iterator function
local i = 0
return function()
i = i + 1
if keys[i] then
return keys[i], t[keys[i]]
end
end
end
-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
screen.connect_signal("property::geometry", set_wallpaper) screen.connect_signal("property::geometry", set_wallpaper)
awful.screen.connect_for_each_screen( awful.screen.connect_for_each_screen(function(s)
function(s)
-- Wallpaper -- Wallpaper
set_wallpaper(s) set_wallpaper(s)
@ -304,8 +195,7 @@ awful.screen.connect_for_each_screen(
awful.button({ }, 1, function () awful.layout.inc( 1) end), awful.button({ }, 1, function () awful.layout.inc( 1) end),
awful.button({ }, 3, function () awful.layout.inc(-1) end), awful.button({ }, 3, function () awful.layout.inc(-1) end),
awful.button({ }, 4, function () awful.layout.inc( 1) end), awful.button({ }, 4, function () awful.layout.inc( 1) end),
awful.button({ }, 5, function () awful.layout.inc(-1) end) awful.button({ }, 5, function () awful.layout.inc(-1) end)))
))
-- Create a taglist widget -- Create a taglist widget
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons)
@ -322,22 +212,18 @@ awful.screen.connect_for_each_screen(
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
mylauncher, mylauncher,
s.mytaglist, s.mytaglist,
s.mypromptbox s.mypromptbox,
}, },
s.mytasklist, -- Middle widget s.mytasklist, -- Middle widget
{ -- Right widgets { -- Right widgets
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
wibox.widget.textbox(' | '),
iostat,
wibox.widget.textbox(' | '),
mykeyboardlayout, mykeyboardlayout,
wibox.widget.systray(), wibox.widget.systray(),
mytextclock, mytextclock,
s.mylayoutbox s.mylayoutbox,
} },
} }
end end)
)
-- }}} -- }}}
-- {{{ Mouse bindings -- {{{ Mouse bindings
@ -350,42 +236,89 @@ root.buttons(awful.util.table.join(
-- {{{ Key bindings -- {{{ Key bindings
globalkeys = awful.util.table.join( globalkeys = awful.util.table.join(
awful.key({ modkey, }, "s", hotkeys_popup.show_help, {description="show help", group="awesome"}), awful.key({ modkey, }, "s", hotkeys_popup.show_help,
awful.key({ modkey, }, "Left", awful.tag.viewprev, {description = "view previous", group = "tag"}), {description="show help", group="awesome"}),
awful.key({ modkey, }, "Right", awful.tag.viewnext, {description = "view next", group = "tag"}), awful.key({ modkey, }, "Left", awful.tag.viewprev,
awful.key({ modkey, }, "Escape", awful.tag.history.restore, {description = "go back", group = "tag"}), {description = "view previous", group = "tag"}),
awful.key({ modkey, }, "Right", awful.tag.viewnext,
awful.key({ modkey, }, "j", function () awful.client.focus.byidx( 1) end, {description = "focus next by index", group = "client"}), {description = "view next", group = "tag"}),
awful.key({ modkey, }, "k", function () awful.client.focus.byidx(-1) end, {description = "focus previous by index", group = "client"}), awful.key({ modkey, }, "Escape", awful.tag.history.restore,
awful.key({ modkey, }, "w", function () mymainmenu:show() end, {description = "show main menu", group = "awesome"}), {description = "go back", group = "tag"}),
awful.key({ modkey, }, "j",
function ()
awful.client.focus.byidx( 1)
end,
{description = "focus next by index", group = "client"}
),
awful.key({ modkey, }, "k",
function ()
awful.client.focus.byidx(-1)
end,
{description = "focus previous by index", group = "client"}
),
awful.key({ modkey, }, "w", function () mymainmenu:show() end,
{description = "show main menu", group = "awesome"}),
-- Layout manipulation -- Layout manipulation
awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, {description = "swap with next client by index", group = "client"}), awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end,
awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, {description = "swap with previous client by index", group = "client"}), {description = "swap with next client by index", group = "client"}),
awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, {description = "focus the next screen", group = "screen"}), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end,
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, {description = "focus the previous screen", group = "screen"}), {description = "swap with previous client by index", group = "client"}),
awful.key({ modkey, }, "u", awful.client.urgent.jumpto, {description = "jump to urgent client", group = "client"}), awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
awful.key({ modkey, }, "Tab", function () awful.client.focus.history.previous() if client.focus then client.focus:raise() end end, {description = "focus the next screen", group = "screen"}),
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
{description = "focus the previous screen", group = "screen"}),
awful.key({ modkey, }, "u", awful.client.urgent.jumpto,
{description = "jump to urgent client", group = "client"}),
awful.key({ modkey, }, "Tab",
function ()
awful.client.focus.history.previous()
if client.focus then
client.focus:raise()
end
end,
{description = "go back", group = "client"}), {description = "go back", group = "client"}),
-- Standard program -- Standard program
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, {description = "open a terminal", group = "launcher"}), awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
awful.key({ modkey, "Control" }, "r", awesome.restart, {description = "reload awesome", group = "awesome"}), {description = "open a terminal", group = "launcher"}),
awful.key({ modkey, "Shift" }, "q", awesome.quit, {description = "quit awesome", group = "awesome"}), awful.key({ modkey, "Control" }, "r", awesome.restart,
awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, {description = "increase master width factor", group = "layout"}), {description = "reload awesome", group = "awesome"}),
awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, {description = "decrease master width factor", group = "layout"}), awful.key({ modkey, "Shift" }, "q", awesome.quit,
awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, {description = "increase the number of master clients", group = "layout"}), {description = "quit awesome", group = "awesome"}),
awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, {description = "decrease the number of master clients", group = "layout"}),
awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end, {description = "increase the number of columns", group = "layout"}), awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end,
awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end, {description = "decrease the number of columns", group = "layout"}), {description = "increase master width factor", group = "layout"}),
awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, {description = "select next", group = "layout"}), awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end,
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, {description = "select previous", group = "layout"}), {description = "decrease master width factor", group = "layout"}),
awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end,
awful.key({ modkey, "Control" }, "n", function () local c = awful.client.restore() --[[ Focus restored client ]] if c then client.focus = c c:raise() end end, {description = "increase the number of master clients", group = "layout"}),
awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end,
{description = "decrease the number of master clients", group = "layout"}),
awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end,
{description = "increase the number of columns", group = "layout"}),
awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end,
{description = "decrease the number of columns", group = "layout"}),
awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end,
{description = "select next", group = "layout"}),
awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end,
{description = "select previous", group = "layout"}),
awful.key({ modkey, "Control" }, "n",
function ()
local c = awful.client.restore()
-- Focus restored client
if c then
client.focus = c
c:raise()
end
end,
{description = "restore minimized", group = "client"}), {description = "restore minimized", group = "client"}),
-- Prompt -- Prompt
awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, {description = "run prompt", group = "launcher"}), awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
{description = "run prompt", group = "launcher"}),
awful.key({ modkey }, "x", awful.key({ modkey }, "x",
function () function ()
@ -398,49 +331,66 @@ globalkeys = awful.util.table.join(
end, end,
{description = "lua execute prompt", group = "awesome"}), {description = "lua execute prompt", group = "awesome"}),
-- Menubar -- Menubar
awful.key({ modkey }, "p", function() menubar.show() end, {description = "show the menubar", group = "launcher"}), awful.key({ modkey }, "p", function() menubar.show() end,
{description = "show the menubar", group = "launcher"}),
-- Lanceurs perso -- Lanceurs perso
awful.key({ modkey }, "F1", function () awful.util.spawn("firefox") end, {description = "Lance Firefox", group = "Lanceurs personnels"}), awful.key({ modkey }, "F1", function () awful.util.spawn("firefox") end),
awful.key({ modkey }, "F2", function () awful.util.spawn("firefox") end, {description = "Lance Firefox", group = "Lanceurs personnels"}), awful.key({ modkey }, "F2", function () awful.util.spawn("firefox") end),
awful.key({ modkey }, "F3", function () awful.util.spawn("gqrx") end, {description = "Lance gqrx", group = "Lanceurs personnels"}), -- awful.key({ modkey }, "F3", function () awful.util.spawn("") end),
awful.key({ modkey }, "F4", function () awful.util.spawn("chromium") end, {description = "Lance Chromium", group = "Lanceurs personnels"}), awful.key({ modkey }, "F4", function () awful.util.spawn("chromium") end),
awful.key({ modkey }, "F5", function () awful.util.spawn("spacefm") end, {description = "Lance spacefm", group = "Lanceurs personnels"}), awful.key({ modkey }, "F5", function () awful.util.spawn("spacefm") end),
awful.key({ modkey }, "F6", function () awful.util.spawn("vlc") end, {description = "Lance vlc", group = "Lanceurs personnels"}), awful.key({ modkey }, "F6", function () awful.util.spawn("vlc") end),
awful.key({ modkey }, "F7", function () awful.util.spawn("claws-mail") end, {description = "Lance claws", group = "Lanceurs personnels"}), awful.key({ modkey }, "F7", function () awful.util.spawn("claws-mail") end),
awful.key({ modkey }, "F11", function () awful.util.spawn("xrandr-auto") end, {description = "Lance le script xrandr-auto", group = "Lanceurs personnels"}), awful.key({ modkey }, "F11", function () awful.util.spawn("xrandr-auto") end),
awful.key({ modkey }, "F12", function () awful.util.spawn("slock") end, {description = "Verouille la session avec slock", group = "Lanceurs personnels"}), awful.key({ modkey }, "F12", function () awful.util.spawn("slock") end),
awful.key({ modkey, "Shift" }, "F1", function () awful.util.spawn("claws-mail") end, {description = "Lance claws", group = "Lanceurs personnels"}), awful.key({ modkey, "Shift" }, "F1", function () awful.util.spawn("claws-mail") end),
awful.key({ modkey, "Shift" }, "F3", function () awful.util.spawn("pcmanfm") end, {description = "Lance pcmanfm", group = "Lanceurs personnels"}), awful.key({ modkey, "Shift" }, "F3", function () awful.util.spawn("pcmanfm") end),
awful.key({ modkey, "Shift" }, "F6", function () awful.util.spawn("clementine") end, {description = "Lance clementine", group = "Lanceurs personnels"}), awful.key({ modkey, "Shift" }, "F6", function () awful.util.spawn("clementine") end),
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)
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, "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), -- awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
) )
clientkeys = awful.util.table.join( clientkeys = awful.util.table.join(
awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen c:raise() end, {description = "toggle fullscreen", group = "client"}), awful.key({ modkey, }, "f",
awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, {description = "close", group = "client"}), function (c)
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , {description = "toggle floating", group = "client"}), c.fullscreen = not c.fullscreen
awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, {description = "move to master", group = "client"}), c:raise()
awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, {description = "move to screen", group = "client"}), end,
awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end, {description = "toggle keep on top", group = "client"}), {description = "toggle fullscreen", group = "client"}),
awful.key({ modkey, }, "n", function (c) --[[ The client currently has the input focus, so it cannot be minimized, since minimized clients can't have the focus. ]] c.minimized = true end , awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end,
{description = "close", group = "client"}),
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ,
{description = "toggle floating", group = "client"}),
awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
{description = "move to master", group = "client"}),
awful.key({ modkey, }, "o", function (c) c:move_to_screen() end,
{description = "move to screen", group = "client"}),
awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end,
{description = "toggle keep on top", group = "client"}),
awful.key({ modkey, }, "n",
function (c)
-- The client currently has the input focus, so it cannot be
-- minimized, since minimized clients can't have the focus.
c.minimized = true
end ,
{description = "minimize", group = "client"}), {description = "minimize", group = "client"}),
awful.key({ modkey, }, "m", function (c) c.maximized = not c.maximized c:raise() end , {description = "maximize", group = "client"}) awful.key({ modkey, }, "m",
function (c)
c.maximized = not c.maximized
c:raise()
end ,
{description = "maximize", group = "client"})
) )
-- Bind all key numbers to tags. -- Bind all key numbers to tags.
-- Be careful: we use keycodes to make it works on any keyboard layout. -- Be careful: we use keycodes to make it works on any keyboard layout.
-- This should map on the top row of your keyboard, usually 1 to 9. -- This should map on the top row of your keyboard, usually 1 to 9.
for i = 1, 9 do for i = 1, 9 do
globalkeys = awful.util.table.join( globalkeys = awful.util.table.join(globalkeys,
globalkeys,
-- View tag only. -- View tag only.
awful.key( awful.key({ modkey }, "#" .. i + 9,
{ modkey },
"#" .. i + 9,
function () function ()
local screen = awful.screen.focused() local screen = awful.screen.focused()
local tag = screen.tags[i] local tag = screen.tags[i]
@ -448,12 +398,9 @@ for i = 1, 9 do
tag:view_only() tag:view_only()
end end
end, end,
{description = "view tag #"..i, group = "tag"} {description = "view tag #"..i, group = "tag"}),
),
-- Toggle tag display. -- Toggle tag display.
awful.key( awful.key({ modkey, "Control" }, "#" .. i + 9,
{ modkey, "Control" },
"#" .. i + 9,
function () function ()
local screen = awful.screen.focused() local screen = awful.screen.focused()
local tag = screen.tags[i] local tag = screen.tags[i]
@ -461,12 +408,9 @@ for i = 1, 9 do
awful.tag.viewtoggle(tag) awful.tag.viewtoggle(tag)
end end
end, end,
{description = "toggle tag #" .. i, group = "tag"} {description = "toggle tag #" .. i, group = "tag"}),
),
-- Move client to tag. -- Move client to tag.
awful.key( awful.key({ modkey, "Shift" }, "#" .. i + 9,
{ modkey, "Shift" },
"#" .. i + 9,
function () function ()
if client.focus then if client.focus then
local tag = client.focus.screen.tags[i] local tag = client.focus.screen.tags[i]
@ -475,12 +419,9 @@ for i = 1, 9 do
end end
end end
end, end,
{description = "move focused client to tag #"..i, group = "tag"} {description = "move focused client to tag #"..i, group = "tag"}),
),
-- Toggle tag on focused client. -- Toggle tag on focused client.
awful.key( awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
{ modkey, "Control", "Shift" },
"#" .. i + 9,
function () function ()
if client.focus then if client.focus then
local tag = client.focus.screen.tags[i] local tag = client.focus.screen.tags[i]
@ -489,8 +430,7 @@ for i = 1, 9 do
end end
end end
end, end,
{description = "toggle focused client on tag #" .. i, group = "tag"} {description = "toggle focused client on tag #" .. i, group = "tag"})
)
) )
end end
@ -507,10 +447,8 @@ root.keys(globalkeys)
-- Rules to apply to new clients (through the "manage" signal). -- Rules to apply to new clients (through the "manage" signal).
awful.rules.rules = { awful.rules.rules = {
-- All clients will match this rule. -- All clients will match this rule.
{ { rule = { },
rule = { }, properties = { border_width = beautiful.border_width,
properties = {
border_width = beautiful.border_width,
border_color = beautiful.border_normal, border_color = beautiful.border_normal,
focus = awful.client.focus.filter, focus = awful.client.focus.filter,
raise = true, raise = true,
@ -520,9 +458,9 @@ awful.rules.rules = {
placement = awful.placement.no_overlap+awful.placement.no_offscreen placement = awful.placement.no_overlap+awful.placement.no_offscreen
} }
}, },
-- Floating clients. -- Floating clients.
{ { rule_any = {
rule_any = {
instance = { instance = {
"DTA", -- Firefox addon DownThemAll. "DTA", -- Firefox addon DownThemAll.
"copyq", -- Includes session name in class. "copyq", -- Includes session name in class.
@ -536,8 +474,8 @@ awful.rules.rules = {
"Wpa_gui", "Wpa_gui",
"pinentry", "pinentry",
"veromix", "veromix",
"xtightvncviewer" "xtightvncviewer"},
},
name = { name = {
"Event Tester", -- xev. "Event Tester", -- xev.
}, },
@ -545,16 +483,11 @@ awful.rules.rules = {
"AlarmWindow", -- Thunderbird's calendar. "AlarmWindow", -- Thunderbird's calendar.
"pop-up", -- e.g. Google Chrome's (detached) Developer Tools. "pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
} }
}, }, properties = { floating = true }},
properties = { floating = true }
},
-- Add titlebars to normal clients and dialogs -- Add titlebars to normal clients and dialogs
{ { rule_any = {type = { "normal", "dialog" }
rule_any = { }, properties = { titlebars_enabled = false }
type = { "normal", "dialog" }
},
properties = { titlebars_enabled = false }
}, },
-- Set Firefox to always map on the tag named "2" on screen 1. -- Set Firefox to always map on the tag named "2" on screen 1.
@ -565,45 +498,33 @@ awful.rules.rules = {
-- {{{ Signals -- {{{ Signals
-- Signal function to execute when a new client appears. -- Signal function to execute when a new client appears.
client.connect_signal( client.connect_signal("manage", function (c)
"manage", -- Set the windows at the slave,
function (c) -- i.e. put it at the end of others instead of setting it master.
--[[ Set the windows at the slave, i.e. put it at the end of others instead of setting it master.]]
-- if not awesome.startup then awful.client.setslave(c) end -- if not awesome.startup then awful.client.setslave(c) end
if awesome.startup and if awesome.startup and
not c.size_hints.user_position not c.size_hints.user_position
and not c.size_hints.program_position then and not c.size_hints.program_position then
--[[ Prevent clients from being unreachable after screen count changes.]] -- Prevent clients from being unreachable after screen count changes.
awful.placement.no_offscreen(c) awful.placement.no_offscreen(c)
end end
end end)
)
-- Add a titlebar if titlebars_enabled is set to true in the rules. -- Add a titlebar if titlebars_enabled is set to true in the rules.
client.connect_signal( client.connect_signal("request::titlebars", function(c)
"request::titlebars",
function(c)
-- buttons for the titlebar -- buttons for the titlebar
local buttons = awful.util.table.join( local buttons = awful.util.table.join(
awful.button( awful.button({ }, 1, function()
{ },
1,
function()
client.focus = c client.focus = c
c:raise() c:raise()
awful.mouse.client.move(c) awful.mouse.client.move(c)
end end),
), awful.button({ }, 3, function()
awful.button(
{ },
3,
function()
client.focus = c client.focus = c
c:raise() c:raise()
awful.mouse.client.resize(c) awful.mouse.client.resize(c)
end end)
)
) )
awful.titlebar(c) : setup { awful.titlebar(c) : setup {
@ -630,19 +551,15 @@ client.connect_signal(
}, },
layout = wibox.layout.align.horizontal layout = wibox.layout.align.horizontal
} }
end end)
)
-- Enable sloppy focus, so that focus follows mouse. -- Enable sloppy focus, so that focus follows mouse.
client.connect_signal( client.connect_signal("mouse::enter", function(c)
"mouse::enter",
function(c)
if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
and awful.client.focus.filter(c) then and awful.client.focus.filter(c) then
client.focus = c client.focus = c
end end
end end)
)
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)

@ -0,0 +1,17 @@
{ supportedSystems ? [ "x86_64-linux" ]
, nixpkgs ? import <nixpkgs> {}
, config ? import ./config-generator.nix
, ...
}:
with (import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems; });
{
#r6d.base = import ./r6d-base.nix;
r6d = {
#= import ./iso-image/configuration.nix;
applications.terminal.cao = import ./applications/terminal/cao.nix {
config = self.config;
};
};
}

@ -2,19 +2,17 @@
let let
#inherit (lib) mkIf mkMerge mkThenElse; #inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
{ {
imports = [ imports = [
# installées systématiquement # installées systématiquement
./gpm.nix
./haveged.nix ./haveged.nix
./monitoring-munin.nix ./monitoring-munin.nix
./ssh.nix ./ssh.nix
./yubikey.nix
# commandées par config-generator # commandées par config-generator
## option de configuration spécifique ## option de configuration spécifique
@ -25,15 +23,12 @@ in
./hydra-build.nix # service de construction de paquet. -> la machine compile des paquets ./hydra-build.nix # service de construction de paquet. -> la machine compile des paquets
./hydra-core.nix # service pour l'instance d'hydra ./hydra-core.nix # service pour l'instance d'hydra
./kibana.nix # service de visualisation de données stockées dans elasticsearch ./kibana.nix # service de visualisation de données stockées dans elasticsearch
# TODO: réactiver locate ./locate.nix # service locate
#./locate.nix # service locate
./nixos-manual.nix # documentation nixos sur TTY
./virtualbox.nix # activer virtualbox ./virtualbox.nix # activer virtualbox
./xmonad/xmonad.nix # pour le gestionaire de fenêtre xmonad ./xmonad/xmonad.nix # pour le gestionaire de fenêtre xmonad
## if isDesktop ## if isDesktop
./pulseaudio.nix # activation du serveur audio ./pulseaudio.nix # activation du serveur audio
./pipewire.nix # activation du serveur audio
./scanner.nix # utilisation d'un scanner ./scanner.nix # utilisation d'un scanner
./x11.nix # activation du serveur graphique X ./x11.nix # activation du serveur graphique X
]; ];

@ -2,19 +2,18 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.docker { mkIf cfg.docker {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Ecosystème Docker # Ecosystème Docker
docker docker
docker-compose python27Packages.docker_compose
lazydocker
]; ];
virtualisation.docker.enable = true; virtualisation.docker.enable = true;

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.elasticsearch { mkIf cfg.elasticsearch {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -1,14 +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 {
# prise en charge de la souris en console
services.gpm.enable = true;
}

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.developpement-haskell { mkIf cfg.developpement-haskell {
services.hoogle = { services.hoogle = {
enable = true; enable = true;

@ -2,40 +2,31 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
# TODO: ménage # TODO: ménage
mkIf flags.hydra-builder { mkIf cfg.hydra-builder {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kvm
qemu qemu
virtualbox kvm
]; ];
# Services # Services
## Services de virtualisation utilisé pour les tests hydra ## Services de virtualisation utilisé pour les tests hydra
virtualisation = { virtualisation.docker.enable = true;
docker.enable = true; virtualisation.libvirtd.enable = true;
libvirtd = { virtualisation.libvirtd.enableKVM = true;
enable = true; #virtualisation.virtualbox.guest.enable = true;
}; virtualisation.virtualbox.host.enable = true;
virtualbox = { virtualisation.virtualbox.host.headless = true;
#guest.enable = true;
host.enable = true;
host.headless = true;
};
};
## Ménage automatique tous les jours - Frequent garbage collection is a good idea for build machines. ## Ménage automatique tous les jours
nix.gc = { nix.gc.automatic = true;
automatic = true;
dates = "*:0/30";
};
# users.users."hydrabld" = { # users.users."hydrabld" = {
# description = "Execution des jobs hydra"; # description = "Execution des jobs hydra";

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
#### https://github.com/NixOS/hydra/issues/413 #### https://github.com/NixOS/hydra/issues/413
@ -23,7 +23,7 @@ let
# hydra-queue-runner --status | json_pp # hydra-queue-runner --status | json_pp
in in
# TODO: passe de ménage # TODO: passe de ménage
mkIf flags.hydra-core { mkIf cfg.hydra-core {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -54,8 +54,8 @@ mkIf flags.hydra-core {
services.hydra = { services.hydra = {
enable = true; enable = true;
hydraURL = "http://hydra.${config.networking.fqdn}"; hydraURL = "http://hydra.${config.networking.hostName}";
notificationSender = "hydra@${config.networking.fqdn}"; notificationSender = "hydra@${config.networking.hostName}";
listenHost = "localhost"; listenHost = "localhost";
minimumDiskFree = 50; # Go minimumDiskFree = 50; # Go
smtpHost = "localhost"; smtpHost = "localhost";
@ -76,7 +76,7 @@ mkIf flags.hydra-core {
### Machines connues ### Machines connues
programs.ssh.knownHosts = { programs.ssh.knownHosts = {
"hydra.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYrZu31+/ybhel7LNPNgsALEoMHwTc1OiTcmJnXZ3He"; "hydra.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHqja/yYsQeS5amZKPUG+EKSIkjEN6fYW54Fzvj1pFaP";
"monstre.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTTrLhq1Cwm0rpnwEIxSLqVrJWZnt+/9dt+SKd8NiIc"; "monstre.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTTrLhq1Cwm0rpnwEIxSLqVrJWZnt+/9dt+SKd8NiIc";
"pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; "pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD";
"ocean.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCaRuTl8iCTUE4XInOpkSlwQj5Re4w4Iq+gNIlJe8pA"; "ocean.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCaRuTl8iCTUE4XInOpkSlwQj5Re4w4Iq+gNIlJe8pA";

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.kibana { mkIf cfg.kibana {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.locate { mkIf cfg.locate {
# Services # Services
services.locate = { services.locate = {

@ -2,13 +2,14 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
# TODO: ajouter option
# TODO: changer adresse mail # TODO: changer adresse mail
mkIf flags.munin { mkIf true {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -21,23 +22,6 @@ mkIf flags.munin {
## Noeud de supervision munin = pas de stockage des données locales ## Noeud de supervision munin = pas de stockage des données locales
services.munin-node = { services.munin-node = {
enable = true; enable = true;
extraConfig = ''
# Ignore the apc_nis plugin, as it throws errors as I don't have an UPS.
# It's there because munin-node-configure is called with the contrib group,
# and the plugin has no method to check whether there's a compatible UPS available.
ignore_file ^apc_nis$
ignore_file ^sensors_-wrapped$
ignore_file ^.sensors_-wrapped$
'';
extraPlugins = {
chrony = /etc/nixos/base/services/munin-chrony;
chrony_tracking_stratum = /etc/nixos/base/services/munin-chrony-tracking-stratum;
chrony_tracking_ppm = /etc/nixos/base/services/munin-chrony-tracking-ppm;
chrony_tracking_time_ = /etc/nixos/base/services/munin-chrony-tracking-time;
chrony_tracking_time_root = /etc/nixos/base/services/munin-chrony-tracking-time-root;
chrony_tracking_update_time = /etc/nixos/base/services/munin-chrony-tracking-update-time;
};
}; };
systemd.services.munin-node = { systemd.services.munin-node = {
path = with pkgs; [ munin lm_sensors ]; path = with pkgs; [ munin lm_sensors ];
@ -54,24 +38,11 @@ mkIf flags.munin {
services.munin-cron = { services.munin-cron = {
enable = true; enable = true;
hosts = '' hosts = ''
[${config.networking.fqdn}] [${config.networking.hostName}]
address 127.0.0.1 address 127.0.0.1
df._dev_sda2.warning 35
use_node_name yes
#contacts syslog
contacts email
''; '';
# http://sametmax.com/monitorez-vos-serveurs-avec-munin-et-notifications-par-email/
# http://guide.munin-monitoring.org/en/latest/tutorial/alert.html#syntax-of-warning-and-critical
extraGlobalConfig = '' extraGlobalConfig = ''
#--- contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" root@prunetwork.fr
#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
contact.syslog.always_send ok,warning,critical,unknown
''; '';
}; };

@ -1,123 +0,0 @@
#!/bin/sh
: <<=cut
=head1 NAME
parse Chrony Tracking output for timeserver status information
=head1 APPLICABLE SYSTEMS
Any system with a local chronyd service.
=head1 CONFIGURATION
No configuration.
=head1 MAGIC MARKERS
#%# family=auto
#%# capabilities=autoconf
=head1 VERSION
Revision 0.1 2008/08/23 13:06:00 joti
First version only chronyc tracking, autodetection included.
Revision 0.2 2008/10/11 16:09:00 joti
Added scaling of other values to match with frequency, added more description to fields
Revision 0.3 2014/02/16 zjttoefs
reduce forking by using awk
do not limit output precision
add stratum monitoring
detect slow/fast time or freqency and adjust sign of value accordingly
remove commented out code
Revision 0.4 2016/11/10 Lars Kruse
rewrite field handling
use "which" for "chronyc" location
switch from "bash" to "sh"
fix exit code of failing "autoconf"
=head1 AUTHOR
joti
zjttoefs
Lars Kruse <devel@sumpfralle.de>
=cut
CHRONYC="$(which chronyc | head -1)"
# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
# field definitions:
# - munin fieldname
# - factor for graph visualization (all values are supposed to reach a similar dimension)
# - regular expression of the chrony output line (may not contain whitespace, case insensitive)
# - label (may include "%d" for including the factor; may contain whitespace)
fields="stratum 1 ^Stratum Stratum
systime 1000000 ^System.time System Time (us)
offsetlast 1000000 ^Last.offset Last Offset (us)
offsetrms 1000000 ^RMS.offset RMS Offset (us)
frequency 1 ^Frequency Frequency (ppm)
residualfreq 1 ^Residual.freq Residual Freq (ppm)
skew 1 ^Skew Skew (ppm)
rootdelay 1000000 ^Root.delay Root Delay (us)
rootdispersion 1000000 ^Root.dispersion Root Dispersion (us)
updateinterval 1 ^Update.interval Update Interval (s)"
# chrony example output (v2.4.1):
# Reference ID : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
# Stratum : 2
# Ref time (UTC) : Thu Nov 10 22:39:50 2016
# System time : 0.000503798 seconds slow of NTP time
# Last offset : +0.000254355 seconds
# RMS offset : 0.002186779 seconds
# Frequency : 17.716 ppm slow
# Residual freq : +0.066 ppm
# Skew : 4.035 ppm
# Root delay : 0.042980 seconds
# Root dispersion : 0.005391 seconds
# Update interval : 258.4 seconds
# Leap status : Normal
if [ "$1" = "autoconf" ]; then
if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
echo yes
else
echo "no (missing 'chronyc' executable)"
fi
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Chrony Tracking Stats'
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel (time,ppm)'
echo 'graph_category time'
echo 'graph_scale no'
echo "$fields" | while read fieldname factor regex label; do
# insert the factor, if "%d" is part of the label
printf "${fieldname}.label $label\n" "$factor"
echo "${fieldname}.type GAUGE"
done
exit 0
fi
chrony_status="$("$CHRONYC" tracking)"
echo "$fields" | while read fieldname factor regex label; do
status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
if [ -z "$status_line" ]; then
value="U"
else
# the keyword "slow" indicates negative values
value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
fi
echo "${fieldname}.value $value"
done

@ -1,116 +0,0 @@
#!/bin/sh
: <<=cut
=head1 NAME
parse Chrony Tracking output for timeserver status information
=head1 APPLICABLE SYSTEMS
Any system with a local chronyd service.
=head1 CONFIGURATION
No configuration.
=head1 MAGIC MARKERS
#%# family=auto
#%# capabilities=autoconf
=head1 VERSION
Revision 0.1 2008/08/23 13:06:00 joti
First version only chronyc tracking, autodetection included.
Revision 0.2 2008/10/11 16:09:00 joti
Added scaling of other values to match with frequency, added more description to fields
Revision 0.3 2014/02/16 zjttoefs
reduce forking by using awk
do not limit output precision
add stratum monitoring
detect slow/fast time or freqency and adjust sign of value accordingly
remove commented out code
Revision 0.4 2016/11/10 Lars Kruse
rewrite field handling
use "which" for "chronyc" location
switch from "bash" to "sh"
fix exit code of failing "autoconf"
=head1 AUTHOR
joti
zjttoefs
Lars Kruse <devel@sumpfralle.de>
=cut
CHRONYC="$(which chronyc | head -1)"
# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
# field definitions:
# - munin fieldname
# - factor for graph visualization (all values are supposed to reach a similar dimension)
# - regular expression of the chrony output line (may not contain whitespace, case insensitive)
# - label (may include "%d" for including the factor; may contain whitespace)
fields="frequency 1 ^Frequency Local Clock Frequency Drift (ppm)
residualfreq 1 ^Residual.freq Residual Freq (ppm)
skew 1 ^Skew Skew (ppm)"
# chrony example output (v2.4.1):
# Reference ID : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
# Stratum : 2
# Ref time (UTC) : Thu Nov 10 22:39:50 2016
# System time : 0.000503798 seconds slow of NTP time
# Last offset : +0.000254355 seconds
# RMS offset : 0.002186779 seconds
# Frequency : 17.716 ppm slow
# Residual freq : +0.066 ppm
# Skew : 4.035 ppm
# Root delay : 0.042980 seconds
# Root dispersion : 0.005391 seconds
# Update interval : 258.4 seconds
# Leap status : Normal
if [ "$1" = "autoconf" ]; then
if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
echo yes
else
echo "no (missing 'chronyc' executable)"
fi
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Chrony Tracking Stats - Frequencies stability'
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel (ppm)'
echo 'graph_category time'
echo 'graph_scale no'
echo "$fields" | while read fieldname factor regex label; do
# insert the factor, if "%d" is part of the label
printf "${fieldname}.label $label\n" "$factor"
echo "${fieldname}.type GAUGE"
done
exit 0
fi
chrony_status="$("$CHRONYC" tracking)"
echo "$fields" | while read fieldname factor regex label; do
status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
if [ -z "$status_line" ]; then
value="U"
else
# the keyword "slow" indicates negative values
value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
fi
echo "${fieldname}.value $value"
done

@ -1,116 +0,0 @@
#!/bin/sh
: <<=cut
=head1 NAME
parse Chrony Tracking output for timeserver status information
=head1 APPLICABLE SYSTEMS
Any system with a local chronyd service.
=head1 CONFIGURATION
No configuration.
=head1 MAGIC MARKERS
#%# family=auto
#%# capabilities=autoconf
=head1 VERSION
Revision 0.1 2008/08/23 13:06:00 joti
First version only chronyc tracking, autodetection included.
Revision 0.2 2008/10/11 16:09:00 joti
Added scaling of other values to match with frequency, added more description to fields
Revision 0.3 2014/02/16 zjttoefs
reduce forking by using awk
do not limit output precision
add stratum monitoring
detect slow/fast time or freqency and adjust sign of value accordingly
remove commented out code
Revision 0.4 2016/11/10 Lars Kruse
rewrite field handling
use "which" for "chronyc" location
switch from "bash" to "sh"
fix exit code of failing "autoconf"
=head1 AUTHOR
joti
zjttoefs
Lars Kruse <devel@sumpfralle.de>
=cut
CHRONYC="$(which chronyc | head -1)"
# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
# field definitions:
# - munin fieldname
# - factor for graph visualization (all values are supposed to reach a similar dimension)
# - regular expression of the chrony output line (may not contain whitespace, case insensitive)
# - label (may include "%d" for including the factor; may contain whitespace)
fields="stratum 1 ^Stratum Stratum"
# chrony example output (v2.4.1):
# Reference ID : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
# Stratum : 2
# Ref time (UTC) : Thu Nov 10 22:39:50 2016
# System time : 0.000503798 seconds slow of NTP time
# Last offset : +0.000254355 seconds
# RMS offset : 0.002186779 seconds
# Frequency : 17.716 ppm slow
# Residual freq : +0.066 ppm
# Skew : 4.035 ppm
# Root delay : 0.042980 seconds
# Root dispersion : 0.005391 seconds
# Update interval : 258.4 seconds
# Leap status : Normal
if [ "$1" = "autoconf" ]; then
if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
echo yes
else
echo "no (missing 'chronyc' executable)"
fi
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Chrony Tracking Stats - Stratum'
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel (stratum)'
echo 'graph_category time'
echo 'graph_scale no'
echo 'stratum.warning 8'
echo 'stratum.critical 11'
echo "$fields" | while read fieldname factor regex label; do
# insert the factor, if "%d" is part of the label
printf "${fieldname}.label $label\n" "$factor"
echo "${fieldname}.type GAUGE"
done
exit 0
fi
chrony_status="$("$CHRONYC" tracking)"
echo "$fields" | while read fieldname factor regex label; do
status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
if [ -z "$status_line" ]; then
value="U"
else
# the keyword "slow" indicates negative values
value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
fi
echo "${fieldname}.value $value"
done

@ -1,118 +0,0 @@
#!/bin/sh
: <<=cut
=head1 NAME
parse Chrony Tracking output for timeserver status information
=head1 APPLICABLE SYSTEMS
Any system with a local chronyd service.
=head1 CONFIGURATION
No configuration.
=head1 MAGIC MARKERS
#%# family=auto
#%# capabilities=autoconf
=head1 VERSION
Revision 0.1 2008/08/23 13:06:00 joti
First version only chronyc tracking, autodetection included.
Revision 0.2 2008/10/11 16:09:00 joti
Added scaling of other values to match with frequency, added more description to fields
Revision 0.3 2014/02/16 zjttoefs
reduce forking by using awk
do not limit output precision
add stratum monitoring
detect slow/fast time or freqency and adjust sign of value accordingly
remove commented out code
Revision 0.4 2016/11/10 Lars Kruse
rewrite field handling
use "which" for "chronyc" location
switch from "bash" to "sh"
fix exit code of failing "autoconf"
=head1 AUTHOR
joti
zjttoefs
Lars Kruse <devel@sumpfralle.de>
=cut
CHRONYC="$(which chronyc | head -1)"
# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
# field definitions:
# - munin fieldname
# - factor for graph visualization (all values are supposed to reach a similar dimension)
# - regular expression of the chrony output line (may not contain whitespace, case insensitive)
# - label (may include "%d" for including the factor; may contain whitespace)
fields="systime 1000000 ^System.time System Time (us)
offsetlast 1000000 ^Last.offset Last Offset (us)
offsetrms 1000000 ^RMS.offset RMS Offset (us)
rootdelay 1000000 ^Root.delay Root Delay (us)
rootdispersion 1000000 ^Root.dispersion Root Dispersion (us)"
# chrony example output (v2.4.1):
# Reference ID : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
# Stratum : 2
# Ref time (UTC) : Thu Nov 10 22:39:50 2016
# System time : 0.000503798 seconds slow of NTP time
# Last offset : +0.000254355 seconds
# RMS offset : 0.002186779 seconds
# Frequency : 17.716 ppm slow
# Residual freq : +0.066 ppm
# Skew : 4.035 ppm
# Root delay : 0.042980 seconds
# Root dispersion : 0.005391 seconds
# Update interval : 258.4 seconds
# Leap status : Normal
if [ "$1" = "autoconf" ]; then
if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
echo yes
else
echo "no (missing 'chronyc' executable)"
fi
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Chrony Tracking Stats - Time'
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel (time)'
echo 'graph_category time'
echo 'graph_scale no'
echo "$fields" | while read fieldname factor regex label; do
# insert the factor, if "%d" is part of the label
printf "${fieldname}.label $label\n" "$factor"
echo "${fieldname}.type GAUGE"
done
exit 0
fi
chrony_status="$("$CHRONYC" tracking)"
echo "$fields" | while read fieldname factor regex label; do
status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
if [ -z "$status_line" ]; then
value="U"
else
# the keyword "slow" indicates negative values
value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
fi
echo "${fieldname}.value $value"
done

@ -1,115 +0,0 @@
#!/bin/sh
: <<=cut
=head1 NAME
parse Chrony Tracking output for timeserver status information
=head1 APPLICABLE SYSTEMS
Any system with a local chronyd service.
=head1 CONFIGURATION
No configuration.
=head1 MAGIC MARKERS
#%# family=auto
#%# capabilities=autoconf
=head1 VERSION
Revision 0.1 2008/08/23 13:06:00 joti
First version only chronyc tracking, autodetection included.
Revision 0.2 2008/10/11 16:09:00 joti
Added scaling of other values to match with frequency, added more description to fields
Revision 0.3 2014/02/16 zjttoefs
reduce forking by using awk
do not limit output precision
add stratum monitoring
detect slow/fast time or freqency and adjust sign of value accordingly
remove commented out code
Revision 0.4 2016/11/10 Lars Kruse
rewrite field handling
use "which" for "chronyc" location
switch from "bash" to "sh"
fix exit code of failing "autoconf"
=head1 AUTHOR
joti
zjttoefs
Lars Kruse <devel@sumpfralle.de>
=cut
CHRONYC="$(which chronyc | head -1)"
# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
# field definitions:
# - munin fieldname
# - factor for graph visualization (all values are supposed to reach a similar dimension)
# - regular expression of the chrony output line (may not contain whitespace, case insensitive)
# - label (may include "%d" for including the factor; may contain whitespace)
fields="rootdelay 1000000 ^Root.delay Root Delay (us)
rootdispersion 1000000 ^Root.dispersion Root Dispersion (us)"
# chrony example output (v2.4.1):
# Reference ID : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
# Stratum : 2
# Ref time (UTC) : Thu Nov 10 22:39:50 2016
# System time : 0.000503798 seconds slow of NTP time
# Last offset : +0.000254355 seconds
# RMS offset : 0.002186779 seconds
# Frequency : 17.716 ppm slow
# Residual freq : +0.066 ppm
# Skew : 4.035 ppm
# Root delay : 0.042980 seconds
# Root dispersion : 0.005391 seconds
# Update interval : 258.4 seconds
# Leap status : Normal
if [ "$1" = "autoconf" ]; then
if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
echo yes
else
echo "no (missing 'chronyc' executable)"
fi
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Chrony Tracking Stats - Root Time'
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel (time)'
echo 'graph_category time'
echo 'graph_scale no'
echo "$fields" | while read fieldname factor regex label; do
# insert the factor, if "%d" is part of the label
printf "${fieldname}.label $label\n" "$factor"
echo "${fieldname}.type GAUGE"
done
exit 0
fi
chrony_status="$("$CHRONYC" tracking)"
echo "$fields" | while read fieldname factor regex label; do
status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
if [ -z "$status_line" ]; then
value="U"
else
# the keyword "slow" indicates negative values
value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
fi
echo "${fieldname}.value $value"
done

@ -1,114 +0,0 @@
#!/bin/sh
: <<=cut
=head1 NAME
parse Chrony Tracking output for timeserver status information
=head1 APPLICABLE SYSTEMS
Any system with a local chronyd service.
=head1 CONFIGURATION
No configuration.
=head1 MAGIC MARKERS
#%# family=auto
#%# capabilities=autoconf
=head1 VERSION
Revision 0.1 2008/08/23 13:06:00 joti
First version only chronyc tracking, autodetection included.
Revision 0.2 2008/10/11 16:09:00 joti
Added scaling of other values to match with frequency, added more description to fields
Revision 0.3 2014/02/16 zjttoefs
reduce forking by using awk
do not limit output precision
add stratum monitoring
detect slow/fast time or freqency and adjust sign of value accordingly
remove commented out code
Revision 0.4 2016/11/10 Lars Kruse
rewrite field handling
use "which" for "chronyc" location
switch from "bash" to "sh"
fix exit code of failing "autoconf"
=head1 AUTHOR
joti
zjttoefs
Lars Kruse <devel@sumpfralle.de>
=cut
CHRONYC="$(which chronyc | head -1)"
# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
# field definitions:
# - munin fieldname
# - factor for graph visualization (all values are supposed to reach a similar dimension)
# - regular expression of the chrony output line (may not contain whitespace, case insensitive)
# - label (may include "%d" for including the factor; may contain whitespace)
fields="updateinterval 1 ^Update.interval Update Interval (s)"
# chrony example output (v2.4.1):
# Reference ID : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
# Stratum : 2
# Ref time (UTC) : Thu Nov 10 22:39:50 2016
# System time : 0.000503798 seconds slow of NTP time
# Last offset : +0.000254355 seconds
# RMS offset : 0.002186779 seconds
# Frequency : 17.716 ppm slow
# Residual freq : +0.066 ppm
# Skew : 4.035 ppm
# Root delay : 0.042980 seconds
# Root dispersion : 0.005391 seconds
# Update interval : 258.4 seconds
# Leap status : Normal
if [ "$1" = "autoconf" ]; then
if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
echo yes
else
echo "no (missing 'chronyc' executable)"
fi
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Chrony Tracking Stats - Update interval'
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel (time)'
echo 'graph_category time'
echo 'graph_scale no'
echo "$fields" | while read fieldname factor regex label; do
# insert the factor, if "%d" is part of the label
printf "${fieldname}.label $label\n" "$factor"
echo "${fieldname}.type GAUGE"
done
exit 0
fi
chrony_status="$("$CHRONYC" tracking)"
echo "$fields" | while read fieldname factor regex label; do
status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
if [ -z "$status_line" ]; then
value="U"
else
# the keyword "slow" indicates negative values
value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
fi
echo "${fieldname}.value $value"
done

@ -1,32 +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 flags.nixos-manual {
# Paquets
environment.systemPackages = with pkgs; [
bc
mailutils
];
# Services
## documentation sur ctrl + alt + F8
documentation.nixos = {
enable = true;
};
# Réseau
networking.firewall = {
allowedTCPPorts = [
];
allowedUDPPorts = [
];
};
}

@ -1,35 +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 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;
};
}

@ -2,26 +2,19 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.print { mkIf cfg.print {
environment.systemPackages = with pkgs; [
samba
python310Packages.pysmbc
];
services.samba.enable = true;
# Services # Services
## Enable CUPS to print documents. ## Enable CUPS to print documents.
services.printing = { services.printing = {
enable = true; enable = true;
drivers = [ drivers = [
pkgs.samsung-unified-linux-driver pkgs.samsung-unified-linux-driver
pkgs.fxlinuxprint
pkgs.gutenprint
]; ];
# Suppression automatique des fichiers temporaires. # Suppression automatique des fichiers temporaires.
# Par défaut, cups conserve une copie de ce qui a été imprimé # Par défaut, cups conserve une copie de ce qui a été imprimé
@ -31,6 +24,4 @@ mkIf flags.print {
PreserveJobFiles No PreserveJobFiles No
''; '';
}; };
services.avahi.enable = true;
services.avahi.nssmdns = true;
} }

@ -2,22 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.pulseaudio { mkIf cfg.pulseaudio {
# Notes
# commande pour lister les cartes son : pacmd list-cards
# Paquets
environment.systemPackages = with pkgs; [
paprefs # préferences pulseaudio
pavucontrol # mixer pulseaudio
pa_applet # status et contrôle dans le system tray
];
# Pulse Audio # Pulse Audio
hardware.pulseaudio = { hardware.pulseaudio = {

@ -2,29 +2,20 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.scanner { mkIf cfg.scanner {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Driver
hplip # Scanner HP
python39Packages.pyqt4 # dépendance hplip
# Outils pour exploiter les scanners
simple-scan simple-scan
]; ];
# Services # Services
hardware.sane.enable = true; hardware.sane.enable = true;
services.saned = {
enable = true;
extraConfig = "192.168.0.0/24";
};
# Réseau # Réseau
networking.firewall = { networking.firewall = {

@ -2,9 +2,9 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf true { mkIf true {
@ -26,9 +26,6 @@ mkIf true {
# Use kernel sandbox mechanisms where possible in unprivilegied processes # Use kernel sandbox mechanisms where possible in unprivilegied processes
# Systrace on OpenBSD, Seccomp on Linux, seatbelt on MacOSX/Darwin, rlimit elsewhere. # Systrace on OpenBSD, Seccomp on Linux, seatbelt on MacOSX/Darwin, rlimit elsewhere.
UsePrivilegeSeparation sandbox UsePrivilegeSeparation sandbox
# Permet de gérer le nombre de connexions multiplexées en simultané
MaxSessions 200
''; '';
}; };
} }

@ -2,12 +2,12 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.virtualbox { mkIf cfg.virtualbox {
# Paquets # Paquets
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -2,20 +2,17 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
/** mkIf profiles.isDesktopEnvironment {
* Il faut activer `services.xserver.enable = true;` dans configuration.nix
*/
mkIf currentMachine.profiles.isDesktopEnvironment {
# Services # Services
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver = { services.xserver = {
# enable = true; enable = true;
layout = "fr"; layout = "fr";
xkbOptions = "eurosign:e"; xkbOptions = "eurosign:e";
displayManager.lightdm.enable = true; displayManager.lightdm.enable = true;

@ -2,19 +2,27 @@
let let
inherit (lib) mkIf mkMerge mkThenElse; inherit (lib) mkIf mkMerge mkThenElse;
annuaire = config.r6d.machines; cfg = config.r6d.config-generator;
currentMachine = annuaire."${config.networking.fqdn}"; computers = config.r6d.computers;
flags = currentMachine.configurationFlags; profiles = config.r6d.profiles;
in in
mkIf flags.xmonad { mkIf cfg.xmonad {
services.dbus.packages = with pkgs; [ dconf ];
programs.dconf.enable = true; # Paquets
environment.systemPackages = with pkgs; [
dmenu
haskellPackages.xmobar
trayer
];
# Services # Services
services.xserver.windowManager.xmonad = { services.xserver.windowManager.xmonad = {
enable = true; enable = true;
enableContribAndExtras = true; enableContribAndExtras = true;
extraPackages = haskellPackages: [
haskellPackages.xmobar
];
}; };
environment.variables = { environment.variables = {
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";

@ -1,42 +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 {
# Services
# https://github.com/NixOS/nixpkgs/issues/15960
services = {
pcscd.enable = true;
udev.packages = with pkgs; [
libu2f-host
yubikey-personalization
];
xserver.displayManager.sessionCommands = ''
# https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c
gpg-connect-agent /bye
GPG_TTY=$(tty)
export GPG_TTY
'';
};
users.extraGroups.yubikey = {};
environment.systemPackages = with pkgs; [
gnupg opensc pcsctools libu2f-host yubikey-personalization
];
security.pam.u2f.enable = true;
/*users.extraUsers.joko = {
isNormalUser = true;
extraGroups = [ "wheel" "input" "audio" "video" ];
};*/
}
Loading…
Cancel
Save