From bda5db0417ba56d19b2f14918db6bebbeab7dede Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 25 Mar 2017 12:45:33 +0100 Subject: [PATCH] =?UTF-8?q?d=C3=A9coupages=20des=20applications=20en=20"gr?= =?UTF-8?q?aphical"=20et=20"terminal"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/graphical/adminsys.nix | 18 +++++++++ applications/{ => graphical}/bureau.nix | 0 applications/graphical/bureautique.nix | 37 ++++++++++++++++++ applications/{ => graphical}/cao.nix | 2 +- applications/{ => graphical}/cartographie.nix | 4 +- .../{ => graphical}/client-internet.nix | 9 +---- .../graphical/default-applications.nix | 15 +++++++ applications/{ => graphical}/default.nix | 0 applications/graphical/developpement-elm.nix | 25 ++++++++++++ .../graphical/developpement-haskell.nix | 18 +++++++++ applications/graphical/developpement-java.nix | 17 ++++++++ .../developpement-jetbrains.nix | 2 +- applications/graphical/developpement-rust.nix | 15 +++++++ .../{ => graphical}/developpement.nix | 13 +------ .../{ => graphical}/edition-musique.nix | 2 +- .../{ => graphical}/edition-photo.nix | 9 +---- applications/graphical/edition-video.nix | 18 +++++++++ applications/graphical/jeux.nix | 17 ++++++++ applications/{ => graphical}/multimedia.nix | 8 +--- applications/graphical/network.nix | 17 ++++++++ applications/graphical/securite.nix | 17 ++++++++ applications/{ => terminal}/adminsys.nix | 8 ---- applications/terminal/bureau.nix | 17 ++++++++ applications/{ => terminal}/bureautique.nix | 21 ---------- applications/terminal/cao.nix | 15 +++++++ applications/terminal/cartographie.nix | 18 +++++++++ applications/terminal/client-internet.nix | 24 ++++++++++++ .../{ => terminal}/default-applications.nix | 2 +- applications/terminal/default.nix | 39 +++++++++++++++++++ .../{ => terminal}/developpement-elm.nix | 0 .../{ => terminal}/developpement-haskell.nix | 1 - .../{ => terminal}/developpement-java.nix | 3 -- .../terminal/developpement-jetbrains.nix | 15 +++++++ .../{ => terminal}/developpement-rust.nix | 0 applications/terminal/developpement.nix | 29 ++++++++++++++ applications/terminal/edition-musique.nix | 15 +++++++ applications/terminal/edition-photo.nix | 21 ++++++++++ applications/{ => terminal}/edition-video.nix | 3 -- applications/{ => terminal}/jeux.nix | 2 - applications/terminal/multimedia.nix | 20 ++++++++++ applications/{ => terminal}/network.nix | 1 - applications/{ => terminal}/securite.nix | 3 -- applications/{ => terminal}/vim.nix | 0 applications/{ => terminal}/vimrc | 0 base.nix | 3 +- 45 files changed, 439 insertions(+), 84 deletions(-) create mode 100644 applications/graphical/adminsys.nix rename applications/{ => graphical}/bureau.nix (100%) create mode 100644 applications/graphical/bureautique.nix rename applications/{ => graphical}/cao.nix (92%) rename applications/{ => graphical}/cartographie.nix (83%) rename applications/{ => graphical}/client-internet.nix (80%) create mode 100644 applications/graphical/default-applications.nix rename applications/{ => graphical}/default.nix (100%) create mode 100644 applications/graphical/developpement-elm.nix create mode 100644 applications/graphical/developpement-haskell.nix create mode 100644 applications/graphical/developpement-java.nix rename applications/{ => graphical}/developpement-jetbrains.nix (87%) create mode 100644 applications/graphical/developpement-rust.nix rename applications/{ => graphical}/developpement.nix (72%) rename applications/{ => graphical}/edition-musique.nix (90%) rename applications/{ => graphical}/edition-photo.nix (77%) create mode 100644 applications/graphical/edition-video.nix create mode 100644 applications/graphical/jeux.nix rename applications/{ => graphical}/multimedia.nix (74%) create mode 100644 applications/graphical/network.nix create mode 100644 applications/graphical/securite.nix rename applications/{ => terminal}/adminsys.nix (85%) create mode 100644 applications/terminal/bureau.nix rename applications/{ => terminal}/bureautique.nix (59%) create mode 100644 applications/terminal/cao.nix create mode 100644 applications/terminal/cartographie.nix create mode 100644 applications/terminal/client-internet.nix rename applications/{ => terminal}/default-applications.nix (99%) create mode 100644 applications/terminal/default.nix rename applications/{ => terminal}/developpement-elm.nix (100%) rename applications/{ => terminal}/developpement-haskell.nix (93%) rename applications/{ => terminal}/developpement-java.nix (88%) create mode 100644 applications/terminal/developpement-jetbrains.nix rename applications/{ => terminal}/developpement-rust.nix (100%) create mode 100644 applications/terminal/developpement.nix create mode 100644 applications/terminal/edition-musique.nix create mode 100644 applications/terminal/edition-photo.nix rename applications/{ => terminal}/edition-video.nix (85%) rename applications/{ => terminal}/jeux.nix (90%) create mode 100644 applications/terminal/multimedia.nix rename applications/{ => terminal}/network.nix (98%) rename applications/{ => terminal}/securite.nix (73%) rename applications/{ => terminal}/vim.nix (100%) rename applications/{ => terminal}/vimrc (100%) diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix new file mode 100644 index 0000000..7e5c66a --- /dev/null +++ b/applications/graphical/adminsys.nix @@ -0,0 +1,18 @@ +{ 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.graphical { + + # Paquets + environment.systemPackages = with pkgs; [ + # Gestion de FS + parted # Gestion graphique de partitions + unetbootin # création de clefs USB bootables + ]; +} diff --git a/applications/bureau.nix b/applications/graphical/bureau.nix similarity index 100% rename from applications/bureau.nix rename to applications/graphical/bureau.nix diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix new file mode 100644 index 0000000..a826720 --- /dev/null +++ b/applications/graphical/bureautique.nix @@ -0,0 +1,37 @@ +{ 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.officeSuite && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + # Bureautique + gnumeric # tableur + #kde4.ksnapshot# réalisation de capture d'écran + + ## Cartes mentales + freemind + + ## Diagrammes & Schémas + dia # dessin & schéma technique + + ## Editeur de texte + #lyx # surcouche WISIWIM à LaTeX + #focuswriter # outil pour l'écriture + textadept # un éditeur de texte facile pour copier-coller graphique + #zim # outil de prise de notes, wiki de bureau + + ## Visionneuse + #kde5.okular # pdf + mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque + pdfpc # pdf + qpdfview # pdf + gqview # visionneuse image & gestion basique de collection + ]; +} diff --git a/applications/cao.nix b/applications/graphical/cao.nix similarity index 92% rename from applications/cao.nix rename to applications/graphical/cao.nix index 6d13c2f..3be3ed7 100644 --- a/applications/cao.nix +++ b/applications/graphical/cao.nix @@ -7,7 +7,7 @@ let profiles = config.r6d.profiles; in -mkIf cfg.conception-assistee { +mkIf (cfg.conception-assistee && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/cartographie.nix b/applications/graphical/cartographie.nix similarity index 83% rename from applications/cartographie.nix rename to applications/graphical/cartographie.nix index 4e41b18..c2c91b9 100644 --- a/applications/cartographie.nix +++ b/applications/graphical/cartographie.nix @@ -7,13 +7,11 @@ let profiles = config.r6d.profiles; in -mkIf cfg.cartographie { +mkIf (cfg.cartographie && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ # Gestion de données géographiques - expat - gpsbabel # pour convettir les données des GPS josm # outil de contribution à OpenStreetMap #qgis # client lourd de manipulation de données géographiques viking # analyse de topo, gestion de données GPS diff --git a/applications/client-internet.nix b/applications/graphical/client-internet.nix similarity index 80% rename from applications/client-internet.nix rename to applications/graphical/client-internet.nix index c615d04..e6711eb 100644 --- a/applications/client-internet.nix +++ b/applications/graphical/client-internet.nix @@ -7,7 +7,7 @@ let profiles = config.r6d.profiles; in # TODO: ménage -mkIf cfg.internetSuite { +mkIf (cfg.internetSuite && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ @@ -17,18 +17,12 @@ environment.systemPackages = with pkgs; [ chromium firefox - ## Réseaux sociaux - #python27Packages.turses # client twitter en ncurse - python27Packages.rainbowstream # client twitter en console - rtv # client reddit en console - ## Mail & Discussion (texte, audio) clawsMail hexchat quassel quasselClient mumble - mutt pidgin thunderbird @@ -53,5 +47,4 @@ environment.systemPackages = with pkgs; [ #nixpkgs.config.permittedInsecurePackages = [ # "webkitgtk-2.4.11" # pour que le plugin fancy de claws-mail fonctionne #]; - } diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix new file mode 100644 index 0000000..34478cb --- /dev/null +++ b/applications/graphical/default-applications.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in + +mkIf (true && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/applications/default.nix b/applications/graphical/default.nix similarity index 100% rename from applications/default.nix rename to applications/graphical/default.nix diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix new file mode 100644 index 0000000..ab11ef5 --- /dev/null +++ b/applications/graphical/developpement-elm.nix @@ -0,0 +1,25 @@ +{ 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.developpement-elm && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; + + # Services + + # Réseau + networking.firewall = { + allowedTCPPorts = [ + ]; + allowedUDPPorts = [ + ]; + }; +} diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix new file mode 100644 index 0000000..f118036 --- /dev/null +++ b/applications/graphical/developpement-haskell.nix @@ -0,0 +1,18 @@ +{ 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.developpement-haskell && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + ] ++ (with pkgs.haskellPackages; [ + # Haskell lib + threadscope # visualisation des threads (.eventlog) + ]); +} diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix new file mode 100644 index 0000000..6e91238 --- /dev/null +++ b/applications/graphical/developpement-java.nix @@ -0,0 +1,17 @@ +{ 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.developpement-java && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + # IDE + idea.idea-community # IntelliJ IDEA + ]; +} diff --git a/applications/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix similarity index 87% rename from applications/developpement-jetbrains.nix rename to applications/graphical/developpement-jetbrains.nix index 3c7e259..3901bb3 100644 --- a/applications/developpement-jetbrains.nix +++ b/applications/graphical/developpement-jetbrains.nix @@ -7,7 +7,7 @@ let profiles = config.r6d.profiles; in -mkIf cfg.jetbrains-licensed { +mkIf (cfg.jetbrains-licensed && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix new file mode 100644 index 0000000..5a64ba1 --- /dev/null +++ b/applications/graphical/developpement-rust.nix @@ -0,0 +1,15 @@ +{ 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.developpement-rust && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/applications/developpement.nix b/applications/graphical/developpement.nix similarity index 72% rename from applications/developpement.nix rename to applications/graphical/developpement.nix index f2fb4c7..2a07dd5 100644 --- a/applications/developpement.nix +++ b/applications/graphical/developpement.nix @@ -7,7 +7,7 @@ let profiles = config.r6d.profiles; in -mkIf cfg.developpement { +mkIf (cfg.developpement && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ @@ -15,29 +15,18 @@ mkIf cfg.developpement { pgadmin # interface d'administration de postgres sqlitebrowser # interface d'administration de sqlite - # C / C++ - gcc # pour les appels depuis les scripts - # Documentation #zeal # consulter la documentation hors ligne # Gestion des sources - cloc # outil pour compter les lignes de code source - git # déjà présent dans "base" #gitg # interface pour utiliser git (historique, commit) gitstats # génère un site web statique avec des statistiques gitAndTools.gitFull # pour gitk git-cola # interface pour utiliser git (historique, commit) - mercurial - subversion - - # Mono - #mono46 # interpréteur .NET ## Visualisation & outils de diff #gource # visualisation en mouvement de l'historique git meld # outil de comparaison graphique - #vbindiff # diff de fichier hexadecimaux avec vim # Editeur texte atom diff --git a/applications/edition-musique.nix b/applications/graphical/edition-musique.nix similarity index 90% rename from applications/edition-musique.nix rename to applications/graphical/edition-musique.nix index 7e9c67d..5f692f7 100644 --- a/applications/edition-musique.nix +++ b/applications/graphical/edition-musique.nix @@ -7,7 +7,7 @@ let profiles = config.r6d.profiles; in -mkIf cfg.edition-musique { +mkIf (cfg.edition-musique && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/edition-photo.nix b/applications/graphical/edition-photo.nix similarity index 77% rename from applications/edition-photo.nix rename to applications/graphical/edition-photo.nix index 67ba57a..cdda5de 100644 --- a/applications/edition-photo.nix +++ b/applications/graphical/edition-photo.nix @@ -7,18 +7,13 @@ let profiles = config.r6d.profiles; in -mkIf cfg.edition-photo { +mkIf (cfg.edition-photo && cfg.graphical) { # Paquets -environment.systemPackages = with pkgs; [ - # Méta données - exif - exiftags - + environment.systemPackages = with pkgs; [ # Retouche, modification & dessin vectoriel gimp # logiciel d'édition/montage/retouche photo inkscape # édition d'image vectorielle (svg & autre) - imagemagick # modification image en CLI #rawtherapee # développemen de photos en RAW # TEST d'outil de gestion de catalogue de photos diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix new file mode 100644 index 0000000..3314453 --- /dev/null +++ b/applications/graphical/edition-video.nix @@ -0,0 +1,18 @@ +{ 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.edition-video && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + # Vidéo + #cinelerra # editeur video + pitivi # montage vidéo + ]; +} diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix new file mode 100644 index 0000000..8ecb8da --- /dev/null +++ b/applications/graphical/jeux.nix @@ -0,0 +1,17 @@ +{ 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.jeux && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + # Jeux + urbanterror + ]; +} diff --git a/applications/multimedia.nix b/applications/graphical/multimedia.nix similarity index 74% rename from applications/multimedia.nix rename to applications/graphical/multimedia.nix index d6188bc..1124636 100644 --- a/applications/multimedia.nix +++ b/applications/graphical/multimedia.nix @@ -8,19 +8,13 @@ let in # TODO ranger le spécifique pulseaudio -mkIf cfg.multimediaSuite { +mkIf (cfg.multimediaSuite && cfg.graphical) { # Paquets environment.systemPackages = with pkgs; [ - # Multimedia - ## Audio - beep - cmus # lecteur audio console - espeak # synthèse vocale paprefs # préferences pulseaudio pavucontrol # mixer pulseaudio - vorbis-tools # codec ## Video smplayer # lecteur vidéo diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix new file mode 100644 index 0000000..48b4645 --- /dev/null +++ b/applications/graphical/network.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in + +mkIf (true && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + ## Diagnostic + #wireshark + ]; +} diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix new file mode 100644 index 0000000..461e836 --- /dev/null +++ b/applications/graphical/securite.nix @@ -0,0 +1,17 @@ +{ 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.securitySuite && cfg.graphical) { + + # Paquets + environment.systemPackages = with pkgs; [ + gnome3.seahorse # gestionnaire graphique de clef GPG + #yubikey-personalization-gui # utilisation de la clef Yubikey + ]; +} diff --git a/applications/adminsys.nix b/applications/terminal/adminsys.nix similarity index 85% rename from applications/adminsys.nix rename to applications/terminal/adminsys.nix index b112837..723cfc5 100644 --- a/applications/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -50,13 +50,5 @@ mkIf true { detox # The detox utility renames files to make them easier to work with. duff # outil de recherche de fichiers en doublons rdfind # recherche de fichiers doublons pour remplacement par hard/soft link - - (mkIf profiles.isDesktopEnvironment - ## Gestion de FS - gparted # Gestion graphique de partitions - ) - (mkIf profiles.isDesktopEnvironment - unetbootin # création de clefs USB bootables - ) ]; } diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix new file mode 100644 index 0000000..b72fbec --- /dev/null +++ b/applications/terminal/bureau.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in + +mkIf true { + + # Paquets + environment.systemPackages = with pkgs; [ + ## Manipulation de fichier + vifm # gestionnaire de fichiers basé sur VIM (console) + ]; +} diff --git a/applications/bureautique.nix b/applications/terminal/bureautique.nix similarity index 59% rename from applications/bureautique.nix rename to applications/terminal/bureautique.nix index 1feb95c..bb2e5f4 100644 --- a/applications/bureautique.nix +++ b/applications/terminal/bureautique.nix @@ -13,31 +13,10 @@ mkIf cfg.officeSuite { environment.systemPackages = with pkgs; [ # Bureautique aspell aspellDicts.fr # correction d'ortographe - gnumeric # tableur - #kde4.ksnapshot# réalisation de capture d'écran # Gestion de tâche taskwarrior # gestionnaire de tâches en console - ## Cartes mentales - freemind - - ## Diagrammes & Schémas - dia # dessin & schéma technique - - ## Editeur de texte - #lyx # surcouche WISIWIM à LaTeX - #focuswriter # outil pour l'écriture - textadept # un éditeur de texte facile pour copier-coller graphique - #zim # outil de prise de notes, wiki de bureau - - ## Visionneuse - #kde5.okular # pdf - mcomix # livres (cbr, liste d'images), gestion d'une bibliothèque - pdfpc # pdf - qpdfview # pdf - gqview # visionneuse image & gestion basique de collection - ## Convertisseurs (texte -> ) gnuplot # générateur de graphes à partir de données numériques graphviz # dot, neato : traçage de graphes (carré, rond) diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix new file mode 100644 index 0000000..ac5da71 --- /dev/null +++ b/applications/terminal/cao.nix @@ -0,0 +1,15 @@ +{ 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.conception-assistee { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix new file mode 100644 index 0000000..b7c80c7 --- /dev/null +++ b/applications/terminal/cartographie.nix @@ -0,0 +1,18 @@ +{ 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.cartographie { + + # Paquets + environment.systemPackages = with pkgs; [ + # Gestion de données géographiques + expat + gpsbabel # pour convertir les données des GPS + ]; +} diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix new file mode 100644 index 0000000..146b9f0 --- /dev/null +++ b/applications/terminal/client-internet.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in +# TODO: ménage +mkIf cfg.internetSuite { + +# Paquets +environment.systemPackages = with pkgs; [ + # Clients Internet + + ## Réseaux sociaux + #python27Packages.turses # client twitter en ncurse + python27Packages.rainbowstream # client twitter en console + rtv # client reddit en console + + ## Mail & Discussion (texte, audio) + mutt + ]; +} diff --git a/applications/default-applications.nix b/applications/terminal/default-applications.nix similarity index 99% rename from applications/default-applications.nix rename to applications/terminal/default-applications.nix index c05b730..598975e 100644 --- a/applications/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -7,7 +7,7 @@ let profiles = config.r6d.profiles; in -{ +mkIf true { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix new file mode 100644 index 0000000..315933b --- /dev/null +++ b/applications/terminal/default.nix @@ -0,0 +1,39 @@ +{ 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 + ./default-applications.nix + + # commandées par config-generator + ## option de configuration spécifique + ./cao.nix # de conception assisté par ordinateur & modélisation + ./cartographie.nix # manipuler les données géographiques & cartes + ./developpement.nix # développer des programmes/scripts + ./developpement-elm.nix # développer en elm + ./developpement-haskell.nix # développer en haskell + ./developpement-java.nix # développer en java + ./developpement-jetbrains.nix # outils jetbrains + ./developpement-rust.nix # développer en rust + ./edition-musique.nix # modifier les fichiers musicaux + ./edition-photo.nix # modifier les photos & assimilé + ./edition-video.nix # modifier les vidéos + ./jeux.nix # jouer, tout simplement ;) + + ## if isDesktop + ./adminsys.nix # pour gérer le système dans son ensemble et les services + ./bureau.nix # éléments pour avoir un environement graphique minimal utilisable + ./bureautique.nix # dédiée à la bureautique (traitement de texte, dessin, ...) + ./client-internet.nix # pour accéder & utiliser des ressources par le réseau + ./multimedia.nix # pour gérer le son, l'image et la vidéo + ./network.nix # de gestion, de diagnostique & surveillance réseau + ./securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) + ]; +} diff --git a/applications/developpement-elm.nix b/applications/terminal/developpement-elm.nix similarity index 100% rename from applications/developpement-elm.nix rename to applications/terminal/developpement-elm.nix diff --git a/applications/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix similarity index 93% rename from applications/developpement-haskell.nix rename to applications/terminal/developpement-haskell.nix index 31cb3af..a402bf8 100644 --- a/applications/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.nix @@ -25,7 +25,6 @@ mkIf cfg.developpement-haskell { hlint # qualite de code, analyse statique de code + astuces & bonnes pratiques #postgrest # mapper HTTP <-> PostgreSQL stylish-haskell # qualité de code - threadscope # visualisation des threads (.eventlog) turtle # genre shell-scripting # Application perso diff --git a/applications/developpement-java.nix b/applications/terminal/developpement-java.nix similarity index 88% rename from applications/developpement-java.nix rename to applications/terminal/developpement-java.nix index ec46e14..880d0e5 100644 --- a/applications/developpement-java.nix +++ b/applications/terminal/developpement-java.nix @@ -11,9 +11,6 @@ mkIf cfg.developpement-java { # Paquets environment.systemPackages = with pkgs; [ - # IDE - idea.idea-community # IntelliJ IDEA - # Java maven openjdk diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix new file mode 100644 index 0000000..de3149e --- /dev/null +++ b/applications/terminal/developpement-jetbrains.nix @@ -0,0 +1,15 @@ +{ 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.jetbrains-licensed { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/applications/developpement-rust.nix b/applications/terminal/developpement-rust.nix similarity index 100% rename from applications/developpement-rust.nix rename to applications/terminal/developpement-rust.nix diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix new file mode 100644 index 0000000..495df93 --- /dev/null +++ b/applications/terminal/developpement.nix @@ -0,0 +1,29 @@ +{ 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.developpement { + + # Paquets + environment.systemPackages = with pkgs; [ + # C / C++ + gcc # pour les appels depuis les scripts + + # Gestion des sources + cloc # outil pour compter les lignes de code source + git # déjà présent dans "base" + mercurial + subversion + + # Mono + #mono46 # interpréteur .NET + + ## Visualisation & outils de diff + #vbindiff # diff de fichier hexadecimaux avec vim + ]; +} diff --git a/applications/terminal/edition-musique.nix b/applications/terminal/edition-musique.nix new file mode 100644 index 0000000..f875da7 --- /dev/null +++ b/applications/terminal/edition-musique.nix @@ -0,0 +1,15 @@ +{ 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.edition-musique { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix new file mode 100644 index 0000000..bc923df --- /dev/null +++ b/applications/terminal/edition-photo.nix @@ -0,0 +1,21 @@ +{ 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.edition-photo { + + # Paquets +environment.systemPackages = with pkgs; [ + # Méta données + exif + exiftags + + # Retouche, modification & dessin vectoriel + imagemagick # modification image en CLI + ]; +} diff --git a/applications/edition-video.nix b/applications/terminal/edition-video.nix similarity index 85% rename from applications/edition-video.nix rename to applications/terminal/edition-video.nix index 9cbc4b6..c3ae81c 100644 --- a/applications/edition-video.nix +++ b/applications/terminal/edition-video.nix @@ -11,9 +11,6 @@ mkIf cfg.edition-video { # Paquets environment.systemPackages = with pkgs; [ - # Vidéo - #cinelerra # editeur video - pitivi # montage vidéo ffmpeg-full # assemblage de flux audio & video en ligne de commande ]; diff --git a/applications/jeux.nix b/applications/terminal/jeux.nix similarity index 90% rename from applications/jeux.nix rename to applications/terminal/jeux.nix index 54b96b5..ae00806 100644 --- a/applications/jeux.nix +++ b/applications/terminal/jeux.nix @@ -11,7 +11,5 @@ mkIf cfg.jeux { # Paquets environment.systemPackages = with pkgs; [ - # Jeux - urbanterror ]; } diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix new file mode 100644 index 0000000..847ffe2 --- /dev/null +++ b/applications/terminal/multimedia.nix @@ -0,0 +1,20 @@ +{ 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.multimediaSuite { + + # Paquets + environment.systemPackages = with pkgs; [ + ## Audio + beep + cmus # lecteur audio console + espeak # synthèse vocale + vorbis-tools # codec + ]; +} diff --git a/applications/network.nix b/applications/terminal/network.nix similarity index 98% rename from applications/network.nix rename to applications/terminal/network.nix index 7f82062..5432452 100644 --- a/applications/network.nix +++ b/applications/terminal/network.nix @@ -20,7 +20,6 @@ mkIf true { ## Diagnostic arp-scan nmap # outil de scan de port réseau - #wireshark whois ]; diff --git a/applications/securite.nix b/applications/terminal/securite.nix similarity index 73% rename from applications/securite.nix rename to applications/terminal/securite.nix index a11d5c5..20b4dcf 100644 --- a/applications/securite.nix +++ b/applications/terminal/securite.nix @@ -11,10 +11,7 @@ mkIf cfg.securitySuite { # Paquets environment.systemPackages = with pkgs; [ - # Securité - gnome3.seahorse # gestionnaire graphique de clef GPG pass # gestionnaire de mots de passe pwgen # générateur de mots de passe - #yubikey-personalization-gui # utilisation de la clef Yubikey ]; } diff --git a/applications/vim.nix b/applications/terminal/vim.nix similarity index 100% rename from applications/vim.nix rename to applications/terminal/vim.nix diff --git a/applications/vimrc b/applications/terminal/vimrc similarity index 100% rename from applications/vimrc rename to applications/terminal/vimrc diff --git a/base.nix b/base.nix index ac2d8d9..1717af4 100644 --- a/base.nix +++ b/base.nix @@ -13,7 +13,8 @@ in ./config-generator.nix # subfolders - ./applications/default.nix + ./applications/graphical/default.nix + ./applications/terminal/default.nix ./configuration/default.nix ./services/default.nix ];