diff --git a/bert/services/factorio.nix b/bert/services/factorio.nix index 0c7f423..1d832bf 100644 --- a/bert/services/factorio.nix +++ b/bert/services/factorio.nix @@ -1,10 +1,10 @@ -{lib, ...}: { - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem pkg.pname [ +{pkgs, lib, ...}: { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "factorio-headless" ]; services.factorio = { enable = true; - package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/e47e7cdafffab8b74c2878e02c37696dfcdebca0.tar.gz") { + package = (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/ab224822391f803e3b58c65f753162361e769075.tar.gz") { config.allowUnfree = true; }).factorio-headless; openFirewall = true; diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 451893e..84a43fd 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -44,6 +44,10 @@ networking.hostName = "oscar"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + # Enable networking networking.networkmanager.enable = true; @@ -98,9 +102,17 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + # If you want to use JACK applications, uncomment this jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; }; + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -111,14 +123,12 @@ home-manager.users.chandler = { pkgs, ... }: { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "android-studio-stable" "discord" "factorio-space-age" ]; home.packages = with pkgs; [ # applications - android-studio blender freecad frescobaldi @@ -132,14 +142,10 @@ libreoffice-qt mumble musescore + prismlauncher prusa-slicer qgis - - # games - bolt-launcher - prismlauncher scummvm - # runelite # command line applications iperf @@ -178,9 +184,7 @@ # Unfree: discord - (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/e47e7cdafffab8b74c2878e02c37696dfcdebca0.tar.gz") { - config.allowUnfree = true; - }).factorio-space-age + factorio-space-age ]; programs.thunderbird.enable = true;