diff --git a/flake.lock b/flake.lock index 1cd8853..94c9949 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1721534365, - "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", + "lastModified": 1721852138, + "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", "owner": "nix-community", "repo": "home-manager", - "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", + "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", "type": "github" }, "original": { @@ -276,11 +276,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1721478802, - "narHash": "sha256-+WMQs0fMAmpWPsKNgIFQoKLtvS4qtTj+mC++cD1May4=", + "lastModified": 1721816671, + "narHash": "sha256-gk+ktb6smoyYmjM5Je2EYxyVLDrFNmRHDzf3iUoElJU=", "owner": "danth", "repo": "stylix", - "rev": "6f36b27afd7b7ac8664bb62b7b27728540972c82", + "rev": "c974c17cd089dcbfb16fbde028dd00bcc05e3f73", "type": "github" }, "original": { diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index d7139fc..af52031 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -22,7 +22,7 @@ in { mods.theme.scheme = "woodland"; mods.theme.wallpaper = ./wallpaper.png; - mods.containers.steam.enable = false; + mods.containers.steam.enable = true; mods.server.media.enable = true; mods.server.astral.enable = true; mods.server.astral.autoStart = false; diff --git a/modules/nixos/server/containers/default.nix b/modules/nixos/server/containers/default.nix index b402014..3ea7c72 100644 --- a/modules/nixos/server/containers/default.nix +++ b/modules/nixos/server/containers/default.nix @@ -22,6 +22,27 @@ 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; + + # # Set bridge-ip static + # # interfaces."br0".ipv4.addresses = [{ + # # address = "192.168.1.171"; + # # prefixLength = 24; + # # }]; + + # # interfaces."enp0s31f6".ipv4.addresses = [{ + # # address = "192.168.1.107"; + # # prefixLength = 24; + # # }]; + + # defaultGateway = "192.168.1.1"; + # nameservers = [ "192.168.1.1" ]; + # }; # networking.firewall.allowedTCPPorts = [ 4713 6000 ]; # hardware.pulseaudio = { diff --git a/modules/nixos/server/containers/steam.nix b/modules/nixos/server/containers/steam.nix index 3073528..8b5d82b 100644 --- a/modules/nixos/server/containers/steam.nix +++ b/modules/nixos/server/containers/steam.nix @@ -20,6 +20,8 @@ in { privateNetwork = true; hostAddress = "192.168.100.10"; localAddress = "192.168.100.11"; + # hostBridge = "br0"; # Specify the bridge name + # localAddress = "192.168.1.105/24"; bindMounts = { "/home/steam/.steam/steam/steamapps/common/SMITE" = { @@ -48,7 +50,6 @@ in { "steam-run" ]; - programs.steam = { enable = true; remotePlay.openFirewall = true; @@ -64,6 +65,8 @@ in { glxinfo wget bottles + ungoogled-chromium + zellij openbox steam-xinit @@ -109,6 +112,14 @@ in { initialPassword = "changeme"; }; + networking = { + # Use systemd-resolved inside the container + # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686 + useHostResolvConf = lib.mkForce false; + }; + + services.resolved.enable = true; + system.stateVersion = "23.11"; }; };