moved network manager out of environments
This commit is contained in:
parent
4d191a27cc
commit
cef6ad7125
|
@ -1,7 +1,5 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
imports = [
|
imports = [];
|
||||||
../common
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
cachefilesd
|
cachefilesd
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
{...}: {
|
|
||||||
# Enable networking
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
}
|
|
|
@ -12,9 +12,7 @@
|
||||||
httpsPort = 443;
|
httpsPort = 443;
|
||||||
isDebug = false;
|
isDebug = false;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [];
|
||||||
../common
|
|
||||||
];
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
apps = {
|
apps = {
|
||||||
|
|
|
@ -184,6 +184,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware = {
|
hardware = {
|
||||||
# TODO: hardware graphics
|
# TODO: hardware graphics
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
networkmanager.enable = true;
|
||||||
useDHCP = lib.mkDefault true;
|
useDHCP = lib.mkDefault true;
|
||||||
hostName = "horizon"; # Define your hostname.
|
hostName = "horizon"; # Define your hostname.
|
||||||
};
|
};
|
||||||
|
|
|
@ -69,6 +69,7 @@
|
||||||
swapDevices = [];
|
swapDevices = [];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
networkmanager.enable = true;
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
|
Loading…
Reference in a new issue