Compare commits
9 Commits
2016-09-15
...
2016-10-13
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ccc8678ce | |||
|
|
215005d927 | ||
|
|
9fb124116d | ||
|
|
d65ee1bd2c | ||
|
|
dce7b12a33 | ||
| 826595cb6c | |||
| b633d3c794 | |||
| 5444be4fd2 | |||
| 9b4a4f1b67 |
@@ -16,7 +16,7 @@ mkIf cfg.nix-serve-client {
|
||||
(mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
|
||||
|
||||
(mkIf profiles.isPrunetwork "https://cache.nixos.org/")
|
||||
(mkIf (profiles.isPrunetwork && !profiles.isServer) "http://192.168.1.20:5000")
|
||||
(mkIf (profiles.isPrunetwork && !profiles.isServer) "http://nix-cache.dubronetwork.fr:5001")
|
||||
];
|
||||
extraOptions = ''
|
||||
connect-timeout = 5
|
||||
|
||||
@@ -181,6 +181,7 @@ in
|
||||
};
|
||||
|
||||
r6d.config-generator = {
|
||||
print = true;
|
||||
virtualbox = true;
|
||||
};
|
||||
})
|
||||
@@ -251,6 +252,8 @@ in
|
||||
|
||||
r6d.config-generator = {
|
||||
nix-serve-server = true;
|
||||
laptop = true;
|
||||
edition-photo = true;
|
||||
};
|
||||
})
|
||||
(mkIf comp.isRollo {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.r6d.config-generator;
|
||||
computers = config.r6d.computers;
|
||||
profiles = config.r6d.profiles;
|
||||
mkIf = pkgs.lib.mkIf;
|
||||
mkIf = lib.mkIf;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
@@ -7,7 +7,8 @@ let
|
||||
profiles = config.r6d.profiles;
|
||||
in
|
||||
|
||||
mkIf profiles.isDesktop {
|
||||
mkIf true {
|
||||
#mkIf profiles.isDesktop {
|
||||
|
||||
# Paquets
|
||||
environment.systemPackages = with pkgs; [
|
||||
@@ -19,7 +20,7 @@ mkIf profiles.isDesktop {
|
||||
|
||||
## Diagnostic
|
||||
arp-scan
|
||||
wireshark
|
||||
#wireshark
|
||||
whois
|
||||
];
|
||||
|
||||
|
||||
@@ -14,6 +14,9 @@ in
|
||||
# The NixOS release to be compatible with for stateful data such as databases.
|
||||
system.stateVersion = "16.03";
|
||||
|
||||
# copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix)
|
||||
system.copySystemConfiguration = true;
|
||||
|
||||
# On autorise les paquets non-libres
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
@@ -36,6 +39,7 @@ in
|
||||
p7zip # compression de fichier
|
||||
parted # partitionnement de disque
|
||||
pciutils
|
||||
psmisc # fournis les utilitaires comme killall, fuser, pstree
|
||||
python # python -- python -m SimpleHTTPServer 8000
|
||||
python34Packages.glances # monitoring
|
||||
pwgen # générateur de mot de passe
|
||||
|
||||
@@ -21,6 +21,7 @@ mkIf cfg.laptop {
|
||||
|
||||
# Paquets
|
||||
environment.systemPackages = with pkgs; [
|
||||
networkmanagerapplet
|
||||
networkmanagerapplet # gestionnaire réseau graphique + console (nm-applet + nmtui)
|
||||
wirelesstools # fournis iwconfig
|
||||
];
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ mkIf true {
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
# https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29
|
||||
# http://www.cyberciti.biz/tips/linux-unix-bsd-openssh-server-best-practices.html
|
||||
extraConfig = ''
|
||||
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
||||
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
|
||||
|
||||
Reference in New Issue
Block a user