Compare commits
1 Commits
2019-08-25
...
2020-02-26
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7681f7774e |
4
Makefile
4
Makefile
@@ -35,7 +35,7 @@ optimise:
|
||||
$(TIME) nix optimise-store
|
||||
|
||||
rebuild-build:
|
||||
nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
|
||||
nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
|
||||
$(TIME) time nixos-rebuild build --fallback --show-trace
|
||||
|
||||
rebuild-switch:
|
||||
@@ -58,7 +58,7 @@ store-repair:
|
||||
$(TIME) nix-store --verify --check-contents --repair
|
||||
|
||||
upgrade:
|
||||
nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
|
||||
nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
|
||||
$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
|
||||
|
||||
##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
nix.buildCores = 0;
|
||||
|
||||
# The NixOS release to be compatible with for stateful data such as databases.
|
||||
system.stateVersion = "19.03";
|
||||
system.stateVersion = "19.09";
|
||||
|
||||
# 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;
|
||||
|
||||
14
options.nix
14
options.nix
@@ -63,7 +63,7 @@ let
|
||||
|
||||
ipAddress = mkOption {
|
||||
description = "Adresse IP.";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
};
|
||||
nix-serve-server = mkEnableOption "nix-serve server.";
|
||||
nix-serve-client = {
|
||||
@@ -80,18 +80,18 @@ let
|
||||
dnsFQDN = mkOption {
|
||||
example = "device.example.net.";
|
||||
description = "DNS name of host pointing to tunnel IP.";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
};
|
||||
connectToAddress = mkOption {
|
||||
default = "";
|
||||
example = "192.168.1.1";
|
||||
description = "External address to connect from another node.";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
};
|
||||
vpnAddress = mkOption {
|
||||
example = "192.168.69.69/24";
|
||||
description = "VPN local node IP address.";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
};
|
||||
vpnCidrLength = mkOption {
|
||||
default = 24;
|
||||
@@ -106,7 +106,7 @@ let
|
||||
ConnecTo = bar
|
||||
'';
|
||||
description = "Configuration supplémentaire pour tinc.";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -129,7 +129,7 @@ let
|
||||
enable = mkEnableOption "Activation du démarrage de Windows par Grub";
|
||||
drive = mkOption {
|
||||
description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
default = "hd0,1";
|
||||
};
|
||||
};
|
||||
@@ -137,7 +137,7 @@ let
|
||||
enable = mkEnableOption "Montage de la partition data Windows";
|
||||
device = mkOption {
|
||||
description = "Lecteur sur lequel est présent le disque de data Windows";
|
||||
type = lib.types.string;
|
||||
type = lib.types.str;
|
||||
default = "/dev/sda2";
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user