From c193d944d9d99be9cd3167f4134b7cfa11439bd1 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 1 Mar 2017 23:16:24 +0100 Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20la=20config=20xmonad=20?= =?UTF-8?q?vers=20public?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/desktop.nix | 5 ----- public/public.nix | 3 ++- {desktop/activation-manuelle => public}/xmonad/xmobarrc | 0 {desktop/activation-manuelle => public}/xmonad/xmonad.hs | 0 {desktop/activation-manuelle => public}/xmonad/xmonad.nix | 0 5 files changed, 2 insertions(+), 6 deletions(-) rename {desktop/activation-manuelle => public}/xmonad/xmobarrc (100%) rename {desktop/activation-manuelle => public}/xmonad/xmonad.hs (100%) rename {desktop/activation-manuelle => public}/xmonad/xmonad.nix (100%) diff --git a/desktop/desktop.nix b/desktop/desktop.nix index 7aa724c..58634d3 100644 --- a/desktop/desktop.nix +++ b/desktop/desktop.nix @@ -8,11 +8,6 @@ let in { - imports = [ # applications : - # commandées par config-generator - ./activation-manuelle/xmonad/xmonad.nix # gestionnaire de fenêtres xmonad - ]; - # Paquets environment.systemPackages = with pkgs; mkIf profiles.isDesktop [ # A trier diff --git a/public/public.nix b/public/public.nix index 299e095..0a60e5b 100644 --- a/public/public.nix +++ b/public/public.nix @@ -22,7 +22,7 @@ in # commandées par config-generator ## option de configuration spécifique - ./app-awesome.nix # pour les profils awesome + ./app-awesome.nix # pour le gestionaire de fenêtres awesome ./app-cao.nix # de conception assisté par ordinateur & modélisation ./app-cartographie.nix # manipuler les données géographiques & cartes ./app-developpement.nix # développer des programmes/scripts @@ -47,6 +47,7 @@ in ./service-laptop.nix # services spécifiques aux pc portables ./service-locate.nix # service locate ./swap.nix # définition de l'utilisation du swap + ./xmonad/xmonad.nix # pour le gestionaire de fenêtre xmonad ## if isDesktop ./app-adminsys.nix # pour gérer le système dans son ensemble et les services diff --git a/desktop/activation-manuelle/xmonad/xmobarrc b/public/xmonad/xmobarrc similarity index 100% rename from desktop/activation-manuelle/xmonad/xmobarrc rename to public/xmonad/xmobarrc diff --git a/desktop/activation-manuelle/xmonad/xmonad.hs b/public/xmonad/xmonad.hs similarity index 100% rename from desktop/activation-manuelle/xmonad/xmonad.hs rename to public/xmonad/xmonad.hs diff --git a/desktop/activation-manuelle/xmonad/xmonad.nix b/public/xmonad/xmonad.nix similarity index 100% rename from desktop/activation-manuelle/xmonad/xmonad.nix rename to public/xmonad/xmonad.nix