nixos-config/nixos-template-base
4
0
Fork 0
Code Issues 7 Pull Requests Releases Activity

adaptation pour que les expression de desktop se lancent que dans desktop

Browse Source
This commit is contained in:
Jean-Pierre PRUNARET
2016-07-29 12:41:37 +02:00
parent 9db6440dab
commit 55880e13f3
10 changed files with 99 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/app-adminsys.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Adminsys # Adminsys

13
desktop/app-bureautique.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Bureautique # Bureautique

15
desktop/app-cao.nix
View File

@@ -1,10 +1,15 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
environment.systemPackages = with pkgs; [ mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [
# CAO # CAO
## Modélisation 3D ## Modélisation 3D
freecad # modélisation de pièces en 3D freecad # modélisation de pièces en 3D

15
desktop/app-client-internet.nix
View File

@@ -1,10 +1,15 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
environment.systemPackages = with pkgs; [ mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [
# Clients Internet # Clients Internet
## Navigateur & Réseaux sociaux ## Navigateur & Réseaux sociaux

13
desktop/app-dev.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Base de données # Base de données

13
desktop/app-geo.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Gestion de données géographiques # Gestion de données géographiques

13
desktop/app-multimedia.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Multimedia # Multimedia

19
desktop/app-network.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Outils réseau # Outils réseau
@@ -25,6 +30,8 @@
tinc tinc
]; ];
networking.firewall.allowedTCPPorts = [5201]; # iperf networking.firewall = {
networking.firewall.allowedUDPPorts = [5201]; # iperf allowedTCPPorts = [5201]; # iperf
allowedUDPPorts = [5201]; # iperf
};
} }

13
desktop/app-securite.nix
View File

@@ -1,8 +1,13 @@
{ config, libs, pkgs, ... }: { config, lib, pkgs, ... }:
{ let
imports = [ inherit (lib) mkIf;
]; cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
in
mkIf profiles.isDesktop {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Securité # Securité

16
desktop/desktop.nix
View File

@@ -1,5 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
cfg = config.r6d.config-generator;
computers = config.r6d.computers;
profiles = config.r6d.profiles;
mkIf = pkgs.lib.mkIf;
in
{ {
imports = [ # applications : imports = [ # applications :
# commandées par config-generator # commandées par config-generator
@@ -21,7 +28,7 @@
./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...) ./app-securite.nix # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; mkIf profiles.isDesktop [
# Environement de bureau # Environement de bureau
wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java) wmname # pour définir le nom du gestionnaire de fenêtre (utile pour java)
kde4.ksnapshot# capture d'écran kde4.ksnapshot# capture d'écran
@@ -55,7 +62,7 @@
}; };
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver = { services.xserver = mkIf profiles.isDesktop {
enable = true; enable = true;
layout = "fr"; layout = "fr";
xkbOptions = "eurosign:e"; xkbOptions = "eurosign:e";
@@ -88,8 +95,9 @@
Option "Emulate3Buttons" "true" # Factory default. Option "Emulate3Buttons" "true" # Factory default.
'']; ''];
}; };
hardware.pulseaudio = { # Pulse Audio
hardware.pulseaudio = mkIf profiles.isDesktop {
enable = true; enable = true;
support32Bit = true; support32Bit = true;
}; };