From 19ab6a6881632dbe4c1581b855e245770fca7526 Mon Sep 17 00:00:00 2001 From: kat witch Date: Wed, 28 Apr 2021 22:05:11 +0100 Subject: [PATCH] hosts: Removed network-manager --- .gitignore | 1 + hosts/mabon/nixos/default.nix | 1 - hosts/ostara/nixos/default.nix | 1 - hosts/samhain/nixos/default.nix | 4 ++-- hosts/yule/nixos/default.nix | 3 +-- profiles/laptop/nixos/default.nix | 2 +- profiles/laptop/nixos/wifi.nix | 3 --- 7 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 profiles/laptop/nixos/wifi.nix diff --git a/.gitignore b/.gitignore index ce5e5990..8c31736f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /result /result* +/.direnv/ secrets.nix !profiles/common/nixos/secrets.nix !profiles/kat/home/secrets.nix diff --git a/hosts/mabon/nixos/default.nix b/hosts/mabon/nixos/default.nix index 257d0735..2bfff09d 100644 --- a/hosts/mabon/nixos/default.nix +++ b/hosts/mabon/nixos/default.nix @@ -19,7 +19,6 @@ networking.useDHCP = false; networking.interfaces.enp1s0.useDHCP = true; networking.interfaces.wlp2s0.useDHCP = true; - networking.networkmanager.enable = true; system.stateVersion = "20.09"; } diff --git a/hosts/ostara/nixos/default.nix b/hosts/ostara/nixos/default.nix index b94fbab5..432f3731 100644 --- a/hosts/ostara/nixos/default.nix +++ b/hosts/ostara/nixos/default.nix @@ -15,7 +15,6 @@ networking.useDHCP = false; networking.interfaces.enp1s0.useDHCP = true; networking.interfaces.wlp2s0.useDHCP = true; - networking.networkmanager.enable = true; system.stateVersion = "20.09"; } diff --git a/hosts/samhain/nixos/default.nix b/hosts/samhain/nixos/default.nix index 95e7ecce..717f5e70 100644 --- a/hosts/samhain/nixos/default.nix +++ b/hosts/samhain/nixos/default.nix @@ -69,7 +69,7 @@ in { }; katnet.private.interfaces = singleton "hexnet"; - katnet.public.interfaces = singleton "enp34s0"; + katnet.public.interfaces = singleton "br"; services.usbmuxd.enable = true; @@ -96,7 +96,7 @@ in { networking.useDHCP = false; networking.useNetworkd = true; networking.firewall.allowPing = true; - + systemd.network = { networks.enp34s0 = { matchConfig.Name = "enp34s0"; diff --git a/hosts/yule/nixos/default.nix b/hosts/yule/nixos/default.nix index ff693c63..4a828068 100644 --- a/hosts/yule/nixos/default.nix +++ b/hosts/yule/nixos/default.nix @@ -23,8 +23,7 @@ networking.useDHCP = false; networking.interfaces.enp1s0.useDHCP = true; networking.interfaces.wlp2s0.useDHCP = true; - networking.networkmanager.enable = true; - + hexchen.network = { enable = true; pubkey = "9779fd6b5bdba6b9e0f53c96e141f4b11ce5ef749d1b9e77a759a3fdbd33a653"; diff --git a/profiles/laptop/nixos/default.nix b/profiles/laptop/nixos/default.nix index 5bf7d32d..9fcbd47d 100644 --- a/profiles/laptop/nixos/default.nix +++ b/profiles/laptop/nixos/default.nix @@ -1,5 +1,5 @@ { ... }: { - imports = [ ./light.nix ./wifi.nix ]; + imports = [ ./light.nix ]; } diff --git a/profiles/laptop/nixos/wifi.nix b/profiles/laptop/nixos/wifi.nix deleted file mode 100644 index 88d8a3b6..00000000 --- a/profiles/laptop/nixos/wifi.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ }