Disable NetworkManager for starlight, network is broken now

This commit is contained in:
Artemis Tosini 2020-11-06 22:00:41 +00:00
parent 3b863f2849
commit f015683bb3
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
2 changed files with 15 additions and 8 deletions

View file

@ -16,11 +16,5 @@
tinyprog tinyprog
wishbone-tool wishbone-tool
( callPackage ../externals/packages/fujproj { } ) ( callPackage ../externals/packages/fujproj { } )
# CPU stuff
pkgsCross.riscv64-embedded.buildPackages.binutils
pkgsCross.riscv64-embedded.buildPackages.gcc
pkgsCross.riscv32-embedded.buildPackages.binutils
pkgsCross.riscv32-embedded.buildPackages.gcc
]; ];
} }

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
{ {
imports = [ imports = [
@ -16,6 +16,19 @@
KERNEL=="eth*", ATTR{address}=="00:0f:53:16:15:9d", NAME="lan10g1" KERNEL=="eth*", ATTR{address}=="00:0f:53:16:15:9d", NAME="lan10g1"
''; '';
networking.networkmanager.enable = lib.mkForce false;
networking.bridges.br0 = {
rstp = true;
interfaces = [ "lan10g0" "lan10g1" "enp4s0" ];
};
networking.interfaces.br0 = {
useDHCP = true;
ipv6.addresses = [{
address = "2001:470:8b04:6900:6969:1454:7749:e591";
prefixLength = 128;
}];
};
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
services = { services = {
tor = { tor = {
@ -24,7 +37,7 @@
}; };
}; };
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" "riscv64-linux" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
weechat weechat