Compare commits
12 Commits
2016-08-26
...
2016-10-06
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d65ee1bd2c | ||
|
|
dce7b12a33 | ||
| 826595cb6c | |||
| b633d3c794 | |||
| 5444be4fd2 | |||
| 9b4a4f1b67 | |||
| b622554b42 | |||
| 332f40265d | |||
|
|
781973228f | ||
|
|
65e1c6ff0e | ||
| b42c8e3080 | |||
| adaa4eeb61 |
1
Makefile
1
Makefile
@@ -15,6 +15,7 @@ clean-log:
|
|||||||
journalctl --vacuum-size=1G
|
journalctl --vacuum-size=1G
|
||||||
|
|
||||||
full-auto: submodules-update upgrade clean optimise
|
full-auto: submodules-update upgrade clean optimise
|
||||||
|
@date
|
||||||
|
|
||||||
optimise:
|
optimise:
|
||||||
nix-store --optimise
|
nix-store --optimise
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ mkIf cfg.nix-serve-client {
|
|||||||
(mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
|
(mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
|
||||||
|
|
||||||
(mkIf profiles.isPrunetwork "https://cache.nixos.org/")
|
(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 = ''
|
extraOptions = ''
|
||||||
connect-timeout = 5
|
connect-timeout = 5
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ in {
|
|||||||
|
|
||||||
users.extraUsers.root = {
|
users.extraUsers.root = {
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
|
mbpJPierre03
|
||||||
radxJPierre03
|
radxJPierre03
|
||||||
radxRoot
|
radxRoot
|
||||||
phenomTaeradan
|
phenomTaeradan
|
||||||
|
|||||||
@@ -181,6 +181,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
r6d.config-generator = {
|
r6d.config-generator = {
|
||||||
|
print = true;
|
||||||
virtualbox = true;
|
virtualbox = true;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.r6d.config-generator;
|
cfg = config.r6d.config-generator;
|
||||||
computers = config.r6d.computers;
|
computers = config.r6d.computers;
|
||||||
profiles = config.r6d.profiles;
|
profiles = config.r6d.profiles;
|
||||||
mkIf = pkgs.lib.mkIf;
|
mkIf = lib.mkIf;
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,4 +18,5 @@ mkIf profiles.isDesktop {
|
|||||||
slock # vérouiller l''écran. "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)" --> en root
|
slock # vérouiller l''écran. "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)" --> en root
|
||||||
yubikey-personalization-gui # utilisation de la clef Yubikey
|
yubikey-personalization-gui # utilisation de la clef Yubikey
|
||||||
];
|
];
|
||||||
|
security.setuidPrograms = [ "slock" ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ in
|
|||||||
# The NixOS release to be compatible with for stateful data such as databases.
|
# The NixOS release to be compatible with for stateful data such as databases.
|
||||||
system.stateVersion = "16.03";
|
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
|
# On autorise les paquets non-libres
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
@@ -36,6 +39,7 @@ in
|
|||||||
p7zip # compression de fichier
|
p7zip # compression de fichier
|
||||||
parted # partitionnement de disque
|
parted # partitionnement de disque
|
||||||
pciutils
|
pciutils
|
||||||
|
psmisc # fournis les utilitaires comme killall, fuser, pstree
|
||||||
python # python -- python -m SimpleHTTPServer 8000
|
python # python -- python -m SimpleHTTPServer 8000
|
||||||
python34Packages.glances # monitoring
|
python34Packages.glances # monitoring
|
||||||
pwgen # générateur de mot de passe
|
pwgen # générateur de mot de passe
|
||||||
@@ -49,6 +53,7 @@ in
|
|||||||
];
|
];
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
byobu = "byobu-tmux";
|
byobu = "byobu-tmux";
|
||||||
|
jacques-a-dit = "sudo";
|
||||||
tree = "tree -C";
|
tree = "tree -C";
|
||||||
tree1 = "tree -d -L 1";
|
tree1 = "tree -d -L 1";
|
||||||
tree2 = "tree -d -L 2";
|
tree2 = "tree -d -L 2";
|
||||||
@@ -58,6 +63,10 @@ in
|
|||||||
};
|
};
|
||||||
etc.gitconfig.text = builtins.readFile ./gitconfig;
|
etc.gitconfig.text = builtins.readFile ./gitconfig;
|
||||||
};
|
};
|
||||||
|
# programmes qui n'ont pas besoin de sudo pour fonctionner
|
||||||
|
security.setuidPrograms = [
|
||||||
|
"mtr"
|
||||||
|
];
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
promptInit = builtins.readFile ./bash-prompt.sh;
|
promptInit = builtins.readFile ./bash-prompt.sh;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ mkIf true {
|
|||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29
|
# 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 = ''
|
extraConfig = ''
|
||||||
KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
|
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
|
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
|
||||||
|
|||||||
@@ -13,5 +13,6 @@ mkIf true {
|
|||||||
|
|
||||||
security.sudo.extraConfig = ''
|
security.sudo.extraConfig = ''
|
||||||
%users ALL = NOPASSWD: ${pkgs.mtr}/bin/mtr
|
%users ALL = NOPASSWD: ${pkgs.mtr}/bin/mtr
|
||||||
|
%users ALL = NOPASSWD: ${pkgs.slock}/bin/slock
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user