diff --git a/beta/configuration.nix b/beta/configuration.nix index 285ccb5..3329ba2 100644 --- a/beta/configuration.nix +++ b/beta/configuration.nix @@ -6,6 +6,9 @@ # Include the results of the hardware scan. ./hardware-configuration.nix + # Shared config of all laptops + /data/nixos/share/laptop.nix + # Shared config of all machines /data/nixos/share/common.nix ]; @@ -16,15 +19,4 @@ # our hostname networking.hostName = "beta"; networking.hostId = "c07bab49"; - - # use NetworkManager, if we have WiFi, allows Plasma to manage connections - # use iwd, only thing that works properly on e.g. Macs - networking.networkmanager.enable = true; - networking.wireless.iwd = { - enable = true; - settings.General.EnableNetworkConfiguration = true; - }; - - # german laptop keyboard - services.xserver.xkb.layout = "de"; } diff --git a/share/laptop.nix b/share/laptop.nix new file mode 100644 index 0000000..acf42b5 --- /dev/null +++ b/share/laptop.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + # use NetworkManager, if we have WiFi, allows Plasma to manage connections + # use iwd, only thing that works properly on e.g. Macs + networking.networkmanager.enable = true; + networking.wireless.iwd = { + enable = true; + settings.General.EnableNetworkConfiguration = true; + }; + + # german laptop keyboard + services.xserver.xkb.layout = "de"; +} diff --git a/zeta/configuration.nix b/zeta/configuration.nix index 37df190..9822932 100644 --- a/zeta/configuration.nix +++ b/zeta/configuration.nix @@ -5,8 +5,13 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix + # Include the necessary packages and configuration for Apple Silicon support. ./apple-silicon-support + + # Shared config of all laptops + /data/nixos/share/laptop.nix + # Shared config of all machines /data/nixos/share/common.nix ]; @@ -17,15 +22,4 @@ # our hostname networking.hostName = "zeta"; networking.hostId = "cce4e4c1"; - - # use NetworkManager, if we have WiFi, allows Plasma to manage connections - # use iwd, only thing that works properly on e.g. Macs - networking.networkmanager.enable = true; - networking.wireless.iwd = { - enable = true; - settings.General.EnableNetworkConfiguration = true; - }; - - # german laptop keyboard - services.xserver.xkb.layout = "de"; }