From 40426c1ad2f6c015084ce75af489fb7ea9688faf Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sat, 25 Mar 2017 00:25:30 +0100 Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20la=20configuration=20?= =?UTF-8?q?=C3=A0=20la=20racine=20du=20d=C3=A9p=C3=B4t=20(sauf=20rc.lua)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adminsys.nix | 0 .../applications => applications}/bureau.nix | 0 .../bureautique.nix | 0 {public/applications => applications}/cao.nix | 0 .../cartographie.nix | 0 .../client-internet.nix | 0 .../default-applications.nix | 0 .../developpement-elm.nix | 0 .../developpement-haskell.nix | 0 .../developpement-java.nix | 0 .../developpement-jetbrains.nix | 0 .../developpement-rust.nix | 0 .../developpement.nix | 0 .../edition-musique.nix | 0 .../edition-photo.nix | 0 .../edition-video.nix | 0 .../applications => applications}/jeux.nix | 0 .../multimedia.nix | 0 .../applications => applications}/network.nix | 0 .../securite.nix | 0 {public/applications => applications}/vim.nix | 0 {public/applications => applications}/vimrc | 0 base.nix | 56 +++++++++++++++- .../auto-upgrade.nix | 0 .../awesome.nix | 0 .../bash-interactive-init.sh | 0 .../bash-prompt.sh | 0 .../environment.nix | 0 .../configuration => configuration}/gitconfig | 0 .../laptop.nix | 0 .../localisation.nix | 0 .../network-ipv6.nix | 0 .../network.nix | 0 .../configuration => configuration}/swap.nix | 0 .../configuration => configuration}/udev.nix | 0 public/public.nix | 65 ------------------- {public/services => services}/docker.nix | 0 .../services => services}/elasticsearch.nix | 0 {public/services => services}/haveged.nix | 0 {public/services => services}/hoogle.nix | 0 {public/services => services}/hydra-build.nix | 0 {public/services => services}/hydra-core.nix | 0 {public/services => services}/kibana.nix | 0 {public/services => services}/locate.nix | 0 .../monitoring-munin.nix | 0 .../monitoring-smokeping.nix | 0 {public/services => services}/munin-muttrc | 0 {public/services => services}/print.nix | 0 {public/services => services}/pulseaudio.nix | 0 {public/services => services}/scanner.nix | 0 {public/services => services}/ssh.nix | 0 {public/services => services}/virtualbox.nix | 0 {public/services => services}/x11.nix | 0 {public/services => services}/xmonad/xmobarrc | 0 .../services => services}/xmonad/xmonad.hs | 0 .../services => services}/xmonad/xmonad.nix | 0 56 files changed, 53 insertions(+), 68 deletions(-) rename {public/applications => applications}/adminsys.nix (100%) rename {public/applications => applications}/bureau.nix (100%) rename {public/applications => applications}/bureautique.nix (100%) rename {public/applications => applications}/cao.nix (100%) rename {public/applications => applications}/cartographie.nix (100%) rename {public/applications => applications}/client-internet.nix (100%) rename {public/applications => applications}/default-applications.nix (100%) rename {public/applications => applications}/developpement-elm.nix (100%) rename {public/applications => applications}/developpement-haskell.nix (100%) rename {public/applications => applications}/developpement-java.nix (100%) rename {public/applications => applications}/developpement-jetbrains.nix (100%) rename {public/applications => applications}/developpement-rust.nix (100%) rename {public/applications => applications}/developpement.nix (100%) rename {public/applications => applications}/edition-musique.nix (100%) rename {public/applications => applications}/edition-photo.nix (100%) rename {public/applications => applications}/edition-video.nix (100%) rename {public/applications => applications}/jeux.nix (100%) rename {public/applications => applications}/multimedia.nix (100%) rename {public/applications => applications}/network.nix (100%) rename {public/applications => applications}/securite.nix (100%) rename {public/applications => applications}/vim.nix (100%) rename {public/applications => applications}/vimrc (100%) rename {public/configuration => configuration}/auto-upgrade.nix (100%) rename {public/configuration => configuration}/awesome.nix (100%) rename {public/configuration => configuration}/bash-interactive-init.sh (100%) rename {public/configuration => configuration}/bash-prompt.sh (100%) rename {public/configuration => configuration}/environment.nix (100%) rename {public/configuration => configuration}/gitconfig (100%) rename {public/configuration => configuration}/laptop.nix (100%) rename {public/configuration => configuration}/localisation.nix (100%) rename {public/configuration => configuration}/network-ipv6.nix (100%) rename {public/configuration => configuration}/network.nix (100%) rename {public/configuration => configuration}/swap.nix (100%) rename {public/configuration => configuration}/udev.nix (100%) delete mode 100644 public/public.nix rename {public/services => services}/docker.nix (100%) rename {public/services => services}/elasticsearch.nix (100%) rename {public/services => services}/haveged.nix (100%) rename {public/services => services}/hoogle.nix (100%) rename {public/services => services}/hydra-build.nix (100%) rename {public/services => services}/hydra-core.nix (100%) rename {public/services => services}/kibana.nix (100%) rename {public/services => services}/locate.nix (100%) rename {public/services => services}/monitoring-munin.nix (100%) rename {public/services => services}/monitoring-smokeping.nix (100%) rename {public/services => services}/munin-muttrc (100%) rename {public/services => services}/print.nix (100%) rename {public/services => services}/pulseaudio.nix (100%) rename {public/services => services}/scanner.nix (100%) rename {public/services => services}/ssh.nix (100%) rename {public/services => services}/virtualbox.nix (100%) rename {public/services => services}/x11.nix (100%) rename {public/services => services}/xmonad/xmobarrc (100%) rename {public/services => services}/xmonad/xmonad.hs (100%) rename {public/services => services}/xmonad/xmonad.nix (100%) diff --git a/public/applications/adminsys.nix b/applications/adminsys.nix similarity index 100% rename from public/applications/adminsys.nix rename to applications/adminsys.nix diff --git a/public/applications/bureau.nix b/applications/bureau.nix similarity index 100% rename from public/applications/bureau.nix rename to applications/bureau.nix diff --git a/public/applications/bureautique.nix b/applications/bureautique.nix similarity index 100% rename from public/applications/bureautique.nix rename to applications/bureautique.nix diff --git a/public/applications/cao.nix b/applications/cao.nix similarity index 100% rename from public/applications/cao.nix rename to applications/cao.nix diff --git a/public/applications/cartographie.nix b/applications/cartographie.nix similarity index 100% rename from public/applications/cartographie.nix rename to applications/cartographie.nix diff --git a/public/applications/client-internet.nix b/applications/client-internet.nix similarity index 100% rename from public/applications/client-internet.nix rename to applications/client-internet.nix diff --git a/public/applications/default-applications.nix b/applications/default-applications.nix similarity index 100% rename from public/applications/default-applications.nix rename to applications/default-applications.nix diff --git a/public/applications/developpement-elm.nix b/applications/developpement-elm.nix similarity index 100% rename from public/applications/developpement-elm.nix rename to applications/developpement-elm.nix diff --git a/public/applications/developpement-haskell.nix b/applications/developpement-haskell.nix similarity index 100% rename from public/applications/developpement-haskell.nix rename to applications/developpement-haskell.nix diff --git a/public/applications/developpement-java.nix b/applications/developpement-java.nix similarity index 100% rename from public/applications/developpement-java.nix rename to applications/developpement-java.nix diff --git a/public/applications/developpement-jetbrains.nix b/applications/developpement-jetbrains.nix similarity index 100% rename from public/applications/developpement-jetbrains.nix rename to applications/developpement-jetbrains.nix diff --git a/public/applications/developpement-rust.nix b/applications/developpement-rust.nix similarity index 100% rename from public/applications/developpement-rust.nix rename to applications/developpement-rust.nix diff --git a/public/applications/developpement.nix b/applications/developpement.nix similarity index 100% rename from public/applications/developpement.nix rename to applications/developpement.nix diff --git a/public/applications/edition-musique.nix b/applications/edition-musique.nix similarity index 100% rename from public/applications/edition-musique.nix rename to applications/edition-musique.nix diff --git a/public/applications/edition-photo.nix b/applications/edition-photo.nix similarity index 100% rename from public/applications/edition-photo.nix rename to applications/edition-photo.nix diff --git a/public/applications/edition-video.nix b/applications/edition-video.nix similarity index 100% rename from public/applications/edition-video.nix rename to applications/edition-video.nix diff --git a/public/applications/jeux.nix b/applications/jeux.nix similarity index 100% rename from public/applications/jeux.nix rename to applications/jeux.nix diff --git a/public/applications/multimedia.nix b/applications/multimedia.nix similarity index 100% rename from public/applications/multimedia.nix rename to applications/multimedia.nix diff --git a/public/applications/network.nix b/applications/network.nix similarity index 100% rename from public/applications/network.nix rename to applications/network.nix diff --git a/public/applications/securite.nix b/applications/securite.nix similarity index 100% rename from public/applications/securite.nix rename to applications/securite.nix diff --git a/public/applications/vim.nix b/applications/vim.nix similarity index 100% rename from public/applications/vim.nix rename to applications/vim.nix diff --git a/public/applications/vimrc b/applications/vimrc similarity index 100% rename from public/applications/vimrc rename to applications/vimrc diff --git a/base.nix b/base.nix index 850731d..93e894a 100644 --- a/base.nix +++ b/base.nix @@ -9,10 +9,60 @@ in { imports = [ - # recettes - ./public/public.nix - # moulinette de configuration ./config-generator.nix + + # installées systématiquement + ./applications/default-applications.nix + ./configuration/environment.nix + ./configuration/localisation.nix + ./configuration/network.nix + #./configuration/network-ipv6.nix + ./configuration/udev.nix + ./services/haveged.nix + ./services/monitoring-munin.nix + ./services/monitoring-smokeping.nix + ./services/ssh.nix + + # commandées par config-generator + ## option de configuration spécifique + ./applications/cao.nix # de conception assisté par ordinateur & modélisation + ./applications/cartographie.nix # manipuler les données géographiques & cartes + ./applications/developpement.nix # développer des programmes/scripts + ./applications/developpement-elm.nix # développer en elm + ./applications/developpement-haskell.nix # développer en haskell + ./applications/developpement-java.nix # développer en java + ./applications/developpement-jetbrains.nix # outils jetbrains + ./applications/developpement-rust.nix # développer en rust + ./applications/edition-musique.nix # modifier les fichiers musicaux + ./applications/edition-photo.nix # modifier les photos & assimilé + ./applications/edition-video.nix # modifier les vidéos + ./applications/jeux.nix # jouer, tout simplement ;) + ./configuration/auto-upgrade.nix # mise à jour automatique du système + ./configuration/awesome.nix # pour le gestionaire de fenêtres awesome + ./configuration/laptop.nix # appli & configuration adaptée pour un PC portable + ./configuration/swap.nix # définition de l'utilisation du swap + ./services/print.nix # configuration de base de cups + ./services/docker.nix # activer docker + ./services/elasticsearch.nix # service de stockage et recher de données + ./services/hoogle.nix # service hoogle pour haskell + ./services/hydra-build.nix # service de construction de paquet. -> la machine compile des paquets + ./services/hydra-core.nix # service pour l'instance d'hydra + ./services/kibana.nix # service de visualisation de données stockées dans elasticsearch + ./services/locate.nix # service locate + ./services/virtualbox.nix # activer virtualbox + ./services/xmonad/xmonad.nix # pour le gestionaire de fenêtre xmonad + + ## if isDesktop + ./applications/adminsys.nix # pour gérer le système dans son ensemble et les services + ./applications/bureau.nix # éléments pour avoir un environement graphique minimal utilisable + ./applications/bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) + ./applications/client-internet.nix # pour accéder & utiliser des ressources par le réseau + ./applications/multimedia.nix # pour gérer le son, l'image et la vidéo + ./applications/network.nix # de gestion, de diagnostique & surveillance réseau + ./applications/securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) + ./services/pulseaudio.nix # activation du serveur audio + ./services/scanner.nix # utilisation d'un scanner + ./services/x11.nix # activation du serveur graphique X ]; } diff --git a/public/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix similarity index 100% rename from public/configuration/auto-upgrade.nix rename to configuration/auto-upgrade.nix diff --git a/public/configuration/awesome.nix b/configuration/awesome.nix similarity index 100% rename from public/configuration/awesome.nix rename to configuration/awesome.nix diff --git a/public/configuration/bash-interactive-init.sh b/configuration/bash-interactive-init.sh similarity index 100% rename from public/configuration/bash-interactive-init.sh rename to configuration/bash-interactive-init.sh diff --git a/public/configuration/bash-prompt.sh b/configuration/bash-prompt.sh similarity index 100% rename from public/configuration/bash-prompt.sh rename to configuration/bash-prompt.sh diff --git a/public/configuration/environment.nix b/configuration/environment.nix similarity index 100% rename from public/configuration/environment.nix rename to configuration/environment.nix diff --git a/public/configuration/gitconfig b/configuration/gitconfig similarity index 100% rename from public/configuration/gitconfig rename to configuration/gitconfig diff --git a/public/configuration/laptop.nix b/configuration/laptop.nix similarity index 100% rename from public/configuration/laptop.nix rename to configuration/laptop.nix diff --git a/public/configuration/localisation.nix b/configuration/localisation.nix similarity index 100% rename from public/configuration/localisation.nix rename to configuration/localisation.nix diff --git a/public/configuration/network-ipv6.nix b/configuration/network-ipv6.nix similarity index 100% rename from public/configuration/network-ipv6.nix rename to configuration/network-ipv6.nix diff --git a/public/configuration/network.nix b/configuration/network.nix similarity index 100% rename from public/configuration/network.nix rename to configuration/network.nix diff --git a/public/configuration/swap.nix b/configuration/swap.nix similarity index 100% rename from public/configuration/swap.nix rename to configuration/swap.nix diff --git a/public/configuration/udev.nix b/configuration/udev.nix similarity index 100% rename from public/configuration/udev.nix rename to configuration/udev.nix diff --git a/public/public.nix b/public/public.nix deleted file mode 100644 index afc3f45..0000000 --- a/public/public.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - #inherit (lib) mkIf mkMerge mkThenElse; - cfg = config.r6d.config-generator; - computers = config.r6d.computers; - profiles = config.r6d.profiles; -in - -{ - imports = [ - # installées systématiquement - ./applications/default-applications.nix - ./configuration/environment.nix - ./configuration/localisation.nix - ./configuration/network.nix - #./configuration/network-ipv6.nix - ./configuration/udev.nix - ./services/haveged.nix - ./services/monitoring-munin.nix - ./services/monitoring-smokeping.nix - ./services/ssh.nix - - # commandées par config-generator - ## option de configuration spécifique - ./applications/cao.nix # de conception assisté par ordinateur & modélisation - ./applications/cartographie.nix # manipuler les données géographiques & cartes - ./applications/developpement.nix # développer des programmes/scripts - ./applications/developpement-elm.nix # développer en elm - ./applications/developpement-haskell.nix # développer en haskell - ./applications/developpement-java.nix # développer en java - ./applications/developpement-jetbrains.nix # outils jetbrains - ./applications/developpement-rust.nix # développer en rust - ./applications/edition-musique.nix # modifier les fichiers musicaux - ./applications/edition-photo.nix # modifier les photos & assimilé - ./applications/edition-video.nix # modifier les vidéos - ./applications/jeux.nix # jouer, tout simplement ;) - ./configuration/auto-upgrade.nix # mise à jour automatique du système - ./configuration/awesome.nix # pour le gestionaire de fenêtres awesome - ./configuration/laptop.nix # appli & configuration adaptée pour un PC portable - ./configuration/swap.nix # définition de l'utilisation du swap - ./services/print.nix # configuration de base de cups - ./services/docker.nix # activer docker - ./services/elasticsearch.nix # service de stockage et recher de données - ./services/hoogle.nix # service hoogle pour haskell - ./services/hydra-build.nix # service de construction de paquet. -> la machine compile des paquets - ./services/hydra-core.nix # service pour l'instance d'hydra - ./services/kibana.nix # service de visualisation de données stockées dans elasticsearch - ./services/locate.nix # service locate - ./services/virtualbox.nix # activer virtualbox - ./services/xmonad/xmonad.nix # pour le gestionaire de fenêtre xmonad - - ## if isDesktop - ./applications/adminsys.nix # pour gérer le système dans son ensemble et les services - ./applications/bureau.nix # éléments pour avoir un environement graphique minimal utilisable - ./applications/bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) - ./applications/client-internet.nix # pour accéder & utiliser des ressources par le réseau - ./applications/multimedia.nix # pour gérer le son, l'image et la vidéo - ./applications/network.nix # de gestion, de diagnostique & surveillance réseau - ./applications/securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) - ./services/pulseaudio.nix # activation du serveur audio - ./services/scanner.nix # utilisation d'un scanner - ./services/x11.nix # activation du serveur graphique X - ]; -} diff --git a/public/services/docker.nix b/services/docker.nix similarity index 100% rename from public/services/docker.nix rename to services/docker.nix diff --git a/public/services/elasticsearch.nix b/services/elasticsearch.nix similarity index 100% rename from public/services/elasticsearch.nix rename to services/elasticsearch.nix diff --git a/public/services/haveged.nix b/services/haveged.nix similarity index 100% rename from public/services/haveged.nix rename to services/haveged.nix diff --git a/public/services/hoogle.nix b/services/hoogle.nix similarity index 100% rename from public/services/hoogle.nix rename to services/hoogle.nix diff --git a/public/services/hydra-build.nix b/services/hydra-build.nix similarity index 100% rename from public/services/hydra-build.nix rename to services/hydra-build.nix diff --git a/public/services/hydra-core.nix b/services/hydra-core.nix similarity index 100% rename from public/services/hydra-core.nix rename to services/hydra-core.nix diff --git a/public/services/kibana.nix b/services/kibana.nix similarity index 100% rename from public/services/kibana.nix rename to services/kibana.nix diff --git a/public/services/locate.nix b/services/locate.nix similarity index 100% rename from public/services/locate.nix rename to services/locate.nix diff --git a/public/services/monitoring-munin.nix b/services/monitoring-munin.nix similarity index 100% rename from public/services/monitoring-munin.nix rename to services/monitoring-munin.nix diff --git a/public/services/monitoring-smokeping.nix b/services/monitoring-smokeping.nix similarity index 100% rename from public/services/monitoring-smokeping.nix rename to services/monitoring-smokeping.nix diff --git a/public/services/munin-muttrc b/services/munin-muttrc similarity index 100% rename from public/services/munin-muttrc rename to services/munin-muttrc diff --git a/public/services/print.nix b/services/print.nix similarity index 100% rename from public/services/print.nix rename to services/print.nix diff --git a/public/services/pulseaudio.nix b/services/pulseaudio.nix similarity index 100% rename from public/services/pulseaudio.nix rename to services/pulseaudio.nix diff --git a/public/services/scanner.nix b/services/scanner.nix similarity index 100% rename from public/services/scanner.nix rename to services/scanner.nix diff --git a/public/services/ssh.nix b/services/ssh.nix similarity index 100% rename from public/services/ssh.nix rename to services/ssh.nix diff --git a/public/services/virtualbox.nix b/services/virtualbox.nix similarity index 100% rename from public/services/virtualbox.nix rename to services/virtualbox.nix diff --git a/public/services/x11.nix b/services/x11.nix similarity index 100% rename from public/services/x11.nix rename to services/x11.nix diff --git a/public/services/xmonad/xmobarrc b/services/xmonad/xmobarrc similarity index 100% rename from public/services/xmonad/xmobarrc rename to services/xmonad/xmobarrc diff --git a/public/services/xmonad/xmonad.hs b/services/xmonad/xmonad.hs similarity index 100% rename from public/services/xmonad/xmonad.hs rename to services/xmonad/xmonad.hs diff --git a/public/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix similarity index 100% rename from public/services/xmonad/xmonad.nix rename to services/xmonad/xmonad.nix