diff --git a/hosts/muon/hardware-configuration.nix b/hosts/muon/hardware-configuration.nix index 4e54ee3..2b003c3 100644 --- a/hosts/muon/hardware-configuration.nix +++ b/hosts/muon/hardware-configuration.nix @@ -4,44 +4,44 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/03e49688-cc62-49c9-a906-e2ea87a38891"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/03e49688-cc62-49c9-a906-e2ea87a38891"; + fsType = "ext4"; + }; boot.initrd.luks.devices = { "luks-root".device = "/dev/disk/by-uuid/86769693-b61c-4712-852d-e0fba612d260"; - "luks-swap".device = + "luks-swap".device = "/dev/disk/by-uuid/0418acfc-792c-43f4-a887-cc8bb51fa7c3"; }; - fileSystems."/mnt/bulk" = - { device = "/dev/disk/by-uuid/11c2c896-d49a-4d9b-a846-b0a550128395"; - fsType = "ext4"; - }; + fileSystems."/mnt/bulk" = { + device = "/dev/disk/by-uuid/11c2c896-d49a-4d9b-a846-b0a550128395"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CCCC-449E"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/CCCC-449E"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = [{ - device = "/dev/disk/by-uuid/e7cf209d-386d-41db-8a35-6c9fff014722"; - } { - device = "/var/lib/swapfile"; - size = 8*1024; - }]; + swapDevices = [ + { device = "/dev/disk/by-uuid/e7cf209d-386d-41db-8a35-6c9fff014722"; } + { + device = "/var/lib/swapfile"; + size = 8 * 1024; + } + ]; # 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 @@ -50,10 +50,11 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.docker0.useDHCP = lib.mkDefault true; networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - networking.interfaces.enp0s31f6.mtu = 1200; + # networking.interfaces.enp0s31f6.mtu = 1200; # networking.interfaces.tun0.useDHCP = lib.mkDefault true; # networking.interfaces.vboxnet0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/nixos/server/containers/default.nix b/modules/nixos/server/containers/default.nix index 4035a4f..416150e 100644 --- a/modules/nixos/server/containers/default.nix +++ b/modules/nixos/server/containers/default.nix @@ -6,9 +6,7 @@ }; }; - imports = [ - ./steam.nix - ]; + imports = [ ./steam.nix ]; config = lib.mkIf config.mods.containers.enable { virtualisation.docker.enable = true; @@ -18,26 +16,26 @@ }; networking.nat = { enable = true; - internalInterfaces = ["ve-+"]; + internalInterfaces = [ "ve-+" ]; externalInterface = "enp0s31f6"; }; networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - networking = { - bridges.br0.interfaces = [ "enp0s31f6" ]; # Adjust interface accordingly - - # Get bridge-ip with DHCP - useDHCP = false; - interfaces."br0".useDHCP = true; + # networking = { + # bridges.br0.interfaces = [ "enp0s31f6" ]; # Adjust interface accordingly - # Set bridge-ip static - interfaces."br0".ipv4.addresses = [{ - address = "192.168.1.171"; - prefixLength = 24; - }]; + # # Get bridge-ip with DHCP + # useDHCP = false; + # interfaces."br0".useDHCP = true; - defaultGateway = "192.168.1.1"; - nameservers = [ "192.168.1.1" ]; - }; + # # Set bridge-ip static + # interfaces."br0".ipv4.addresses = [{ + # address = "192.168.1.171"; + # prefixLength = 24; + # }]; + + # defaultGateway = "192.168.1.1"; + # nameservers = [ "192.168.1.1" ]; + # }; # networking.firewall.allowedTCPPorts = [ 4713 6000 ]; # hardware.pulseaudio = { @@ -47,8 +45,6 @@ # tcp = { enable = true; anonymousClients = { allowedIpRanges = ["127.0.0.1" "192.168.100.0/24"]; }; }; # }; - environment.systemPackages = with pkgs; [ - xorg.xhost - ]; + environment.systemPackages = with pkgs; [ xorg.xhost ]; }; }