From 67907ba8c8790118767eaa5387856b3a9f470d16 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 8 Aug 2016 22:06:08 +0200 Subject: [PATCH] =?UTF-8?q?=20d=C3=A9placement=20de=20.nix=20de=20base/des?= =?UTF-8?q?ktop=20vers=20base/public?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/desktop.nix | 7 ------- .../app-awesome.nix | 0 .../app-cao.nix | 0 .../app-developpement.nix | 0 .../app-docker.nix | 0 .../app-jeux.nix | 0 .../app-virtualbox.nix | 0 public/public.nix | 19 ++++++++++++++----- 8 files changed, 14 insertions(+), 12 deletions(-) rename {desktop/activation-manuelle => public}/app-awesome.nix (100%) rename {desktop/activation-manuelle => public}/app-cao.nix (100%) rename {desktop/activation-manuelle => public}/app-developpement.nix (100%) rename {desktop/activation-manuelle => public}/app-docker.nix (100%) rename {desktop/activation-manuelle => public}/app-jeux.nix (100%) rename {desktop/activation-manuelle => public}/app-virtualbox.nix (100%) diff --git a/desktop/desktop.nix b/desktop/desktop.nix index 4f1f60b..884f13c 100644 --- a/desktop/desktop.nix +++ b/desktop/desktop.nix @@ -10,13 +10,6 @@ in { imports = [ # applications : # commandées par config-generator - ./activation-manuelle/app-awesome.nix # pour les profils awesome - ./activation-manuelle/app-cao.nix # de conception assisté par ordinateur & modélisation - ./activation-manuelle/app-developpement.nix # utilisée pour développer des programmes/scripts - ./activation-manuelle/app-docker.nix # pour activer docker - ./activation-manuelle/app-jeux.nix # permettant de jouer ;) - ./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox - ./activation-manuelle/laptop.nix # appli & configuration adaptée pour un PC portable$ ./activation-manuelle/xmonad/xmonad.nix # gestionnaire de fenêtres xmonad # installées systématiquement ./desktop-minimal.nix diff --git a/desktop/activation-manuelle/app-awesome.nix b/public/app-awesome.nix similarity index 100% rename from desktop/activation-manuelle/app-awesome.nix rename to public/app-awesome.nix diff --git a/desktop/activation-manuelle/app-cao.nix b/public/app-cao.nix similarity index 100% rename from desktop/activation-manuelle/app-cao.nix rename to public/app-cao.nix diff --git a/desktop/activation-manuelle/app-developpement.nix b/public/app-developpement.nix similarity index 100% rename from desktop/activation-manuelle/app-developpement.nix rename to public/app-developpement.nix diff --git a/desktop/activation-manuelle/app-docker.nix b/public/app-docker.nix similarity index 100% rename from desktop/activation-manuelle/app-docker.nix rename to public/app-docker.nix diff --git a/desktop/activation-manuelle/app-jeux.nix b/public/app-jeux.nix similarity index 100% rename from desktop/activation-manuelle/app-jeux.nix rename to public/app-jeux.nix diff --git a/desktop/activation-manuelle/app-virtualbox.nix b/public/app-virtualbox.nix similarity index 100% rename from desktop/activation-manuelle/app-virtualbox.nix rename to public/app-virtualbox.nix diff --git a/public/public.nix b/public/public.nix index faf7fdd..0761824 100644 --- a/public/public.nix +++ b/public/public.nix @@ -2,11 +2,20 @@ { imports = [ + # commandées par config-generator + ./app-awesome.nix # pour les profils awesome + ./app-cao.nix # de conception assisté par ordinateur & modélisation + ./app-developpement.nix # utilisée pour développer des programmes/scripts + ./app-docker.nix # pour activer docker + ./app-jeux.nix # permettant de jouer ;) + ./app-virtualbox.nix # pour exploiter virtualbox + ./laptop.nix # appli & configuration adaptée pour un PC portable$ + # inclusion conditionnelle - ./auto-upgrade.nix - ./laptop.nix - ./locate.nix - ./print.nix - ./swap.nix + ./auto-upgrade.nix# mise à jour automatique du système + ./laptop.nix # profil de CPU & options diverses pour pc portable + ./locate.nix # service locate + ./print.nix # configuration de base de cups + ./swap.nix # définition de l'utilisation du swap ]; }