caleb/Surface-Nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrated networking related items to separate config file

Browse Source
This commit is contained in:
caleb 2024-03-20 15:24:15 -04:00
parent 5c214ffffa
commit 5f6358365b
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application-configuration.nix
View File

@ -29,13 +29,6 @@
openjdk8 openjdk8
]; ];
# Enable mullvad vpn
services.mullvad-vpn.package = pkgs.mullvad-vpn;
services.mullvad-vpn.enable = true;
# Enable tailscale
services.tailscale.enable = true;
# install Steam # install Steam
programs.steam = { programs.steam = {
enable = true; enable = true;

18
configuration.nix
View File

@ -5,6 +5,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
./bootloader-configuration.nix ./bootloader-configuration.nix
./surfacebook-configuration.nix ./surfacebook-configuration.nix
./networking-configuration.nix
./application-configuration.nix ./application-configuration.nix
./software-development-configuration.nix ./software-development-configuration.nix
./school-configuration.nix ./school-configuration.nix
@ -12,12 +13,6 @@
./faf-linux.nix ./faf-linux.nix
]; ];
# Enable networking and bluetooth
networking.networkmanager.enable = true;
systemd.services.NetworkManager-wait-online.enable = false; #disable wait online since it is broken
networking.hostName = "surface";
hardware.bluetooth.enable = true;
# Set time zone. # Set time zone.
time.timeZone = "America/New_York"; time.timeZone = "America/New_York";
@ -135,23 +130,20 @@
}; };
}; };
# enable mac address randomization
networking.networkmanager.wifi.macAddress = "random";
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.printing.drivers = [ pkgs.brlaser ]; services.printing.drivers = [ pkgs.brlaser ];
# remote build # remote build
nix.buildMachines = [ nix.buildMachines = [
{ /* {
hostName = "talos"; hostName = "talos";
system = "x86_64-linux"; system = "x86_64-linux";
protocol = "ssh-ng"; protocol = "ssh-ng";
speedFactor = 4; speedFactor = 4;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
} } */
{ {
hostName = "january"; hostName = "january";
system = "x86_64-linux"; system = "x86_64-linux";
@ -160,14 +152,14 @@
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
} }
{ /* {
hostName = "pubnix"; hostName = "pubnix";
system = "x86_64-linux"; system = "x86_64-linux";
protocol = "ssh-ng"; protocol = "ssh-ng";
speedFactor = 2; speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
} } */
]; ];
nix.distributedBuilds = true; nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours # optional, useful when the builder has a faster internet connection than yours

20
networking-configuration.nix Normal file
View File

@ -0,0 +1,20 @@
{ pkgs, ... }:
{
# Enable networking and bluetooth
networking = {
hostName = "surface";
networkmanager = {
enable = true;
wifi.macAddress = "random";
};
};
systemd.services.NetworkManager-wait-online.enable = false; #disable wait online since it is broken
hardware.bluetooth.enable = true;
# Enable mullvad vpn
services.mullvad-vpn.package = pkgs.mullvad-vpn;
services.mullvad-vpn.enable = true;
# Enable tailscale
services.tailscale.enable = true;
}